diff --git a/.gitignore b/.gitignore
index 2b52a49..68272c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,6 @@
 dist/
 erpnext/docs/current
 *.swp
-<<<<<<< HEAD
 *.swo
 __pycache__
 *~
-=======
->>>>>>> master
diff --git a/README.md b/README.md
index c5363e8..61860e0 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Management, HRMS. Requires MariaDB.
 
-ERPNext is built on the [Frappé](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
+ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
 
 - [User Guide](https://erpnext.org/docs/user)
 - [Discussion Forum](https://discuss.erpnext.com/)
@@ -39,7 +39,7 @@
 
 GNU/General Public License (see LICENSE.txt)
 
-The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappé Technologies Pvt Ltd (Frappé) and Contributors.
+The ERPNext code is licensed as GNU General Public License (v3) and the Documentation is licensed as Creative Commons (CC-BY-SA-3.0) and the copyright is owned by Frappe Technologies Pvt Ltd (Frappe) and Contributors.
 
 ---
 
@@ -55,19 +55,19 @@
 
 ## Logo and Trademark
 
-The brand name ERPNext and the logo are trademarks of Frappé Technologies Pvt. Ltd.
+The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.
 
 ### Introduction
 
-Frappé Technologies Pvt. Ltd. (Frappé) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind:
+Frappe Technologies Pvt. Ltd. (Frappe) owns and oversees the trademarks for the ERPNext name and logos. We have developed this trademark usage policy with the following goals in mind:
 
 - We’d like to make it easy for anyone to use the ERPNext name or logo for community-oriented efforts that help spread and improve ERPNext.
 - We’d like to make it clear how ERPNext-related businesses and projects can (and cannot) use the ERPNext name and logo.
 - We’d like to make it hard for anyone to use the ERPNext name and logo to unfairly profit from, trick or confuse people who are looking for official ERPNext resources.
 
-### Frappé Trademark Usage Policy
+### Frappe Trademark Usage Policy
 
-Permission from Frappé is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
+Permission from Frappe is required to use the ERPNext name or logo as part of any project, product, service, domain or company name.
 
 We will grant permission to use the ERPNext name and logo for projects that meet the following criteria:
 
@@ -78,7 +78,7 @@
 
 Use of the ERPNext name and logo is additionally allowed in the following situations:
 
-All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or Frappé Technologies or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
+All other ERPNext-related businesses or projects can use the ERPNext name and logo to refer to and explain their services, but they cannot use them as part of a product, project, service, domain, or company name and they cannot use them in any way that suggests an affiliation with or endorsement by ERPNext or Frappe Technologies or the ERPNext open source project. For example, a consulting company can describe its business as “123 Web Services, offering ERPNext consulting for small businesses,” but cannot call its business “The ERPNext Consulting Company.”
 
 Similarly, it’s OK to use the ERPNext logo as part of a page that describes your products or services, but it is not OK to use it as part of your company or product logo or branding itself. Under no circumstances is it permitted to use ERPNext as part of a top-level domain name.
 
@@ -86,6 +86,6 @@
 
 Please note that it is not the goal of this policy to limit commercial activity around ERPNext. We encourage ERPNext-based businesses, and we would love to see hundreds of them.
 
-When in doubt about your use of the ERPNext name or logo, please contact Frappé Technologies for clarification.
+When in doubt about your use of the ERPNext name or logo, please contact Frappe Technologies for clarification.
 
 (inspired by WordPress)
diff --git a/attributions.md b/attributions.md
index 21a44fb..9cd6eb8 100644
--- a/attributions.md
+++ b/attributions.md
@@ -1,6 +1,6 @@
 ## ERPNext includes these public works
 
-For Frappé Framework, please see attributions.md at https://github.com/frappe/frappe/
+For Frappe Framework, please see attributions.md at https://github.com/frappe/frappe/
 
 #### Images
 
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 2dfd6e1..3621989 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '10.1.43'
+__version__ = '10.1.45'
 
 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 1a23d5f..bb059f6 100644
--- a/erpnext/accounts/doctype/account/account.js
+++ b/erpnext/accounts/doctype/account/account.js
@@ -39,14 +39,19 @@
 				// credit days and type if customer or supplier
 				frm.set_intro(null);
 				frm.trigger('account_type');
-
 				// show / hide convert buttons
 				frm.trigger('add_toolbar_buttons');
 			}
-			frm.add_custom_button(__('Update Account Number'), function () {
+			frm.add_custom_button(__('Update Account Name / Number'), function () {
 				frm.trigger("update_account_number");
 			});
 		}
+
+		if(!frm.doc.__islocal) {
+			frm.add_custom_button(__('Merge Account'), function () {
+				frm.trigger("merge_account");
+			});
+		}
 	},
 	account_type: function (frm) {
 		if (frm.doc.is_group == 0) {
@@ -92,32 +97,75 @@
 		}
 	},
 
-	update_account_number: function(frm) {
+	merge_account: function(frm) {
 		var d = new frappe.ui.Dialog({
-			title: __('Update Account Number'),
+			title: __('Merge with Existing Account'),
 			fields: [
 				{
-					"label": "Account Number",
-					"fieldname": "account_number",
+					"label" : "Name",
+					"fieldname": "name",
 					"fieldtype": "Data",
-					"reqd": 1
+					"reqd": 1,
+					"default": frm.doc.name
 				}
 			],
 			primary_action: function() {
 				var data = d.get_values();
-				if(data.account_number === frm.doc.account_number) {
+				frappe.call({
+					method: "erpnext.accounts.doctype.account.account.merge_account",
+					args: {
+						old: frm.doc.name,
+						new: data.name,
+						is_group: frm.doc.is_group,
+						root_type: frm.doc.root_type,
+						company: frm.doc.company
+					},
+					callback: function(r) {
+						if(!r.exc) {
+							if(r.message) {
+								frappe.set_route("Form", "Account", r.message);
+							}
+							d.hide();
+						}
+					}
+				});
+			},
+			primary_action_label: __('Merge')
+		});
+		d.show();
+	},
+
+	update_account_number: function(frm) {
+		var d = new frappe.ui.Dialog({
+			title: __('Update Account Number / Name'),
+			fields: [
+				{
+					"label": "Account Name",
+					"fieldname": "account_name",
+					"fieldtype": "Data",
+					"reqd": 1,
+					"default": frm.doc.account_name
+				},
+				{
+					"label": "Account Number",
+					"fieldname": "account_number",
+					"fieldtype": "Data",
+					"default": frm.doc.account_number
+				}
+			],
+			primary_action: function() {
+				var data = d.get_values();
+				if(data.account_number === frm.doc.account_number && data.account_name === frm.doc.account_name) {
 					d.hide();
 					return;
 				}
 
 				frappe.call({
-					method: "erpnext.accounts.utils.update_number_field",
+					method: "erpnext.accounts.doctype.account.account.update_account_number",
 					args: {
-						doctype_name: frm.doc.doctype,
-						name: frm.doc.name,
-						field_name: d.fields[0].fieldname,
-						field_value: data.account_number,
-						company: frm.doc.company,
+						account_number: data.account_number,
+						account_name: data.account_name,
+						name: frm.doc.name
 					},
 					callback: function(r) {
 						if(!r.exc) {
@@ -125,6 +173,7 @@
 								frappe.set_route("Form", "Account", r.message);
 							} else {
 								frm.set_value("account_number", data.account_number);
+								frm.set_value("account_name", data.account_name);
 							}
 							d.hide();
 						}
@@ -135,4 +184,4 @@
 		});
 		d.show();
 	}
-});
\ No newline at end of file
+});
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index de28a59..5bb55ec 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -2,7 +2,7 @@
  "allow_copy": 1, 
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
- "allow_rename": 1, 
+ "allow_rename": 0, 
  "beta": 0, 
  "creation": "2013-01-30 12:49:46", 
  "custom": 0, 
@@ -625,7 +625,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-05-07 15:37:25.962506", 
+ "modified": "2018-07-08 09:47:04.287841", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index b92e423..5ea8358 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -167,53 +167,6 @@
 
 		super(Account, self).on_trash(True)
 
-	def before_rename(self, old, new, merge=False):
-		# Add company abbr if not provided
-		from erpnext.setup.doctype.company.company import get_name_with_abbr
-		new_account = get_name_with_abbr(new, self.company)
-		if not merge:
-			new_account = get_name_with_number(new_account, self.account_number)
-		else:
-			# Validate properties before merging
-			if not frappe.db.exists("Account", new):
-				throw(_("Account {0} does not exist").format(new))
-
-			val = list(frappe.db.get_value("Account", new_account,
-				["is_group", "root_type", "company"]))
-
-			if val != [self.is_group, self.root_type, self.company]:
-				throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
-
-			if self.is_group and frappe.db.get_value("Account", new, "parent_account") == old:
-				frappe.db.set_value("Account", new, "parent_account",
-					frappe.db.get_value("Account", old, "parent_account"))
-
-		return new_account
-
-	def after_rename(self, old, new, merge=False):
-		super(Account, self).after_rename(old, new, merge)
-
-		if not merge:
-			new_acc = frappe.db.get_value("Account", new, ["account_name", "account_number"], as_dict=1)
-
-			# exclude company abbr
-			new_parts = new.split(" - ")[:-1]
-			# update account number and remove from parts
-			if new_parts[0][0].isdigit():
-				# if account number is separate by space, split using space
-				if len(new_parts) == 1:
-					new_parts = new.split(" ")
-				if new_acc.account_number != new_parts[0]:
-					self.account_number = new_parts[0]
-					self.db_set("account_number", new_parts[0])
-				new_parts = new_parts[1:]
-
-			# update account name
-			account_name = " - ".join(new_parts)
-			if new_acc.account_name != account_name:
-				self.account_name = account_name
-				self.db_set("account_name", account_name)
-
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""select name from tabAccount
 		where is_group = 1 and docstatus != 2 and company = %s
@@ -234,11 +187,58 @@
 
 	return frappe.local_cache("account_currency", account, generator)
 
-def get_name_with_number(new_account, account_number):
-	if account_number and not new_account[0].isdigit():
-		new_account = account_number + " - " + new_account
-	return new_account
-
-
 def on_doctype_update():
-	frappe.db.add_index("Account", ["lft", "rgt"])
\ No newline at end of file
+	frappe.db.add_index("Account", ["lft", "rgt"])
+
+def get_account_autoname(account_number, account_name, company):
+	# first validate if company exists
+	company = frappe.db.get_value("Company", company, ["abbr", "name"], as_dict=True)
+	if not company:
+		frappe.throw(_('Company {0} does not exist').format(company))
+
+	parts = [account_name.strip(), company.abbr]
+	if cstr(account_number).strip():
+		parts.insert(0, cstr(account_number).strip())
+	return ' - '.join(parts)
+
+def validate_account_number(name, account_number, company):
+	if account_number:
+		account_with_same_number = frappe.db.get_value("Account",
+			{"account_number": account_number, "company": company, "name": ["!=", name]})
+		if account_with_same_number:
+			frappe.throw(_("Account Number {0} already used in account {1}")
+				.format(account_number, account_with_same_number))
+
+@frappe.whitelist()
+def update_account_number(name, account_name, account_number=None):
+
+	account = frappe.db.get_value("Account", name, ["company"], as_dict=True)
+	validate_account_number(name, account_number, account.company)
+	if account_number:
+		frappe.db.set_value("Account", name, "account_number", account_number.strip())
+	frappe.db.set_value("Account", name, "account_name", account_name.strip())
+
+	new_name = get_account_autoname(account_number, account_name, account.company)
+	if name != new_name:
+		frappe.rename_doc("Account", name, new_name, ignore_permissions=1)
+		return new_name
+
+@frappe.whitelist()
+def merge_account(old, new, is_group, root_type, company):
+	# Validate properties before merging
+	if not frappe.db.exists("Account", new):
+		throw(_("Account {0} does not exist").format(new))
+
+	val = list(frappe.db.get_value("Account", new,
+		["is_group", "root_type", "company"]))
+
+	if val != [cint(is_group), root_type, company]:
+		throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
+
+	if is_group and frappe.db.get_value("Account", new, "parent_account") == old:
+		frappe.db.set_value("Account", new, "parent_account",
+			frappe.db.get_value("Account", old, "parent_account"))
+
+	frappe.rename_doc("Account", old, new, merge=1, ignore_permissions=1)
+
+	return new
diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py
index 55383dc..acaa096 100644
--- a/erpnext/accounts/doctype/account/test_account.py
+++ b/erpnext/accounts/doctype/account/test_account.py
@@ -5,6 +5,8 @@
 import unittest
 import frappe
 from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
+from erpnext.accounts.doctype.account.account import update_account_number
+from erpnext.accounts.doctype.account.account import merge_account
 
 class TestAccount(unittest.TestCase):
 	def test_rename_account(self):
@@ -21,21 +23,79 @@
 		self.assertEqual(account_number, "1210")
 		self.assertEqual(account_name, "Debtors")
 
-		frappe.rename_doc("Account", "1210 - Debtors - _TC", "1211 - Debtors 1 - _TC")
+		new_account_number = "1211-11-4 - 6 - "
+		new_account_name = "Debtors 1 - Test - "
 
-		new_acc = frappe.db.get_value("Account", "1211 - Debtors 1 - _TC",
+		update_account_number("1210 - Debtors - _TC", new_account_name, new_account_number)
+
+		new_acc = frappe.db.get_value("Account", "1211-11-4 - 6 - - Debtors 1 - Test - - _TC",
 			["account_name", "account_number"], as_dict=1)
-		self.assertEqual(new_acc.account_name, "Debtors 1")
-		self.assertEqual(new_acc.account_number, "1211")
 
-		frappe.rename_doc("Account", "1211 - Debtors 1 - _TC", "Debtors 2")
+		self.assertEqual(new_acc.account_name, "Debtors 1 - Test -")
+		self.assertEqual(new_acc.account_number, "1211-11-4 - 6 -")
 
-		new_acc = frappe.db.get_value("Account", "1211 - Debtors 2 - _TC",
-			["account_name", "account_number"], as_dict=1)
-		self.assertEqual(new_acc.account_name, "Debtors 2")
-		self.assertEqual(new_acc.account_number, "1211")
+		frappe.delete_doc("Account", "1211-11-4 - 6 - Debtors 1 - Test - - _TC")
 
-		frappe.delete_doc("Account", "1211 - Debtors 2 - _TC")
+	def test_merge_account(self):
+		if not frappe.db.exists("Account", "Current Assets - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Current Assets"
+			acc.is_group = 1
+			acc.parent_account = "Application of Funds (Assets) - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Securities and Deposits - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Securities and Deposits"
+			acc.parent_account = "Current Assets - _TC"
+			acc.is_group = 1
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Earnest Money - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Earnest Money"
+			acc.parent_account = "Securities and Deposits - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Cash In Hand - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Cash In Hand"
+			acc.is_group = 1
+			acc.parent_account = "Current Assets - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+		if not frappe.db.exists("Account", "Accumulated Depreciation - _TC"):
+			acc = frappe.new_doc("Account")
+			acc.account_name = "Accumulated Depreciation"
+			acc.parent_account = "Fixed Assets - _TC"
+			acc.company = "_Test Company"
+			acc.insert()
+
+		doc = frappe.get_doc("Account", "Securities and Deposits - _TC")
+		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
+
+		self.assertEqual(parent, "Securities and Deposits - _TC")
+
+		merge_account("Securities and Deposits - _TC", "Cash In Hand - _TC", doc.is_group, doc.root_type, doc.company)
+		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
+
+		# Parent account of the child account changes after merging
+		self.assertEqual(parent, "Cash In Hand - _TC")
+
+		# Old account doesn't exist after merging
+		self.assertFalse(frappe.db.exists("Account", "Securities and Deposits - _TC"))
+
+		doc = frappe.get_doc("Account", "Current Assets - _TC")
+
+		# Raise error as is_group property doesn't match
+		self.assertRaises(frappe.ValidationError, merge_account, "Current Assets - _TC",\
+			"Accumulated Depreciation - _TC", doc.is_group, doc.root_type, doc.company)
+
+		doc = frappe.get_doc("Account", "Capital Stock - _TC")
+
+		# Raise error as root_type property doesn't match
+		self.assertRaises(frappe.ValidationError, merge_account, "Capital Stock - _TC",\
+			"Softwares - _TC", doc.is_group, doc.root_type, doc.company)
 
 def _make_test_records(verbose):
 	from frappe.test_runner import make_test_objects
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index 564a93c..81e8d7a 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -40,7 +40,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -72,7 +71,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -104,7 +102,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -134,7 +131,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -166,7 +162,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -198,7 +193,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -230,7 +224,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -262,7 +255,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -296,7 +288,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -329,7 +320,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -359,7 +349,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -392,7 +381,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -423,7 +411,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -455,7 +442,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -488,7 +474,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -521,7 +506,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -554,7 +538,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -584,7 +567,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -617,7 +599,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -650,7 +631,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -683,7 +663,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -716,7 +695,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -749,7 +727,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -781,7 +758,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -814,7 +790,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -844,7 +819,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -877,7 +851,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -909,7 +882,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -942,7 +914,6 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -975,7 +946,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1008,7 +978,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1041,7 +1010,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1073,7 +1041,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1105,7 +1072,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1138,7 +1104,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1169,7 +1134,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1199,7 +1163,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1231,7 +1194,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1264,7 +1226,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1296,7 +1257,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1329,7 +1289,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1361,7 +1320,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1392,7 +1350,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1424,7 +1381,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1454,7 +1410,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1486,7 +1441,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1518,7 +1472,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1551,7 +1504,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1584,7 +1536,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1604,7 +1555,7 @@
    "in_standard_filter": 0, 
    "label": "Remarks", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -1615,7 +1566,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1645,7 +1595,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1677,7 +1626,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1709,7 +1657,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1740,7 +1687,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1772,7 +1718,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1803,7 +1748,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -1834,7 +1778,6 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -1848,7 +1791,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-03-10 07:31:49.264576", 
+ "modified": "2018-07-27 01:49:24.720317", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry", 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js
index afc3804..8820161 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.js
+++ b/erpnext/accounts/doctype/payment_request/payment_request.js
@@ -31,7 +31,7 @@
 			});
 		});
 	}
-	
+
 	if(!frm.doc.payment_gateway_account && frm.doc.status == "Initiated") {
 		frm.add_custom_button(__('Make Payment Entry'), function(){
 			frappe.call({
@@ -49,3 +49,25 @@
 	}
 });
 
+frappe.ui.form.on("Payment Request", "is_a_subscription", function(frm) {
+	frm.toggle_reqd("payment_gateway_account", frm.doc.is_a_subscription);
+	frm.toggle_reqd("subscription_plans", frm.doc.is_a_subscription);
+
+	if (frm.doc.is_a_subscription) {
+		frappe.call({
+			method: "erpnext.accounts.doctype.payment_request.payment_request.get_subscription_details",
+			args: {"reference_doctype": frm.doc.reference_doctype, "reference_name": frm.doc.reference_name},
+			freeze: true,
+			callback: function(data){
+				if(!data.exc) {
+					$.each(data.message || [], function(i, v){
+						var d = frappe.model.add_child(frm.doc, "Subscription Plan Detail", "subscription_plans");
+						d.qty = v.qty;
+						d.plan = v.plan;
+					});
+					frm.refresh_field("subscription_plans");
+				}
+			}
+		});
+	}
+});
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index e21afa4..4148dce 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -15,6 +15,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,11 +43,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,11 +75,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -106,11 +109,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -137,11 +141,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -168,11 +173,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -198,11 +204,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -230,11 +237,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -262,11 +270,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -295,11 +304,44 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_a_subscription", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is a Subscription", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -328,11 +370,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -360,11 +403,79 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_a_subscription", 
+   "fieldname": "subscription_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Subscription Section", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "subscription_plans", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Subscription Plans", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Subscription Plan Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -390,11 +501,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -421,11 +533,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -453,11 +566,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -484,11 +598,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -515,11 +630,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -547,16 +663,17 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "payment_gateway_account.payment_gateway",
+   "fetch_from": "payment_gateway_account.payment_gateway", 
    "fieldname": "payment_gateway", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -580,16 +697,17 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "payment_gateway_account.payment_account",
+   "fetch_from": "payment_gateway_account.payment_account", 
    "fieldname": "payment_account", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -613,11 +731,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -644,11 +763,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -676,11 +796,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -708,11 +829,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -739,7 +861,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -753,7 +875,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-05-16 22:43:28.136835",
+ "modified": "2018-06-20 17:06:43.850174", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Request", 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index a633cc3..e7371bd 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -12,12 +12,15 @@
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry, get_company_defaults
 from frappe.integrations.utils import get_payment_gateway_controller
 from frappe.utils.background_jobs import enqueue
+from erpnext.erpnext_integrations.stripe_integration import create_stripe_subscription
+from erpnext.accounts.doctype.subscription_plan.subscription_plan import get_plan_rate
 
 class PaymentRequest(Document):
 	def validate(self):
 		self.validate_reference_document()
 		self.validate_payment_request()
 		self.validate_currency()
+		self.validate_subscription_details()
 
 	def validate_reference_document(self):
 		if not self.reference_doctype or not self.reference_name:
@@ -33,6 +36,21 @@
 		if self.payment_account and ref_doc.currency != frappe.db.get_value("Account", self.payment_account, "account_currency"):
 			frappe.throw(_("Transaction currency must be same as Payment Gateway currency"))
 
+	def validate_subscription_details(self):
+		if self.is_a_subscription:
+			amount = 0
+			for subscription_plan in self.subscription_plans:
+				payment_gateway = frappe.db.get_value("Subscription Plan", subscription_plan.plan, "payment_gateway")
+				if payment_gateway != self.payment_gateway_account:
+					frappe.throw(_('The payment gateway account in plan {0} is different from the payment gateway account in this payment request'.format(subscription_plan.name)))
+
+				rate = get_plan_rate(subscription_plan.plan, quantity=subscription_plan.qty)
+
+				amount += rate
+
+			if amount != self.grand_total:
+				frappe.msgprint(_("The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document.".format(self.grand_total, amount)))
+
 	def on_submit(self):
 		send_mail = self.payment_gateway_validation()
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
@@ -226,15 +244,19 @@
 				success_url = shopping_cart_settings.payment_success_url
 				if success_url:
 					redirect_to = ({
-						"Orders": "orders",
-						"Invoices": "invoices",
-						"My Account": "me"
-					}).get(success_url, "me")
+						"Orders": "/orders",
+						"Invoices": "/invoices",
+						"My Account": "/me"
+					}).get(success_url, "/me")
 				else:
 					redirect_to = get_url("/orders/{0}".format(self.reference_name))
 
 			return redirect_to
 
+	def create_subscription(self, payment_provider, gateway_controller, data):
+		if payment_provider == "stripe":
+			return create_stripe_subscription(gateway_controller, data)
+
 @frappe.whitelist(allow_guest=True)
 def make_payment_request(**args):
 	"""Make payment request"""
@@ -375,3 +397,14 @@
 
 <p>{{ _("Thank you for your business!") }}</p>
 """, dict(doc=doc, payment_url = '{{ payment_url }}'))
+
+@frappe.whitelist()
+def get_subscription_details(reference_doctype, reference_name):
+	if reference_doctype == "Sales Invoice":
+		subscriptions = frappe.db.sql("""SELECT parent as sub_name FROM `tabSubscription Invoice` WHERE invoice=%s""",reference_name, as_dict=1)
+		subscription_plans = []
+		for subscription in subscriptions:
+			plans = frappe.get_doc("Subscription", subscription.sub_name).plans
+			for plan in plans:
+				subscription_plans.append(plan)
+		return subscription_plans
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.js b/erpnext/accounts/doctype/payment_request/test_payment_request.js
new file mode 100644
index 0000000..070b595
--- /dev/null
+++ b/erpnext/accounts/doctype/payment_request/test_payment_request.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Payment Request", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Payment Request
+		() => frappe.tests.make('Payment Request', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 4db56f3..6eb629c 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -4493,7 +4493,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-07-17 02:38:40.310899",
+ "modified": "2018-07-30 08:35:17.736855",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index f01caad..bd0a4d7 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -5442,7 +5442,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-07-18 13:16:20.918322",
+ "modified": "2018-07-30 08:34:55.545490",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
diff --git a/erpnext/accounts/doctype/subscription/subscription.json b/erpnext/accounts/doctype/subscription/subscription.json
index 5d64d9a..a58ac3e 100644
--- a/erpnext/accounts/doctype/subscription/subscription.json
+++ b/erpnext/accounts/doctype/subscription/subscription.json
@@ -118,39 +118,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "1", 
-   "fieldname": "quantity", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Quantity", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "subscription_period", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -847,7 +814,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-11 19:34:44.582203", 
+ "modified": "2018-07-13 15:18:49.016010", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Subscription", 
diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py
index 72f86f2..fe39161 100644
--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -8,6 +8,7 @@
 from frappe import _
 from frappe.model.document import Document
 from frappe.utils.data import nowdate, getdate, cint, add_days, date_diff, get_last_day, add_to_date, flt
+from erpnext.accounts.doctype.subscription_plan.subscription_plan import get_plan_rate
 
 
 class Subscription(Document):
@@ -244,7 +245,6 @@
 		# for that reason
 		items_list = self.get_items_from_plans(self.plans, prorate)
 		for item in items_list:
-			item['qty'] = self.quantity
 			invoice.append('items',	item)
 
 		# Taxes
@@ -272,6 +272,10 @@
 			discount_on = self.apply_additional_discount
 			invoice.apply_additional_discount = discount_on if discount_on else 'Grand Total'
 
+		# Subscription period
+		invoice.from_date = self.current_invoice_start
+		invoice.to_date = self.current_invoice_end
+
 		invoice.flags.ignore_mandatory = True
 		invoice.save()
 		invoice.submit()
@@ -283,28 +287,25 @@
 		"""
 		Returns the `Customer` linked to the `Subscriber`
 		"""
-		return frappe.get_value('Subscriber', subscriber_name, 'customer')
+		return frappe.db.get_value('Subscriber', subscriber_name, 'customer')
 
 	def get_items_from_plans(self, plans, prorate=0):
 		"""
 		Returns the `Item`s linked to `Subscription Plan`
 		"""
-		plan_items = [plan.plan for plan in plans]
-		item_details = None
+		if prorate:
+			prorate_factor = get_prorata_factor(self.current_invoice_end, self.current_invoice_start)
 
-		if plan_items:
-			item_details = frappe.db.sql(
-				'select item as item_code, cost as rate from `tabSubscription Plan` where name in %s',
-				(plan_items,), as_dict=1
-			)
+		items = []
+		customer = self.get_customer(self.subscriber)
+		for plan in plans:
+			item_code = frappe.db.get_value("Subscription Plan", plan.plan, "item")
+			if not prorate:
+				items.append({'item_code': item_code, 'qty': plan.qty, 'rate': get_plan_rate(plan.plan, plan.qty, customer)})
+			else:
+				items.append({'item_code': item_code, 'qty': plan.qty, 'rate': (get_plan_rate(plan.plan, plan.qty, customer) * prorate_factor)})
 
-			if prorate:
-				prorate_factor = get_prorata_factor(self.current_invoice_end, self.current_invoice_start)
-
-				for item in item_details:
-					item['rate'] = item['rate'] * prorate_factor
-
-		return item_details
+		return items
 
 	def process(self):
 		"""
@@ -329,7 +330,7 @@
 		2. Change the `Subscription` status to 'Past Due Date'
 		3. Change the `Subscription` status to 'Cancelled'
 		"""
-		if getdate(nowdate()) > getdate(self.current_invoice_end) and not self.has_outstanding_invoice():
+		if getdate(nowdate()) > getdate(self.current_invoice_end) or (getdate(nowdate()) >= getdate(self.current_invoice_end) and getdate(self.current_invoice_end) == getdate(self.current_invoice_start)) and not self.has_outstanding_invoice():
 			self.generate_invoice()
 			if self.current_invoice_is_past_due():
 				self.status = 'Past Due Date'
@@ -363,7 +364,7 @@
 		else:
 			if self.is_not_outstanding(current_invoice):
 				self.status = 'Active'
-				self.update_subscription_period(nowdate())
+				self.update_subscription_period(add_days(self.current_invoice_end, 1))
 			else:
 				self.set_status_grace_period()
 
diff --git a/erpnext/accounts/doctype/subscription/test_subscription.py b/erpnext/accounts/doctype/subscription/test_subscription.py
index 47efa45..c42b8e8 100644
--- a/erpnext/accounts/doctype/subscription/test_subscription.py
+++ b/erpnext/accounts/doctype/subscription/test_subscription.py
@@ -15,6 +15,7 @@
 		plan = frappe.new_doc('Subscription Plan')
 		plan.plan_name = '_Test Plan Name'
 		plan.item = '_Test Non Stock Item'
+		plan.price_determination = "Fixed rate"
 		plan.cost = 900
 		plan.billing_interval = 'Month'
 		plan.billing_interval_count = 1
@@ -24,6 +25,7 @@
 		plan = frappe.new_doc('Subscription Plan')
 		plan.plan_name = '_Test Plan Name 2'
 		plan.item = '_Test Non Stock Item'
+		plan.price_determination = "Fixed rate"
 		plan.cost = 1999
 		plan.billing_interval = 'Month'
 		plan.billing_interval_count = 1
@@ -33,6 +35,7 @@
 		plan = frappe.new_doc('Subscription Plan')
 		plan.plan_name = '_Test Plan Name 3'
 		plan.item = '_Test Non Stock Item'
+		plan.price_determination = "Fixed rate"
 		plan.cost = 1999
 		plan.billing_interval = 'Day'
 		plan.billing_interval_count = 14
@@ -58,7 +61,7 @@
 		subscription.subscriber = '_Test Customer'
 		subscription.trial_period_start = nowdate()
 		subscription.trial_period_end = add_days(nowdate(), 30)
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 
 		self.assertEqual(subscription.trial_period_start, nowdate())
@@ -73,7 +76,7 @@
 	def test_create_subscription_without_trial_with_correct_period(self):
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 
 		self.assertEqual(subscription.trial_period_start, None)
@@ -91,7 +94,7 @@
 		subscription.subscriber = '_Test Customer'
 		subscription.trial_period_end = nowdate()
 		subscription.trial_period_start = add_days(nowdate(), 30)
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 
 		self.assertRaises(frappe.ValidationError, subscription.save)
 		subscription.delete()
@@ -101,8 +104,8 @@
 		subscription.subscriber = '_Test Customer'
 		subscription.trial_period_end = nowdate()
 		subscription.trial_period_start = add_days(nowdate(), 30)
-		subscription.append('plans', {'plan': '_Test Plan Name'})
-		subscription.append('plans', {'plan': '_Test Plan Name 3'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
+		subscription.append('plans', {'plan': '_Test Plan Name 3', 'qty': 1})
 
 		self.assertRaises(frappe.ValidationError, subscription.save)
 		subscription.delete()
@@ -111,7 +114,7 @@
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
 		subscription.start = '2018-01-01'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.insert()
 
 		self.assertEqual(subscription.status, 'Active')
@@ -127,7 +130,7 @@
 	def test_status_goes_back_to_active_after_invoice_is_paid(self):
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
 		subscription.process()	# generate first invoice
@@ -144,7 +147,7 @@
 		subscription.process()
 
 		self.assertEqual(subscription.status, 'Active')
-		self.assertEqual(subscription.current_invoice_start, nowdate())
+		self.assertEqual(subscription.current_invoice_start, add_months(subscription.start, 1))
 		self.assertEqual(len(subscription.invoices), 1)
 
 		subscription.delete()
@@ -157,7 +160,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
 		subscription.process()		# generate first invoice
@@ -180,7 +183,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
 		subscription.process()		# generate first invoice
@@ -198,7 +201,7 @@
 	def test_subscription_invoice_days_until_due(self):
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.days_until_due = 10
 		subscription.start = add_months(nowdate(), -1)
 		subscription.insert()
@@ -216,7 +219,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
 		subscription.process()		# generate first invoice
@@ -240,7 +243,7 @@
 	def test_subscription_remains_active_during_invoice_period(self):
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.process()		# no changes expected
 
@@ -266,7 +269,7 @@
 	def test_subscription_cancelation(self):
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.cancel_subscription()
 
@@ -282,7 +285,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 
 		self.assertEqual(subscription.status, 'Active')
@@ -317,7 +320,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.cancel_subscription()
 		invoice = subscription.get_current_invoice()
@@ -337,7 +340,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.cancel_subscription()
 
@@ -361,7 +364,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
 		subscription.process()	# generate first invoice
@@ -395,7 +398,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
 		subscription.process()		# generate first invoice
@@ -432,7 +435,7 @@
 
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.start = '2018-01-01'
 		subscription.insert()
 		subscription.process()		# generate first invoice
@@ -450,8 +453,9 @@
 		subscription.process()
 		self.assertEqual(subscription.status, 'Active')
 
+		# A new invoice is generated
 		subscription.process()
-		self.assertEqual(subscription.status, 'Active')
+		self.assertEqual(subscription.status, 'Past Due Date')
 
 		settings.cancel_after_grace = default_grace_period_action
 		settings.save()
@@ -460,7 +464,7 @@
 	def test_restart_active_subscription(self):
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 
 		self.assertRaises(frappe.ValidationError, subscription.restart_subscription)
@@ -471,7 +475,7 @@
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
 		subscription.additional_discount_percentage = 10
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.cancel_subscription()
 
@@ -486,7 +490,7 @@
 		subscription = frappe.new_doc('Subscription')
 		subscription.subscriber = '_Test Customer'
 		subscription.additional_discount_amount = 11
-		subscription.append('plans', {'plan': '_Test Plan Name'})
+		subscription.append('plans', {'plan': '_Test Plan Name', 'qty': 1})
 		subscription.save()
 		subscription.cancel_subscription()
 
diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.js b/erpnext/accounts/doctype/subscription_plan/subscription_plan.js
index f5ea804..aaa32cf 100644
--- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.js
+++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.js
@@ -1,2 +1,9 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
+
+frappe.ui.form.on('Subscription Plan', {
+	price_determination: function(frm) {
+		frm.toggle_reqd("cost", frm.doc.price_determination === 'Fixed rate');
+		frm.toggle_reqd("price_list", frm.doc.price_determination === 'Based on price list');
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.json b/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
index ab58e7c..453521d 100644
--- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
+++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
@@ -15,6 +15,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,42 +43,11 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "translatable": 0, 
-   "unique": 0
+   "unique": 1
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -110,10 +80,172 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "price_determination", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Price Determination", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nFixed rate\nBased on price list", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_7", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.price_determination==\"Fixed rate\"", 
    "fieldname": "cost", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -133,7 +265,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "translatable": 0, 
@@ -141,6 +273,72 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.price_determination==\"Based on price list\"", 
+   "fieldname": "price_list", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Price List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Price List", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_11", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -174,6 +372,38 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_13", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -204,6 +434,134 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_plan_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Plan", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_plan_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Plan", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_gateway", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Gateway", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Gateway 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, 
+   "translatable": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -216,7 +574,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-02-27 09:12:58.330140", 
+ "modified": "2018-06-20 16:59:54.082358", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Subscription Plan", 
@@ -225,7 +583,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -244,7 +601,7 @@
    "write": 1
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "show_name_in_global_search": 0, 
diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.py b/erpnext/accounts/doctype/subscription_plan/subscription_plan.py
index 4b8c8fc..d3fef60 100644
--- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.py
+++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+from erpnext.utilities.product import get_price
 
 class SubscriptionPlan(Document):
 	def validate(self):
@@ -13,3 +14,21 @@
 	def validate_interval_count(self):
 		if self.billing_interval_count < 1:
 			frappe.throw('Billing Interval Count cannot be less than 1')
+
+@frappe.whitelist()
+def get_plan_rate(plan, quantity=1, customer=None):
+	plan = frappe.get_doc("Subscription Plan", plan)
+	if plan.price_determination == "Fixed rate":
+		return plan.cost
+
+	elif plan.price_determination == "Based on price list":
+		if customer:
+			customer_group = frappe.db.get_value("Customer", customer, "customer_group")
+		else:
+			customer_group = None
+		
+		price = get_price(item_code=plan.item, price_list=plan.price_list, customer_group=customer_group, company=None, qty=quantity)
+		if not price:
+			return 0
+		else:
+			return price.price_list_rate
diff --git a/erpnext/accounts/doctype/subscription_plan_detail/subscription_plan_detail.json b/erpnext/accounts/doctype/subscription_plan_detail/subscription_plan_detail.json
index c112923..ca54a16 100644
--- a/erpnext/accounts/doctype/subscription_plan_detail/subscription_plan_detail.json
+++ b/erpnext/accounts/doctype/subscription_plan_detail/subscription_plan_detail.json
@@ -14,6 +14,39 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "qty", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Quantity", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -55,7 +88,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-02-25 07:35:07.736146", 
+ "modified": "2018-06-20 15:35:13.514699", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Subscription Plan Detail", 
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py
index c71ecf4..204eceb 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -11,6 +11,8 @@
 	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year,
 		filters.periodicity, company=filters.company)
 
+	currency = filters.presentation_currency or frappe.db.get_value("Company", filters.company, "default_currency")
+
 	asset = get_data(filters.company, "Asset", "Debit", period_list,
 		only_current_fiscal_year=False, filters=filters,
 		accumulated_values=filters.accumulated_values)
@@ -24,7 +26,7 @@
 		accumulated_values=filters.accumulated_values)
 
 	provisional_profit_loss, total_credit = get_provisional_profit_loss(asset, liability, equity,
-		period_list, filters.company)
+		period_list, filters.company, currency)
 
 	message, opening_balance = check_opening_balance(asset, liability, equity)
 
@@ -37,7 +39,7 @@
 			"account_name": "'" + _("Unclosed Fiscal Years Profit / Loss (Credit)") + "'",
 			"account": "'" + _("Unclosed Fiscal Years Profit / Loss (Credit)") + "'",
 			"warn_if_negative": True,
-			"currency": frappe.db.get_value("Company", filters.company, "default_currency")
+			"currency": currency
 		}
 		for period in period_list:
 			unclosed[period.key] = opening_balance
@@ -58,12 +60,12 @@
 
 	return columns, data, message, chart
 
-def get_provisional_profit_loss(asset, liability, equity, period_list, company, consolidated=False):
+def get_provisional_profit_loss(asset, liability, equity, period_list, company, currency=None, consolidated=False):
 	provisional_profit_loss = {}
 	total_row = {}
 	if asset and (liability or equity):
 		total = total_row_total=0
-		currency = frappe.db.get_value("Company", company, "default_currency")
+		currency = currency or frappe.db.get_value("Company", company, "default_currency")
 		total_row = {
 			"account_name": "'" + _("Total (Credit)") + "'",
 			"account": "'" + _("Total (Credit)") + "'",
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index f8eec9e..46417b8 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -210,14 +210,15 @@
 		has_value = False
 		total = 0
 		row = frappe._dict({
-			"account_name": _(d.account_name),
 			"account": _(d.name),
 			"parent_account": _(d.parent_account),
 			"indent": flt(d.indent),
 			"year_start_date": year_start_date,
 			"year_end_date": year_end_date,
 			"currency": company_currency,
-			"opening_balance": d.get("opening_balance", 0.0) * (1 if balance_must_be == "Debit" else -1)
+			"opening_balance": d.get("opening_balance", 0.0) * (1 if balance_must_be=="Debit" else -1),
+			"account_name": ('{} - {}'.format(_(d.account_number), _(d.account_name))
+				if d.account_number else _(d.account_name))
 		})
 		for period in period_list:
 			if d.get(period.key) and balance_must_be == "Credit":
@@ -281,8 +282,9 @@
 
 
 def get_accounts(company, root_type):
-	return frappe.db.sql(
-		"""select name, parent_account, lft, rgt, root_type, report_type, account_name from `tabAccount`
+	return frappe.db.sql("""
+		select name, account_number, parent_account, lft, rgt, root_type, report_type, account_name
+		from `tabAccount`
 		where company=%s and root_type=%s order by lft""", (company, root_type), as_dict=True)
 
 
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 0663228..5ba0bde 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -80,6 +80,7 @@
 			"label": __("Party"),
 			"fieldtype": "MultiSelect",
 			get_data: function() {
+				if (!frappe.query_report.filters) return;
 				var party_type = frappe.query_report.get_filter_value('party_type');
 				var parties = frappe.query_report.get_filter_value('party');
 				if(!party_type) return;
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 ccd3a82..7df877f 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
@@ -157,6 +157,9 @@
 
 	return so_dn_map
 
+def get_deducted_taxes():
+	return frappe.db.sql_list("select name from `tabPurchase Taxes and Charges` where add_deduct_tax = 'Deduct'")
+
 def get_tax_accounts(item_list, columns, company_currency,
 		doctype="Sales Invoice", tax_doctype="Sales Taxes and Charges"):
 	import json
@@ -176,9 +179,10 @@
 	if doctype == "Purchase Invoice":
 		conditions = " and category in ('Total', 'Valuation and Total') and base_tax_amount_after_discount_amount != 0"
 
+	deducted_tax = get_deducted_taxes()
 	tax_details = frappe.db.sql("""
 		select
-			parent, description, item_wise_tax_detail,
+			name, parent, description, item_wise_tax_detail,
 			charge_type, base_tax_amount_after_discount_amount
 		from `tab%s`
 		where
@@ -190,7 +194,7 @@
 	""" % (tax_doctype, '%s', ', '.join(['%s']*len(invoice_item_row)), conditions),
 		tuple([doctype] + list(invoice_item_row)))
 
-	for parent, description, item_wise_tax_detail, charge_type, tax_amount in tax_details:
+	for name, parent, description, item_wise_tax_detail, charge_type, tax_amount in tax_details:
 		description = handle_html(description)
 		if description not in tax_columns and tax_amount:
 			# as description is text editor earlier and markup can break the column convention in reports
@@ -219,9 +223,13 @@
 						item_tax_amount = flt((tax_amount * d.base_net_amount) / item_net_amount) \
 							if item_net_amount else 0
 						if item_tax_amount:
+							tax_amount = flt(item_tax_amount, tax_amount_precision)
+							tax_amount = (tax_amount * -1
+								if (doctype == 'Purchase Invoice' and name in deducted_tax) else tax_amount)
+
 							itemised_tax.setdefault(d.name, {})[description] = frappe._dict({
 								"tax_rate": tax_rate,
-								"tax_amount": flt(item_tax_amount, tax_amount_precision)
+								"tax_amount": tax_amount
 							})
 
 			except ValueError:
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
index 33a2948..80b50b9 100644
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
@@ -59,20 +59,21 @@
 				"fieldtype": "Check"
 			}
 		],
-		"formatter": function(row, cell, value, columnDef, dataContext, default_formatter) {
-			if (columnDef.df.fieldname=="account") {
-				value = dataContext.account_name;
+		"formatter": function(value, row, column, data, default_formatter) {
+			if (column.fieldname=="account") {
+				value = data.account_name;
 
-				columnDef.df.link_onclick =
-					"frappe.query_reports['Profitability Analysis'].open_profit_and_loss_statement(" + JSON.stringify(dataContext) + ")";
-				columnDef.df.is_tree = true;
+				column.link_onclick =
+					"frappe.query_reports['Profitability Analysis'].open_profit_and_loss_statement(" + JSON.stringify(data) + ")";
+				column.is_tree = true;
 			}
 
-			value = default_formatter(row, cell, value, columnDef, dataContext);
+			value = default_formatter(value, row, column, data);
 
-			if (!dataContext.parent_account && dataContext.based_on != 'project') {
+			if (!data.parent_account && data.based_on != 'project') {
+				value = $(`<span>${value}</span>`);
 				var $value = $(value).css("font-weight", "bold");
-				if (dataContext.warn_if_negative && dataContext[columnDef.df.fieldname] < 0) {
+				if (data.warn_if_negative && data[column.fieldname] < 0) {
 					$value.addClass("text-danger");
 				}
 
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 8c55df5..657523b 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -51,8 +51,9 @@
 		filters.to_date = filters.year_end_date
 
 def get_data(filters):
-	accounts = frappe.db.sql("""select name, parent_account, account_name, account_number, root_type, report_type, lft, rgt
-		from `tabAccount` where company=%s order by account_name, lft""", filters.company, as_dict=True)
+	accounts = frappe.db.sql("""
+		select name, account_number, parent_account, account_name, root_type, report_type, lft, rgt
+		from `tabAccount` where company=%s order by lft""", filters.company, as_dict=True)
 	company_currency = erpnext.get_company_currency(filters.company)
 
 	if not accounts:
@@ -162,8 +163,6 @@
 		total_row["credit"] += d["credit"]
 		total_row["opening_debit"] += d["opening_debit"]
 		total_row["opening_credit"] += d["opening_credit"]
-		total_row["closing_debit"] += (d["opening_debit"] + d["debit"])
-		total_row["closing_credit"] += (d["opening_credit"] + d["credit"])
 
 	return total_row
 
@@ -179,16 +178,19 @@
 	if not (accounts[0].account_number is None):
 		accounts = tmpaccnt
 	
+	total_row["closing_debit"] = total_row["closing_credit"] = 0
+
 	for d in accounts:
 		has_value = False
 		row = {
-			"account_name": d.account_name,
 			"account": d.name,
 			"parent_account": d.parent_account,
 			"indent": d.indent,
 			"from_date": filters.from_date,
 			"to_date": filters.to_date,
-			"currency": company_currency
+			"currency": company_currency,
+			"account_name": ('{} - {}'.format(d.account_number, d.account_name)
+				if d.account_number else d.account_name)
 		}
 
 		prepare_opening_and_closing(d)
@@ -203,6 +205,10 @@
 		row["has_value"] = has_value
 		data.append(row)
 		
+		if not d.parent_account:
+		    total_row["closing_debit"] += (d["debit"] - d["credit"]) if (d["debit"] - d["credit"]) > 0 else 0
+		    total_row["closing_credit"] += abs(d["debit"] - d["credit"]) if (d["debit"] - d["credit"]) < 0 else 0
+		
 	data.extend([{},total_row])
 
 	return data
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index c430b56..599afe0 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -1879,7 +1879,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-27 06:30:25.506194", 
+ "modified": "2018-07-30 08:30:37.355749",
  "modified_by": "Administrator", 
  "module": "Assets", 
  "name": "Asset", 
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 985d13e..e475a5e 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -115,7 +115,7 @@
 
 				from_date = self.available_for_use_date
 				if number_of_pending_depreciations:
-					next_depr_date = getdate(add_months(self.available_for_use_date, 
+					next_depr_date = getdate(add_months(self.available_for_use_date,
 						number_of_pending_depreciations * 12))
 					if  (cint(frappe.db.get_value("Asset Settings", None, "schedule_based_on_fiscal_year")) == 1
 						and getdate(d.depreciation_start_date) < next_depr_date):
@@ -315,14 +315,14 @@
 		elif self.docstatus == 1:
 			status = "Submitted"
 
-			idx = self.get_default_finance_book_idx() or 0
-
-			expected_value_after_useful_life = self.finance_books[idx].expected_value_after_useful_life
-			value_after_depreciation = self.finance_books[idx].value_after_depreciation
-
 			if self.journal_entry_for_scrap:
 				status = "Scrapped"
 			elif self.finance_books:
+				idx = self.get_default_finance_book_idx() or 0
+
+				expected_value_after_useful_life = self.finance_books[idx].expected_value_after_useful_life
+				value_after_depreciation = self.finance_books[idx].value_after_depreciation
+
 				if flt(value_after_depreciation) <= expected_value_after_useful_life:
 					status = "Fully Depreciated"
 				elif flt(value_after_depreciation) < flt(self.gross_purchase_amount):
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 16e7749..3c0d44e 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -3671,7 +3671,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-27 07:49:53.131408", 
+ "modified": "2018-07-30 08:35:10.345286",
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 8f7bb2b..6576bcf 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -2779,7 +2779,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-07-17 02:45:48.616334",
+ "modified": "2018-07-30 08:36:34.701682",
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
diff --git a/erpnext/config/healthcare.py b/erpnext/config/healthcare.py
index ae36f9c..e55f736 100644
--- a/erpnext/config/healthcare.py
+++ b/erpnext/config/healthcare.py
@@ -38,6 +38,11 @@
 					"type": "doctype",
 					"name": "Clinical Procedure",
 					"label": _("Clinical Procedure"),
+				},
+				{
+					"type": "doctype",
+					"name": "Inpatient Record",
+					"label": _("Inpatient Record"),
 				}
 			]
 		},
@@ -167,6 +172,11 @@
 					"type": "doctype",
 					"name": "Clinical Procedure Template",
 					"label": _("Clinical Procedure Template"),
+				},
+				{
+					"type": "doctype",
+					"name": "Healthcare Service Unit Type",
+					"label": _("Healthcare Service Unit Type")
 				}
 			]
 		}
diff --git a/erpnext/config/erpnext_integrations.py b/erpnext/config/integrations.py
similarity index 100%
rename from erpnext/config/erpnext_integrations.py
rename to erpnext/config/integrations.py
diff --git a/erpnext/demo/user/education.py b/erpnext/demo/user/education.py
index 4fc9c6a..fc31176 100644
--- a/erpnext/demo/user/education.py
+++ b/erpnext/demo/user/education.py
@@ -51,12 +51,12 @@
 		
 def assign_student_group(student, student_name, program, courses, batch):
 	course_list = [d["course"] for d in courses]
-	for d in frappe.get_list("Student Group", fields=("name"), filters={"program": program, "course":("in", course_list)}):
+	for d in frappe.get_list("Student Group", fields=("name"), filters={"program": program, "course":("in", course_list), "disabled": 0}):
 		student_group = frappe.get_doc("Student Group", d.name)
 		student_group.append("students", {"student": student, "student_name": student_name,
 			"group_roll_number":len(student_group.students)+1, "active":1})
 		student_group.save()
-	student_batch = frappe.get_list("Student Group", fields=("name"), filters={"program": program, "group_based_on":"Batch", "batch":batch})[0]
+	student_batch = frappe.get_list("Student Group", fields=("name"), filters={"program": program, "group_based_on":"Batch", "batch":batch, "disabled": 0})[0]
 	student_batch_doc = frappe.get_doc("Student Group", student_batch.name)
 	student_batch_doc.append("students", {"student": student, "student_name": student_name,
 		"group_roll_number":len(student_batch_doc.students)+1, "active":1})
@@ -65,7 +65,7 @@
 
 def mark_student_attendance(current_date):
 	status = ["Present", "Absent"]
-	for d in frappe.db.get_list("Student Group", filters={"group_based_on": "Batch"}):
+	for d in frappe.db.get_list("Student Group", filters={"group_based_on": "Batch", "disabled": 0}):
 		students = get_student_group_students(d.name)
 		for stud in students:
 			make_attendance_records(stud.student, stud.student_name, status[weighted_choice([9,4])], None, d.name, current_date)
@@ -77,7 +77,7 @@
 
 def make_assessment_plan(date):
 	for d in range(1,4):
-		random_group = get_random("Student Group", {"group_based_on": "Course"}, True)
+		random_group = get_random("Student Group", {"group_based_on": "Course", "disabled": 0}, True)
 		doc = frappe.new_doc("Assessment Plan")
 		doc.student_group = random_group.name
 		doc.course = random_group.course
diff --git a/erpnext/education/api.py b/erpnext/education/api.py
index 8571bf9..30d5588 100644
--- a/erpnext/education/api.py
+++ b/erpnext/education/api.py
@@ -88,16 +88,14 @@
 	:param course_schedule: Course Schedule.
 	:param status: Status (Present/Absent)
 	"""
-	student_attendance_list = frappe.get_list("Student Attendance", fields = ['name'], filters = {
+	student_attendance = frappe.get_doc({
+		"doctype": "Student Attendance", 
 		"student": student,
 		"course_schedule": course_schedule,
 		"student_group": student_group,
 		"date": date
 	})
-		
-	if student_attendance_list:
-		student_attendance = frappe.get_doc("Student Attendance", student_attendance_list[0])
-	else:
+	if not student_attendance:
 		student_attendance = frappe.new_doc("Student Attendance")
 	student_attendance.student = student
 	student_attendance.student_name = student_name
diff --git a/erpnext/education/doctype/education_settings/education_settings.json b/erpnext/education/doctype/education_settings/education_settings.json
index a0b8e99..c1eaa11 100644
--- a/erpnext/education/doctype/education_settings/education_settings.json
+++ b/erpnext/education/doctype/education_settings/education_settings.json
@@ -201,6 +201,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "default": "0", 
+   "description": "If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.", 
+   "fieldname": "academic_term_reqd", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Make Academic Term Mandatory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -267,7 +299,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-28 15:45:30.324324", 
+ "modified": "2018-07-26 04:43:35.406690", 
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Education Settings", 
diff --git a/erpnext/education/doctype/fee_schedule/fee_schedule.js b/erpnext/education/doctype/fee_schedule/fee_schedule.js
index c4fff77..1338331 100644
--- a/erpnext/education/doctype/fee_schedule/fee_schedule.js
+++ b/erpnext/education/doctype/fee_schedule/fee_schedule.js
@@ -31,7 +31,8 @@
 			return {
 				"program": frm.doc.program,
 				"academic_term": frm.doc.academic_term,
-				"academic_year": frm.doc.academic_year
+				"academic_year": frm.doc.academic_year,
+				"disabled": 0
 			};
 		});
 		frappe.realtime.on("fee_schedule_progress", function(data) {
diff --git a/erpnext/education/doctype/program_enrollment/program_enrollment.json b/erpnext/education/doctype/program_enrollment/program_enrollment.json
index 817c4bc..23da149 100644
--- a/erpnext/education/doctype/program_enrollment/program_enrollment.json
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.json
@@ -693,7 +693,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-05-16 22:43:04.881120",
+ "modified": "2018-07-26 04:44:03.781418", 
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Program Enrollment", 
diff --git a/erpnext/education/doctype/program_enrollment/program_enrollment.py b/erpnext/education/doctype/program_enrollment/program_enrollment.py
index 0f9bb96..320a58a 100644
--- a/erpnext/education/doctype/program_enrollment/program_enrollment.py
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.py
@@ -26,7 +26,6 @@
 			"student": self.student,
 			"program": self.program,
 			"academic_year": self.academic_year,
-			"academic_term": self.academic_term,
 			"docstatus": ("<", 2),
 			"name": ("!=", self.name)
 		})
@@ -86,7 +85,6 @@
 					"program": filters['program']
 				})
 
-
 @frappe.whitelist()
 def get_students(doctype, txt, searchfield, start, page_len, filters):
 	if not filters.get("academic_term"):
diff --git a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js
index 2e54a2f..06d7598 100644
--- a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js
+++ b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js
@@ -5,6 +5,9 @@
 	setup: function(frm) {
 		frm.add_fetch("student", "title", "student_name");
 		frm.add_fetch("student_applicant", "title", "student_name");
+		if(frm.doc.__onload && frm.doc.__onload.academic_term_reqd) {
+			frm.toggle_reqd("academic_term", true);
+		}
 	},
 
 	"refresh": function(frm) {
diff --git a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json
index d611a6f..35ad98d 100644
--- a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json
+++ b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.json
@@ -513,7 +513,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-01-02 11:59:40.230689", 
+ "modified": "2018-07-26 04:44:13.232146", 
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Program Enrollment Tool", 
diff --git a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py
index 0b13449..db23ac7 100644
--- a/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py
+++ b/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py
@@ -7,8 +7,13 @@
 from frappe import _
 from frappe.model.document import Document
 from erpnext.education.api import enroll_student
+from frappe.utils import cint
 
 class ProgramEnrollmentTool(Document):
+	def onload(self):
+		academic_term_reqd = cint(frappe.db.get_single_value('Education Settings', 'academic_term_reqd'))
+		self.set_onload("academic_term_reqd", academic_term_reqd)
+
 	def get_students(self):
 		students = []
 		if not self.get_students_from:
diff --git a/erpnext/education/doctype/student_attendance/student_attendance.json b/erpnext/education/doctype/student_attendance/student_attendance.json
index f703053..23e10e6 100644
--- a/erpnext/education/doctype/student_attendance/student_attendance.json
+++ b/erpnext/education/doctype/student_attendance/student_attendance.json
@@ -3,7 +3,7 @@
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
- "autoname": "SA.######", 
+ "autoname": "", 
  "beta": 0, 
  "creation": "2015-11-05 15:20:23.045996", 
  "custom": 0, 
@@ -40,7 +40,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 0, 
+   "search_index": 1, 
    "set_only_once": 0, 
    "translatable": 0,
    "unique": 0
@@ -103,7 +103,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 0, 
+   "search_index": 1, 
    "set_only_once": 0, 
    "translatable": 0,
    "unique": 0
@@ -247,7 +247,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-05-16 22:43:27.329881",
+ "modified": "2018-07-27 10:48:22.301531", 
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Student Attendance", 
diff --git a/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js
index df6d132..cc9607d 100644
--- a/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js
+++ b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js
@@ -7,7 +7,8 @@
 		frm.set_query("student_group", function() {
 			return {
 				"filters": {
-					"group_based_on": frm.doc.group_based_on
+					"group_based_on": frm.doc.group_based_on,
+					"disabled": 0
 				}
 			};
 		});
diff --git a/erpnext/education/doctype/student_group/student_group.json b/erpnext/education/doctype/student_group/student_group.json
index 37a611b..0af1565 100644
--- a/erpnext/education/doctype/student_group/student_group.json
+++ b/erpnext/education/doctype/student_group/student_group.json
@@ -298,6 +298,37 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "collapsible_depends_on": "", 
    "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
@@ -459,7 +490,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-11-10 19:09:37.370864", 
+ "modified": "2018-07-26 04:17:10.836912", 
  "modified_by": "Administrator", 
  "module": "Education", 
  "name": "Student Group", 
diff --git a/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py
index 19136ea..c2ac0d7 100644
--- a/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py
+++ b/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py
@@ -99,7 +99,7 @@
 
 def get_student_roll_no(academic_year, program, batch):
 	student_group = frappe.get_all("Student Group",
-		filters={"academic_year":academic_year, "program":program, "batch":batch})
+		filters={"academic_year":academic_year, "program":program, "batch":batch, "disabled": 0})
 	if student_group:
 		roll_no_dict = dict(frappe.db.sql('''select student, group_roll_number from `tabStudent Group Student` where parent=%s''',
 			(student_group[0].name)))
diff --git a/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py b/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py
index af15cf5..c65e3ce 100644
--- a/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py
+++ b/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py
@@ -145,11 +145,11 @@
 
 		if self.flags.status_changed_to == "Completed":
 			status = 'Completed'
-			if self.data.reference_doctype and self.data.reference_docname:
+			if 'reference_doctype' in self.data and 'reference_docname' in self.data:
 				custom_redirect_to = None
 				try:
-					custom_redirect_to = frappe.get_doc(self.data.reference_doctype,
-						self.data.reference_docname).run_method("on_payment_authorized", self.flags.status_changed_to)
+					custom_redirect_to = frappe.get_doc(self.data.get('reference_doctype'),
+						self.data.get('reference_docname')).run_method("on_payment_authorized", self.flags.status_changed_to)
 				except Exception:
 					frappe.log_error(frappe.get_traceback())
 
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
index fd4f498..8256097 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
@@ -58,8 +58,7 @@
 				d.raise_for_status()
 				self.update_webhook_table(method, d.json())
 			except Exception as e:
-				make_shopify_log(status="Warning", method="register_webhooks",
-					message=e.message, exception=False)
+				make_shopify_log(status="Warning", message=e.message, exception=False)
 
 	def unregister_webhooks(self):
 		session = get_request_session()
diff --git a/erpnext/erpnext_integrations/stripe_integration.py b/erpnext/erpnext_integrations/stripe_integration.py
new file mode 100644
index 0000000..a35ca28
--- /dev/null
+++ b/erpnext/erpnext_integrations/stripe_integration.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, 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.integrations.utils import create_request_log
+import stripe
+
+def create_stripe_subscription(gateway_controller, data):
+	stripe_settings = frappe.get_doc("Stripe Settings", gateway_controller)
+	stripe_settings.data = frappe._dict(data)
+
+	stripe.api_key = stripe_settings.get_password(fieldname="secret_key", raise_exception=False)
+	stripe.default_http_client = stripe.http_client.RequestsClient()
+
+	try:
+		stripe_settings.integration_request = create_request_log(stripe_settings.data, "Host", "Stripe")
+		stripe_settings.payment_plans = frappe.get_doc("Payment Request", stripe_settings.data.reference_docname).subscription_plans
+		return create_subscription_on_stripe(stripe_settings)
+
+	except Exception:
+		frappe.log_error(frappe.get_traceback())
+		return{
+			"redirect_to": frappe.redirect_to_message(_('Server Error'), _("It seems that there is an issue with the server's stripe configuration. In case of failure, the amount will get refunded to your account.")),
+			"status": 401
+		}
+
+
+def create_subscription_on_stripe(stripe_settings):
+		items = []
+		for payment_plan in stripe_settings.payment_plans:
+			plan = frappe.db.get_value("Subscription Plan", payment_plan.plan, "payment_plan_id")
+			items.append({"plan": plan, "quantity": payment_plan.qty})
+
+		try:
+			customer = stripe.Customer.create(description=stripe_settings.data.payer_name, email=stripe_settings.data.payer_email, source=stripe_settings.data.stripe_token_id)
+			subscription = stripe.Subscription.create(customer=customer, items=items)
+
+			if subscription.status == "active":
+				stripe_settings.integration_request.db_set('status', 'Completed', update_modified=False)
+				stripe_settings.flags.status_changed_to = "Completed"
+
+			else:
+				stripe_settings.integration_request.db_set('status', 'Failed', update_modified=False)
+				frappe.log_error('Subscription N°: ' + subscription.id, 'Stripe Payment not completed')
+
+		except Exception:
+			stripe_settings.integration_request.db_set('status', 'Failed', update_modified=False)
+			frappe.log_error(frappe.get_traceback())
+
+		return stripe_settings.finalize_request()
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.json b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.json
index c687393..c316ba7 100644
--- a/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.json
+++ b/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.json
@@ -15,6 +15,41 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "patient.inpatient_record", 
+   "fieldname": "inpatient_record", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Record", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Inpatient Record", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -47,6 +82,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -79,10 +115,12 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "inpatient_record.patient", 
    "fieldname": "patient", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -111,6 +149,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -142,6 +181,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -173,6 +213,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -205,6 +246,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -237,6 +279,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -267,6 +310,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -299,6 +343,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -331,6 +376,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -363,6 +409,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -394,6 +441,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -426,6 +474,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -457,6 +506,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -488,6 +538,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -520,6 +571,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -553,6 +605,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -585,6 +638,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -617,6 +671,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -659,7 +714,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-05-04 11:23:32.884076", 
+ "modified": "2018-07-12 19:18:30.400534", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Clinical Procedure", 
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js
index e966515..8480a52 100644
--- a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js
@@ -17,6 +17,7 @@
 	},
 	refresh: function(frm) {
 		frm.trigger("set_root_readonly");
+		frm.set_df_property("service_unit_type", "reqd", 1);
 		frm.add_custom_button(__("Healthcare Service Unit Tree"), function() {
 			frappe.set_route("Tree", "Healthcare Service Unit");
 		});
@@ -35,8 +36,12 @@
 		}
 	},
 	is_group: function(frm) {
-		if(frm.doc.is_group){
+		if(frm.doc.is_group == 1){
 			frm.set_value("allow_appointments", false);
+			frm.set_df_property("service_unit_type", "reqd", 0);
+		}
+		else{
+			frm.set_df_property("service_unit_type", "reqd", 1);
 		}
 	}
 });
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json
index dbb5b20..945817c 100644
--- a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.json
@@ -15,6 +15,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -46,6 +47,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -78,10 +80,13 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:doc.inpatient_occupancy != 1 && doc.allow_appointments != 1", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -109,11 +114,48 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.is_group != 1", 
+   "fieldname": "service_unit_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Service Unit Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Healthcare Service Unit Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:doc.is_group != 1", 
+   "default": "0", 
+   "depends_on": "eval:doc.is_group != 1 && doc.inpatient_occupancy != 1", 
+   "fetch_from": "service_unit_type.allow_appointments", 
    "fieldname": "allow_appointments", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -125,12 +167,12 @@
    "in_standard_filter": 0, 
    "label": "Allow Appointments", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "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, 
@@ -141,11 +183,14 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
-   "bold": 1, 
+   "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:doc.is_group != 1 && doc.allow_appointments == 1", 
+   "default": "0", 
+   "depends_on": "eval:doc.is_group != 1 && doc.allow_appointments == 1 && doc.inpatient_occupany != 1", 
+   "fetch_from": "service_unit_type.overlap_appointments", 
    "fieldname": "overlap_appointments", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -157,12 +202,12 @@
    "in_standard_filter": 0, 
    "label": "Allow Overlap", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "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, 
@@ -173,6 +218,76 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:doc.allow_appointments != 1 && doc.is_group != 1", 
+   "fetch_from": "service_unit_type.inpatient_occupancy", 
+   "fieldname": "inpatient_occupancy", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Occupancy", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:doc.inpatient_occupancy == 1", 
+   "fieldname": "occupied", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Occupied", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -189,7 +304,7 @@
    "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "Warehouse", 
    "permlevel": 0, 
    "precision": "", 
@@ -206,6 +321,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -238,6 +354,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -269,6 +386,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -300,6 +418,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -341,7 +460,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-05-04 11:20:16.942603", 
+ "modified": "2018-07-17 17:40:18.867327", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Healthcare Service Unit", 
@@ -417,4 +536,4 @@
  "title_field": "healthcare_service_unit_name", 
  "track_changes": 1, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py
index 21b0e6e..89adbf8 100644
--- a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py
@@ -14,8 +14,9 @@
 		self.validate_one_root()
 
 	def validate(self):
-		if self.is_group:
-			self.allow_appointments = False
-			self.overlap_appointments = False
-		elif not self.allow_appointments:
-			self.overlap_appointments = False
+		if self.is_group == 1:
+			self.allow_appointments = 0
+			self.overlap_appointments = 0
+			self.inpatient_occupancy = 0
+		elif self.allow_appointments != 1:
+			self.overlap_appointments = 0
diff --git a/erpnext/hr/doctype/salary_structure_employee/__init__.py b/erpnext/healthcare/doctype/healthcare_service_unit_type/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/salary_structure_employee/__init__.py
copy to erpnext/healthcare/doctype/healthcare_service_unit_type/__init__.py
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.js b/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.js
new file mode 100644
index 0000000..84255b29
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.js
@@ -0,0 +1,119 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Healthcare Service Unit Type', {
+	service_unit_type: function(frm) {
+		set_item_details(frm);
+		if(!frm.doc.__islocal){
+			frm.doc.change_in_item = 1;
+		}
+	},
+	is_billable: function(frm) {
+		set_item_details(frm);
+	},
+	refresh: function(frm) {
+		frm.set_df_property("item_code", "read_only", frm.doc.__islocal ? 0 : 1);
+		if(!frm.doc.__islocal) {
+			frm.add_custom_button(__('Change Item Code'), function() {
+				change_item_code(cur_frm,frm.doc);
+			} );
+			if(frm.doc.disabled == 1){
+				frm.add_custom_button(__('Enable'), function() {
+					enable(cur_frm);
+				} );
+			}
+			else{
+				frm.add_custom_button(__('Disable'), function() {
+					disable(cur_frm);
+				} );
+			}
+		}
+	},
+	rate: function(frm) {
+		if(!frm.doc.__islocal){
+			frm.doc.change_in_item = 1;
+		}
+	},
+	item_group: function(frm) {
+		if(!frm.doc.__islocal){
+			frm.doc.change_in_item = 1;
+		}
+	},
+	description: function(frm) {
+		if(!frm.doc.__islocal){
+			frm.doc.change_in_item = 1;
+		}
+	}
+});
+
+var disable = function(frm){
+	var doc = frm.doc;
+	frappe.call({
+		method: 		"erpnext.healthcare.doctype.healthcare_service_unit_type.healthcare_service_unit_type.disable_enable",
+		args: {status: 1, doc_name: doc.name, item: doc.item, is_billable: doc.is_billable},
+		callback: function(){
+			cur_frm.reload_doc();
+		}
+	});
+};
+
+var enable = function(frm){
+	var doc = frm.doc;
+	frappe.call({
+		method: 		"erpnext.healthcare.doctype.healthcare_service_unit_type.healthcare_service_unit_type.disable_enable",
+		args: {status: 0, doc_name: doc.name, item: doc.item, is_billable: doc.is_billable},
+		callback: function(){
+			cur_frm.reload_doc();
+		}
+	});
+};
+
+var change_item_code = function(frm, doc){
+	var d = new frappe.ui.Dialog({
+		title:__("Change Item Code"),
+		fields:[
+			{
+				"fieldtype": "Data",
+				"label": "Item Code",
+				"fieldname": "Item Code",
+				reqd:1
+			},
+			{
+				"fieldtype": "Button",
+				"label": __("Change Code"),
+				click: function() {
+					var values = d.get_values();
+					if(!values)
+						return;
+					change_item_code_from_unit_type(values["Item Code"], doc);
+					d.hide();
+				}
+			}
+		]
+	});
+	d.show();
+	d.set_values({
+		'Item Code': frm.doc.item_code
+	});
+
+	var change_item_code_from_unit_type = function(item_code, doc){
+		frappe.call({
+			"method": "erpnext.healthcare.doctype.healthcare_service_unit_type.healthcare_service_unit_type.change_item_code",
+			"args": {item: doc.item, item_code: item_code, doc_name: doc.name},
+			callback: function () {
+				frm.reload_doc();
+			}
+		});
+	};
+};
+
+var set_item_details = function(frm) {
+	if(frm.doc.service_unit_type && frm.doc.is_billable == 1){
+		if(!frm.doc.item_code)
+			frm.set_value("item_code", frm.doc.service_unit_type);
+		if(!frm.doc.description)
+			frm.set_value("description", frm.doc.service_unit_type);
+		if(!frm.doc.item_group)
+			frm.set_value("item_group", 'Services');
+	}
+};
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.json b/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.json
new file mode 100644
index 0000000..6394ce7
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.json
@@ -0,0 +1,554 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:service_unit_type", 
+ "beta": 0, 
+ "creation": "2018-07-11 16:47:51.414675", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "service_unit_type", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Service Unit Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:doc.inpatient_occupancy != 1", 
+   "fieldname": "allow_appointments", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Appointments", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:doc.allow_appointments == 1 && doc.inpatient_occupany != 1", 
+   "fieldname": "overlap_appointments", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Overlap", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "depends_on": "eval:doc.allow_appointments != 1", 
+   "fieldname": "inpatient_occupancy", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Occupancy", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.inpatient_occupancy == 1 && doc.allow_appointments != 1", 
+   "fieldname": "is_billable", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Billable", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_billable", 
+   "fieldname": "item_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item 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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "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_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "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": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 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_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate / UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "change_in_item", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Change in 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, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-07-13 16:54:59.131606", 
+ "modified_by": "Administrator", 
+ "module": "Healthcare", 
+ "name": "Healthcare Service Unit Type", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Healthcare Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "service_unit_type", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py b/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py
new file mode 100644
index 0000000..e0d380b
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit_type/healthcare_service_unit_type.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class HealthcareServiceUnitType(Document):
+	def after_insert(self):
+		if self.inpatient_occupancy and self.is_billable:
+			create_item(self)
+
+	def on_trash(self):
+		if(self.item):
+			try:
+				frappe.delete_doc("Item",self.item)
+			except Exception:
+				frappe.throw(_("""Not permitted. Please disable the Service Unit Type"""))
+
+	def on_update(self):
+		if(self.change_in_item and self.is_billable == 1 and self.item):
+			updating_item(self)
+			if not item_price_exist(self):
+				if(self.test_rate != 0.0):
+					price_list_name = frappe.db.get_value("Price List", {"selling": 1})
+					if(self.test_rate):
+						make_item_price(self.test_code, price_list_name, self.test_rate)
+					else:
+						make_item_price(self.test_code, price_list_name, 0.0)
+
+			frappe.db.set_value(self.doctype,self.name,"change_in_item",0)
+		elif(self.is_billable == 0 and self.item):
+			frappe.db.set_value("Item",self.item,"disabled",1)
+		self.reload()
+
+def item_price_exist(doc):
+	item_price = frappe.db.exists({
+	"doctype": "Item Price",
+	"item_code": doc.item_code})
+	if(item_price):
+		return True
+	else:
+		return False
+
+def updating_item(doc):
+	frappe.db.sql("""update `tabItem` set item_name=%s, item_group=%s, disabled=0, standard_rate=%s,
+		description=%s, modified=NOW() where item_code=%s""",
+		(doc.service_unit_type, doc.item_group , doc.rate, doc.description, doc.item))
+
+def create_item(doc):
+	#insert item
+	item =  frappe.get_doc({
+	"doctype": "Item",
+	"item_code": doc.item_code,
+	"item_name":doc.service_unit_type,
+	"item_group": doc.item_group,
+	"description":doc.description,
+	"is_sales_item": 1,
+	"is_service_item": 1,
+	"is_purchase_item": 0,
+	"is_stock_item": 0,
+	"show_in_website": 0,
+	"is_pro_applicable": 0,
+	"disabled": 0,
+	"stock_uom": doc.uom
+	}).insert(ignore_permissions=True)
+
+	#insert item price
+	#get item price list to insert item price
+	if(doc.rate != 0.0):
+		price_list_name = frappe.db.get_value("Price List", {"selling": 1})
+		if(doc.rate):
+			make_item_price(item.name, price_list_name, doc.rate)
+			item.standard_rate = doc.rate
+		else:
+			make_item_price(item.name, price_list_name, 0.0)
+			item.standard_rate = 0.0
+	item.save(ignore_permissions = True)
+	#Set item to the Doc
+	frappe.db.set_value("Healthcare Service Unit Type", doc.name, "item", item.name)
+
+	doc.reload() #refresh the doc after insert.
+
+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(ignore_permissions=True)
+
+@frappe.whitelist()
+def change_item_code(item, item_code, doc_name):
+	item_exist = frappe.db.exists({
+		"doctype": "Item",
+		"item_code": item_code})
+	if(item_exist):
+		frappe.throw(_("Code {0} already exist").format(item_code))
+	else:
+		frappe.rename_doc("Item", item, item_code, ignore_permissions = True)
+		frappe.db.set_value("Healthcare Service Unit Type", doc_name, "item_code", item_code)
+
+@frappe.whitelist()
+def disable_enable(status, doc_name, item,  is_billable):
+	frappe.db.set_value("Healthcare Service Unit Type", doc_name, "disabled", status)
+	if(is_billable == 1):
+		frappe.db.set_value("Item", item, "disabled", status)
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit_type/test_healthcare_service_unit_type.js b/erpnext/healthcare/doctype/healthcare_service_unit_type/test_healthcare_service_unit_type.js
new file mode 100644
index 0000000..6db8f9e
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit_type/test_healthcare_service_unit_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Healthcare Service Unit Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Healthcare Service Unit Type
+		() => frappe.tests.make('Healthcare Service Unit Type', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit_type/test_healthcare_service_unit_type.py b/erpnext/healthcare/doctype/healthcare_service_unit_type/test_healthcare_service_unit_type.py
new file mode 100644
index 0000000..3c5b64f
--- /dev/null
+++ b/erpnext/healthcare/doctype/healthcare_service_unit_type/test_healthcare_service_unit_type.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+import unittest
+
+class TestHealthcareServiceUnitType(unittest.TestCase):
+	pass
diff --git a/erpnext/hr/doctype/salary_structure_employee/__init__.py b/erpnext/healthcare/doctype/inpatient_occupancy/__init__.py
similarity index 100%
rename from erpnext/hr/doctype/salary_structure_employee/__init__.py
rename to erpnext/healthcare/doctype/inpatient_occupancy/__init__.py
diff --git a/erpnext/healthcare/doctype/inpatient_occupancy/inpatient_occupancy.json b/erpnext/healthcare/doctype/inpatient_occupancy/inpatient_occupancy.json
new file mode 100644
index 0000000..2ac498d
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_occupancy/inpatient_occupancy.json
@@ -0,0 +1,170 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-07-12 12:07:36.932333", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "service_unit", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Healthcare Service Unit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Healthcare Service Unit", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "check_in", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Check In", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "left", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Left", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "check_out", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Check Out", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2018-07-17 18:26:46.009878", 
+ "modified_by": "Administrator", 
+ "module": "Healthcare", 
+ "name": "Inpatient Occupancy", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/inpatient_occupancy/inpatient_occupancy.py b/erpnext/healthcare/doctype/inpatient_occupancy/inpatient_occupancy.py
new file mode 100644
index 0000000..52de25b
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_occupancy/inpatient_occupancy.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class InpatientOccupancy(Document):
+	pass
diff --git a/erpnext/hr/doctype/salary_structure_employee/__init__.py b/erpnext/healthcare/doctype/inpatient_record/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/salary_structure_employee/__init__.py
copy to erpnext/healthcare/doctype/inpatient_record/__init__.py
diff --git a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.js b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.js
new file mode 100644
index 0000000..936c682
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.js
@@ -0,0 +1,185 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Inpatient Record', {
+	refresh: function(frm) {
+		if(!frm.doc.__islocal && frm.doc.status == "Admission Scheduled"){
+			frm.add_custom_button(__('Admit'), function() {
+				admit_patient_dialog(frm);
+			} );
+			frm.set_df_property("btn_transfer", "hidden", 1);
+		}
+		if(!frm.doc.__islocal && frm.doc.status == "Discharge Scheduled"){
+			frm.add_custom_button(__('Discharge'), function() {
+				discharge_patient(frm);
+			} );
+			frm.set_df_property("btn_transfer", "hidden", 0);
+		}
+		if(!frm.doc.__islocal && (frm.doc.status == "Discharged" || frm.doc.status == "Discharge Scheduled")){
+			frm.disable_save();
+			frm.set_df_property("btn_transfer", "hidden", 1);
+		}
+	},
+	btn_transfer: function(frm) {
+		transfer_patient_dialog(frm);
+	}
+});
+
+var discharge_patient = function(frm) {
+	frappe.call({
+		doc: frm.doc,
+		method: "discharge",
+		callback: function(data) {
+			if(!data.exc){
+				frm.reload_doc();
+			}
+		},
+		freeze: true,
+		freeze_message: "Process Discharge"
+	});
+};
+
+var admit_patient_dialog = function(frm){
+	var dialog = new frappe.ui.Dialog({
+		title: 'Admit Patient',
+		width: 100,
+		fields: [
+			{fieldtype: "Link", label: "Service Unit Type", fieldname: "service_unit_type", options: "Healthcare Service Unit Type"},
+			{fieldtype: "Link", label: "Service Unit", fieldname: "service_unit", options: "Healthcare Service Unit", reqd: 1},
+			{fieldtype: "Datetime", label: "Admission Datetime", fieldname: "check_in", reqd: 1},
+			{fieldtype: "Date", label: "Expected Discharge", fieldname: "expected_discharge"}
+		],
+		primary_action_label: __("Admit"),
+		primary_action : function(){
+			var service_unit = dialog.get_value('service_unit');
+			var check_in = dialog.get_value('check_in');
+			var expected_discharge = null;
+			if(dialog.get_value('expected_discharge')){
+				expected_discharge = dialog.get_value('expected_discharge');
+			}
+			if(!service_unit && !check_in){
+				return;
+			}
+			frappe.call({
+				doc: frm.doc,
+				method: 'admit',
+				args:{
+					'service_unit': service_unit,
+					'check_in': check_in,
+					'expected_discharge': expected_discharge
+				},
+				callback: function(data) {
+					if(!data.exc){
+						frm.reload_doc();
+					}
+				},
+				freeze: true,
+				freeze_message: "Process Admission"
+			});
+			frm.refresh_fields();
+			dialog.hide();
+		}
+	});
+
+	dialog.fields_dict["service_unit_type"].get_query = function(){
+		return {
+			filters: {
+				"inpatient_occupancy": 1,
+				"allow_appointments": 0
+			}
+		};
+	};
+	dialog.fields_dict["service_unit"].get_query = function(){
+		return {
+			filters: {
+				"is_group": 0,
+				"service_unit_type": dialog.get_value("service_unit_type"),
+				"occupied" : 0
+			}
+		};
+	};
+
+	dialog.show();
+};
+
+var transfer_patient_dialog = function(frm){
+	var dialog = new frappe.ui.Dialog({
+		title: 'Transfer Patient',
+		width: 100,
+		fields: [
+			{fieldtype: "Link", label: "Leave From", fieldname: "leave_from", options: "Healthcare Service Unit", reqd: 1, read_only:1},
+			{fieldtype: "Link", label: "Service Unit Type", fieldname: "service_unit_type", options: "Healthcare Service Unit Type"},
+			{fieldtype: "Link", label: "Transfer To", fieldname: "service_unit", options: "Healthcare Service Unit", reqd: 1},
+			{fieldtype: "Datetime", label: "Check In", fieldname: "check_in", reqd: 1}
+		],
+		primary_action_label: __("Transfer"),
+		primary_action : function(){
+			var service_unit = null;
+			var check_in = dialog.get_value('check_in');
+			var leave_from = null;
+			if(dialog.get_value('leave_from')){
+				leave_from = dialog.get_value('leave_from');
+			}
+			if(dialog.get_value('service_unit')){
+				service_unit = dialog.get_value('service_unit');
+			}
+			if(!check_in){
+				return;
+			}
+			frappe.call({
+				doc: frm.doc,
+				method: 'transfer',
+				args:{
+					'service_unit': service_unit,
+					'check_in': check_in,
+					'leave_from': leave_from
+				},
+				callback: function(data) {
+					if(!data.exc){
+						frm.reload_doc();
+					}
+				},
+				freeze: true,
+				freeze_message: "Process Transfer"
+			});
+			frm.refresh_fields();
+			dialog.hide();
+		}
+	});
+
+	dialog.fields_dict["leave_from"].get_query = function(){
+		return {
+			query : "erpnext.healthcare.doctype.inpatient_record.inpatient_record.get_leave_from",
+			filters: {docname:frm.doc.name}
+		};
+	};
+	dialog.fields_dict["service_unit_type"].get_query = function(){
+		return {
+			filters: {
+				"inpatient_occupancy": 1,
+				"allow_appointments": 0
+			}
+		};
+	};
+	dialog.fields_dict["service_unit"].get_query = function(){
+		return {
+			filters: {
+				"is_group": 0,
+				"service_unit_type": dialog.get_value("service_unit_type"),
+				"occupied" : 0
+			}
+		};
+	};
+
+	dialog.show();
+
+	var not_left_service_unit = null;
+	for(let inpatient_occupancy in frm.doc.inpatient_occupancies){
+		if(frm.doc.inpatient_occupancies[inpatient_occupancy].left != 1){
+			not_left_service_unit = frm.doc.inpatient_occupancies[inpatient_occupancy].service_unit;
+		}
+	}
+	dialog.set_values({
+		'leave_from': not_left_service_unit
+	});
+};
diff --git a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
new file mode 100644
index 0000000..2f9f1f1
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
@@ -0,0 +1,977 @@
+{
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2018-07-11 17:48:51.404139", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "IP-", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "patient", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Patient", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Patient", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "patient.patient_name", 
+   "fieldname": "patient_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Patient Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "patient.sex", 
+   "fieldname": "gender", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Gender", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "patient.blood_group", 
+   "fieldname": "blood_group", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Blood Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nA Positive\nA Negative\nAB Positive\nAB Negative\nB Positive\nB Negative\nO Positive\nO Negative", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "dob", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date of birth", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "patient.mobile", 
+   "fieldname": "mobile", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Mobile", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "patient.email", 
+   "fieldname": "email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Email", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "patient.phone", 
+   "fieldname": "phone", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Phone", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_8", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Admission Scheduled\nAdmitted\nDischarge Scheduled\nDischarged", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "scheduled_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Admission Schedule Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Today", 
+   "fieldname": "admitted_datetime", 
+   "fieldtype": "Datetime", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Admitted Datetime", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expected_discharge", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Expected Discharge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "discharge_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Discharge 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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "references", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "References", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb_admission", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Admission", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "admission_practitioner", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Healthcare Practitioner", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Healthcare Practitioner", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "admission_encounter", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Patient Encounter", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Patient Encounter", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb_discharge", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Discharge", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "discharge_practitioner", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Healthcare Practitioner", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Healthcare Practitioner", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "discharge_encounter", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Patient Encounter", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Patient Encounter", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sb_inpatient_occupancy", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Occupancy", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "inpatient_occupancies", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Inpatient Occupancy", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "btn_transfer", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transfer", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.status != \"Admission Scheduled\"", 
+   "fieldname": "sb_discharge_note", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Discharge Note", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "discharge_note", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-07-18 14:10:30.245833", 
+ "modified_by": "Administrator", 
+ "module": "Healthcare", 
+ "name": "Inpatient Record", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Healthcare Administrator", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "patient", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "title_field": "patient", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.py b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.py
new file mode 100644
index 0000000..07cd9e4
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.py
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, 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 today, now_datetime
+from frappe.model.document import Document
+from frappe.desk.reportview import get_match_cond
+
+class InpatientRecord(Document):
+	def after_insert(self):
+		frappe.db.set_value("Patient", self.patient, "inpatient_status", "Admission Scheduled")
+		frappe.db.set_value("Patient", self.patient, "inpatient_record", self.name)
+
+	def validate(self):
+		self.validate_already_scheduled_or_admitted()
+		if self.status == "Discharged":
+			frappe.db.set_value("Patient", self.patient, "inpatient_status", None)
+			frappe.db.set_value("Patient", self.patient, "inpatient_record", None)
+
+	def validate_already_scheduled_or_admitted(self):
+		query = """
+			select name, status
+			from `tabInpatient Record`
+			where (status = 'Admitted' or status = 'Admission Scheduled')
+			and name != %(name)s and patient = %(patient)s
+			"""
+
+		ip_record = frappe.db.sql(query,{
+				"name": self.name,
+				"patient": self.patient
+			}, as_dict = 1)
+
+		if ip_record:
+			msg = _(("Already {0} Patient {1} with Inpatient Record ").format(ip_record[0].status, self.patient) \
+				+ """ <b><a href="#Form/Inpatient Record/{0}">{0}</a></b>""".format(ip_record[0].name))
+			frappe.throw(msg)
+
+	def admit(self, service_unit, check_in, expected_discharge=None):
+		admit_patient(self, service_unit, check_in, expected_discharge)
+
+	def discharge(self):
+		discharge_patient(self)
+
+	def transfer(self, service_unit, check_in, leave_from):
+		if leave_from:
+			patient_leave_service_unit(self, check_in, leave_from)
+		if service_unit:
+			transfer_patient(self, service_unit, check_in)
+
+@frappe.whitelist()
+def schedule_inpatient(patient, encounter_id, practitioner):
+	patient_obj = frappe.get_doc('Patient', patient)
+	inpatient_record = frappe.new_doc('Inpatient Record')
+	inpatient_record.patient = patient
+	inpatient_record.patient_name = patient_obj.patient_name
+	inpatient_record.gender = patient_obj.sex
+	inpatient_record.blood_group = patient_obj.blood_group
+	inpatient_record.dob = patient_obj.dob
+	inpatient_record.mobile = patient_obj.mobile
+	inpatient_record.email = patient_obj.email
+	inpatient_record.phone = patient_obj.phone
+	inpatient_record.status = "Admission Scheduled"
+	inpatient_record.scheduled_date = today()
+	inpatient_record.admission_practitioner = practitioner
+	inpatient_record.admission_encounter = encounter_id
+	inpatient_record.save(ignore_permissions = True)
+
+@frappe.whitelist()
+def schedule_discharge(patient, encounter_id, practitioner):
+	inpatient_record_id = frappe.db.get_value('Patient', patient, 'inpatient_record')
+	if inpatient_record_id:
+		inpatient_record = frappe.get_doc("Inpatient Record", inpatient_record_id)
+		inpatient_record.discharge_practitioner = practitioner
+		inpatient_record.discharge_encounter = encounter_id
+		inpatient_record.status = "Discharge Scheduled"
+		inpatient_record.save(ignore_permissions = True)
+	frappe.db.set_value("Patient", patient, "inpatient_status", "Discharge Scheduled")
+
+def discharge_patient(inpatient_record):
+	if inpatient_record.inpatient_occupancies:
+		for inpatient_occupancy in inpatient_record.inpatient_occupancies:
+			if inpatient_occupancy.left != 1:
+				inpatient_occupancy.left = True
+				inpatient_occupancy.check_out = now_datetime()
+				frappe.db.set_value("Healthcare Service Unit", inpatient_occupancy.service_unit, "occupied", False)
+
+	inpatient_record.discharge_date = today()
+	inpatient_record.status = "Discharged"
+
+	inpatient_record.save(ignore_permissions = True)
+
+def admit_patient(inpatient_record, service_unit, check_in, expected_discharge=None):
+	inpatient_record.admitted_datetime = check_in
+	inpatient_record.status = "Admitted"
+	inpatient_record.expected_discharge = expected_discharge
+
+	inpatient_record.set('inpatient_occupancies', [])
+	transfer_patient(inpatient_record, service_unit, check_in)
+
+	frappe.db.set_value("Patient", inpatient_record.patient, "inpatient_status", "Admitted")
+	frappe.db.set_value("Patient", inpatient_record.patient, "inpatient_record", inpatient_record.name)
+
+def transfer_patient(inpatient_record, service_unit, check_in):
+	item_line = inpatient_record.append('inpatient_occupancies', {})
+	item_line.service_unit = service_unit
+	item_line.check_in = check_in
+
+	inpatient_record.save(ignore_permissions = True)
+
+	frappe.db.set_value("Healthcare Service Unit", service_unit, "occupied", True)
+
+def patient_leave_service_unit(inpatient_record, check_out, leave_from):
+	if inpatient_record.inpatient_occupancies:
+		for inpatient_occupancy in inpatient_record.inpatient_occupancies:
+			if inpatient_occupancy.left != 1 and inpatient_occupancy.service_unit == leave_from:
+				inpatient_occupancy.left = True
+				inpatient_occupancy.check_out = check_out
+				frappe.db.set_value("Healthcare Service Unit", inpatient_occupancy.service_unit, "occupied", False)
+	inpatient_record.save(ignore_permissions = True)
+
+@frappe.whitelist()
+def get_leave_from(doctype, txt, searchfield, start, page_len, filters):
+	docname = filters['docname']
+
+	query = '''select io.service_unit
+		from `tabInpatient Occupancy` io, `tabInpatient Record` ir
+		where io.parent = '{docname}' and io.parentfield = 'inpatient_occupancies'
+		and io.left!=1 and io.parent = ir.name'''
+
+	return frappe.db.sql(query.format(**{
+		"docname":	docname,
+		"searchfield":	searchfield,
+		"mcond":	get_match_cond(doctype)
+	}), {
+		'txt': "%%%s%%" % txt,
+		'_txt': txt.replace("%", ""),
+		'start': start,
+		'page_len': page_len
+	})
diff --git a/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py b/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py
new file mode 100644
index 0000000..0dc8970
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_record/inpatient_record_dashboard.py
@@ -0,0 +1,16 @@
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'inpatient_record',
+		'transactions': [
+			{
+				'label': _('Appointments and Encounters'),
+				'items': ['Patient Appointment', 'Patient Encounter']
+			},
+			{
+				'label': _('Lab Tests and Vital Signs'),
+ 				'items': ['Lab Test', 'Clinical Procedure', 'Sample Collection', 'Vital Signs']
+			}
+		]
+	}
diff --git a/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.js b/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.js
new file mode 100644
index 0000000..1ce9afa
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Inpatient Record", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Inpatient Record
+		() => frappe.tests.make('Inpatient Record', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.py b/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.py
new file mode 100644
index 0000000..b192064
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.py
@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import now_datetime, today
+from frappe.utils.make_random import get_random
+from erpnext.healthcare.doctype.inpatient_record.inpatient_record import admit_patient, discharge_patient
+
+class TestInpatientRecord(unittest.TestCase):
+	def test_admit_and_discharge(self):
+		patient = get_patient()
+		# Schedule Admission
+		ip_record = create_inpatient(patient)
+		ip_record.save(ignore_permissions = True)
+		self.assertEqual(ip_record.name, frappe.db.get_value("Patient", patient, "inpatient_record"))
+		self.assertEqual(ip_record.status, frappe.db.get_value("Patient", patient, "inpatient_status"))
+
+		# Admit
+		service_unit = get_healthcare_service_unit()
+		admit_patient(ip_record, service_unit, now_datetime())
+		self.assertEqual("Admitted", frappe.db.get_value("Patient", patient, "inpatient_status"))
+		self.assertEqual(1, frappe.db.get_value("Healthcare Service Unit", service_unit, "occupied"))
+
+		# Discharge
+		discharge_patient(ip_record)
+		self.assertEqual(None, frappe.db.get_value("Patient", patient, "inpatient_record"))
+		self.assertEqual(None, frappe.db.get_value("Patient", patient, "inpatient_status"))
+		self.assertEqual(0, frappe.db.get_value("Healthcare Service Unit", service_unit, "occupied"))
+
+	def test_validate_overlap_admission(self):
+		frappe.db.sql("""delete from `tabInpatient Record`""")
+		patient = get_patient()
+
+		ip_record = create_inpatient(patient)
+		ip_record.save(ignore_permissions = True)
+		ip_record_new = create_inpatient(patient)
+		self.assertRaises(frappe.ValidationError, ip_record_new.save)
+
+		service_unit = get_healthcare_service_unit()
+		admit_patient(ip_record, service_unit, now_datetime())
+		ip_record_new = create_inpatient(patient)
+		self.assertRaises(frappe.ValidationError, ip_record_new.save)
+		frappe.db.sql("""delete from `tabInpatient Record`""")
+
+def create_inpatient(patient):
+	patient_obj = frappe.get_doc('Patient', patient)
+	inpatient_record = frappe.new_doc('Inpatient Record')
+	inpatient_record.patient = patient
+	inpatient_record.patient_name = patient_obj.patient_name
+	inpatient_record.gender = patient_obj.sex
+	inpatient_record.blood_group = patient_obj.blood_group
+	inpatient_record.dob = patient_obj.dob
+	inpatient_record.mobile = patient_obj.mobile
+	inpatient_record.email = patient_obj.email
+	inpatient_record.phone = patient_obj.phone
+	inpatient_record.inpatient = "Scheduled"
+	inpatient_record.scheduled_date = today()
+	return inpatient_record
+
+def get_patient():
+	patient = get_random("Patient")
+	if not patient:
+		patient = frappe.new_doc("Patient")
+		patient.patient_name = "Test Patient"
+		patient.sex = "Male"
+		patient.save(ignore_permissions=True)
+		return patient.name
+	return patient
+
+
+def get_healthcare_service_unit():
+	service_unit = get_random("Healthcare Service Unit", filters={"inpatient_occupancy": 1})
+	if not service_unit:
+		service_unit = frappe.new_doc("Healthcare Service Unit")
+		service_unit.healthcare_service_unit_name = "Test Service Unit Ip Occupancy"
+		service_unit.service_unit_type = get_service_unit_type()
+		service_unit.inpatient_occupancy = 1
+		service_unit.occupied = 0
+		service_unit.is_group = 0
+		service_unit_parent_name = frappe.db.exists({
+				"doctype": "Healthcare Service Unit",
+				"healthcare_service_unit_name": "All Healthcare Service Units",
+				"is_group": 1
+				})
+		if not service_unit_parent_name:
+			parent_service_unit = frappe.new_doc("Healthcare Service Unit")
+			parent_service_unit.healthcare_service_unit_name = "All Healthcare Service Units"
+			parent_service_unit.is_group = 1
+			parent_service_unit.save(ignore_permissions = True)
+		service_unit.parent_healthcare_service_unit = "All Healthcare Service Units"
+		service_unit.save(ignore_permissions = True)
+		return service_unit.name
+	return service_unit
+
+def get_service_unit_type():
+	service_unit_type = get_random("Healthcare Service Unit Type", filters={"inpatient_occupancy": 1})
+
+	if not service_unit_type:
+		service_unit_type = frappe.new_doc("Healthcare Service Unit Type")
+		service_unit_type.service_unit_type = "Test Service Unit Type Ip Occupancy"
+		service_unit_type.inpatient_occupancy = 1
+		service_unit_type.save(ignore_permissions = True)
+		return service_unit_type.name
+	return service_unit_type
diff --git a/erpnext/healthcare/doctype/lab_test/lab_test.json b/erpnext/healthcare/doctype/lab_test/lab_test.json
index ae66325..0132c98 100644
--- a/erpnext/healthcare/doctype/lab_test/lab_test.json
+++ b/erpnext/healthcare/doctype/lab_test/lab_test.json
@@ -20,6 +20,40 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "patient.inpatient_record", 
+   "fieldname": "inpatient_record", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Record", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Inpatient Record", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -86,6 +120,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "inpatient_record.patient", 
    "fieldname": "patient", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1481,7 +1516,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-16 12:47:01.425117", 
+ "modified": "2018-07-17 12:47:01.425117", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Lab Test", 
@@ -1557,4 +1592,4 @@
  "title_field": "patient", 
  "track_changes": 1, 
  "track_seen": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/healthcare/doctype/patient/patient.json b/erpnext/healthcare/doctype/patient/patient.json
index 10cc11ab..b442a19 100644
--- a/erpnext/healthcare/doctype/patient/patient.json
+++ b/erpnext/healthcare/doctype/patient/patient.json
@@ -16,6 +16,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -49,6 +50,73 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "inpatient_status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nAdmission Scheduled\nAdmitted\nDischarge Scheduled", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "inpatient_record", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Record", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Inpatient Record", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -81,6 +149,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -113,6 +182,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -145,6 +215,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -177,6 +248,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -208,6 +280,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -239,6 +312,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -272,6 +346,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -304,6 +379,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -334,6 +410,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -366,6 +443,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -398,6 +476,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -429,6 +508,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -461,6 +541,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -492,6 +573,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -524,6 +606,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -555,6 +638,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -587,6 +671,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -618,6 +703,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -649,6 +735,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -680,6 +767,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -710,6 +798,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -741,6 +830,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -772,6 +862,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -803,6 +894,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -834,6 +926,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -864,6 +957,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -896,6 +990,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -927,6 +1022,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -958,6 +1054,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -989,6 +1086,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1020,6 +1118,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1051,6 +1150,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1081,6 +1181,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1112,6 +1213,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1143,6 +1245,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1177,6 +1280,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1209,6 +1313,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1240,6 +1345,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1283,7 +1389,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 50, 
- "modified": "2018-03-13 11:20:31.338415", 
+ "modified": "2018-07-18 13:36:05.308926", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Patient", 
@@ -1292,7 +1398,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -1312,7 +1417,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -1332,7 +1436,6 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
index f5e59f2..9799018 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -97,6 +97,7 @@
 				},__("Create"));
 			}
 		}
+		frm.set_df_property("get_procedure_from_encounter", "read_only", frm.doc.__islocal ? 0 : 1);
 	},
 	check_availability: function(frm) {
 		var { practitioner, appointment_date } = frm.doc;
@@ -158,25 +159,25 @@
 				slot_html = slot_html + `<br/>` + slot_detail['avail_slot'].map(slot => {
 					let disabled = '';
 					let start_str = slot.from_time;
-					let start_time = moment(slot.from_time, 'HH:mm:ss');
-					let to_time = moment(slot.to_time, 'HH:mm:ss');
-					let interval = (to_time - start_time)/60000 | 0;
+					let slot_start_time = moment(slot.from_time, 'HH:mm:ss');
+					let slot_to_time = moment(slot.to_time, 'HH:mm:ss');
+					let interval = (slot_to_time - slot_start_time)/60000 | 0;
 					// iterate in all booked appointments, update the start time and duration
 					slot_detail['appointments'].forEach(function(booked) {
 						let booked_moment = moment(booked.appointment_time, 'HH:mm:ss');
-						if(booked_moment.isSame(start_time) || booked_moment.isBetween(start_time, to_time)){
+						let end_time = booked_moment.clone().add(booked.duration, 'minutes');
+						// Deal with 0 duration appointments
+						if(booked_moment.isSame(slot_start_time) || booked_moment.isBetween(slot_start_time, slot_to_time)){
 							if(booked.duration == 0){
 								disabled = 'disabled="disabled"';
 								return false;
 							}
-							start_time = booked_moment;
-							let end_time = booked_moment.add(booked.duration, 'minutes');
-							if(end_time.isSameOrAfter(to_time) || end_time.add(duration).isAfter(to_time)){
-								disabled = 'disabled="disabled"';
-								return false;
-							}else{
-								start_str = end_time.format('HH:mm:ss');
-							}
+						}
+						// Check for overlaps considering appointment duration
+						if(slot_start_time.isBefore(end_time) && slot_to_time.isAfter(booked_moment)){
+							// There is an overlap
+							disabled = 'disabled="disabled"';
+							return false;
 						}
 					});
 
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
index f88a1e0..b19e48e 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
@@ -20,6 +20,41 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "patient.inpatient_record", 
+   "fieldname": "inpatient_record", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Record", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Inpatient Record", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "inpatient_record.patient", 
    "fieldname": "patient", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -877,7 +912,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-16 12:48:28.394133", 
+ "modified": "2018-07-17 12:48:28.394133", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Patient Appointment", 
@@ -953,4 +988,4 @@
  "title_field": "patient", 
  "track_changes": 1, 
  "track_seen": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
index a9b45ac..47c9cad 100644
--- a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
+++ b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
@@ -19,7 +19,28 @@
 	refresh: function(frm) {
 		refresh_field('drug_prescription');
 		refresh_field('test_prescription');
-
+		if (!frm.doc.__islocal){
+			frappe.call({
+				method: 'frappe.client.get_value',
+				args: {
+					doctype: 'Patient',
+					fieldname: 'inpatient_status',
+					filters: {name: frm.doc.patient}
+				},
+				callback: function(data) {
+					if(data.message && data.message.inpatient_status == "Admission Scheduled" || data.message.inpatient_status == "Admitted"){
+						frm.add_custom_button(__('Schedule Discharge'), function() {
+							schedule_discharge(frm);
+						});
+					}
+					else if(data.message.inpatient_status != "Discharge Scheduled"){
+						frm.add_custom_button(__('Schedule Admission'), function() {
+							schedule_inpatient(frm);
+						});
+					}
+				}
+			});
+		}
 		frm.add_custom_button(__('Medical Record'), function() {
 			if (frm.doc.patient) {
 				frappe.route_options = {"patient": frm.doc.patient};
@@ -90,6 +111,34 @@
 	}
 });
 
+var schedule_inpatient = function(frm) {
+	frappe.call({
+		method: "erpnext.healthcare.doctype.inpatient_record.inpatient_record.schedule_inpatient",
+		args: {patient: frm.doc.patient, encounter_id: frm.doc.name, practitioner: frm.doc.practitioner},
+		callback: function(data) {
+			if(!data.exc){
+				frm.reload_doc();
+			}
+		},
+		freeze: true,
+		freeze_message: "Process Inpatient Scheduling"
+	});
+};
+
+var schedule_discharge = function(frm) {
+	frappe.call({
+		method: "erpnext.healthcare.doctype.inpatient_record.inpatient_record.schedule_discharge",
+		args: {patient: frm.doc.patient, encounter_id: frm.doc.name, practitioner: frm.doc.practitioner},
+		callback: function(data) {
+			if(!data.exc){
+				frm.reload_doc();
+			}
+		},
+		freeze: true,
+		freeze_message: "Process Discharge"
+	});
+};
+
 var btn_invoice_encounter = function(frm){
 	var doc = frm.doc;
 	frappe.call({
diff --git a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.json b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
index 1373503..292c900 100644
--- a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
+++ b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
@@ -20,6 +20,40 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "patient.inpatient_record", 
+   "fieldname": "inpatient_record", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Record", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Inpatient Record", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_1", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -151,6 +185,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "inpatient_record.patient", 
    "fieldname": "patient", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1070,7 +1105,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-16 12:51:13.487000", 
+ "modified": "2018-07-17 12:51:13.487000", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Patient Encounter", 
@@ -1108,4 +1143,4 @@
  "title_field": "patient", 
  "track_changes": 1, 
  "track_seen": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/healthcare/doctype/sample_collection/sample_collection.json b/erpnext/healthcare/doctype/sample_collection/sample_collection.json
index 03d8d90..b5c4dbf 100644
--- a/erpnext/healthcare/doctype/sample_collection/sample_collection.json
+++ b/erpnext/healthcare/doctype/sample_collection/sample_collection.json
@@ -15,6 +15,41 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "patient.inpatient_record", 
+   "fieldname": "inpatient_record", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Record", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Inpatient Record", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -43,11 +78,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -75,15 +111,17 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "inpatient_record.patient", 
    "fieldname": "patient", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -107,11 +145,12 @@
    "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -137,11 +176,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -169,16 +209,17 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "patient.sex",
+   "fetch_from": "patient.sex", 
    "fieldname": "patient_sex", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -202,11 +243,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -234,11 +276,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -264,11 +307,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -296,16 +340,17 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "sample.sample_uom",
+   "fetch_from": "sample.sample_uom", 
    "fieldname": "sample_uom", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -329,11 +374,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -361,11 +407,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -391,11 +438,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -423,11 +471,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -454,11 +503,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -486,11 +536,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -517,11 +568,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -547,11 +599,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -578,7 +631,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -592,7 +645,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-05-16 22:43:35.762002",
+ "modified": "2018-07-12 19:19:00.573460", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Sample Collection", 
diff --git a/erpnext/healthcare/doctype/vital_signs/vital_signs.json b/erpnext/healthcare/doctype/vital_signs/vital_signs.json
index 761ae6d..8354859 100644
--- a/erpnext/healthcare/doctype/vital_signs/vital_signs.json
+++ b/erpnext/healthcare/doctype/vital_signs/vital_signs.json
@@ -19,6 +19,41 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "patient.inpatient_record", 
+   "fieldname": "inpatient_record", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Inpatient Record", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Inpatient Record", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "inpatient_record.patient", 
    "fieldname": "patient", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -932,7 +967,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-16 14:04:09.604470", 
+ "modified": "2018-07-17 14:04:09.604470", 
  "modified_by": "Administrator", 
  "module": "Healthcare", 
  "name": "Vital Signs", 
@@ -989,4 +1024,4 @@
  "title_field": "patient", 
  "track_changes": 1, 
  "track_seen": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/healthcare/setup.py b/erpnext/healthcare/setup.py
index f30f42c..c00b637 100644
--- a/erpnext/healthcare/setup.py
+++ b/erpnext/healthcare/setup.py
@@ -14,8 +14,6 @@
 	create_duration()
 	create_dosage()
 	create_healthcare_item_groups()
-	create_lab_test_items()
-	create_lab_test_template()
 	create_sensitivity()
 	add_healthcare_service_unit_tree_root()
 
@@ -184,73 +182,6 @@
 	]
 	insert_record(records)
 
-def create_lab_test_items():
-	records = [
-		{"doctype": "Item", "item_code": "MCH", "item_name": "MCH", "item_group": _("Laboratory"),
-			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
-		{"doctype": "Item", "item_code": "LDL", "item_name": "LDL", "item_group": _("Laboratory"),
-			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
-		{"doctype": "Item", "item_code": "GTT", "item_name": "GTT", "item_group": _("Laboratory"),
-			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
-		{"doctype": "Item", "item_code": "HDL", "item_name": "HDL", "item_group": _("Laboratory"),
-			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
-		{"doctype": "Item", "item_code": "BILT", "item_name": "BILT", "item_group": _("Laboratory"),
-			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
-		{"doctype": "Item", "item_code": "BILD", "item_name": "BILD", "item_group": _("Laboratory"),
-			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
-		{"doctype": "Item", "item_code": "BP", "item_name": "BP", "item_group": _("Laboratory"),
-			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1},
-		{"doctype": "Item", "item_code": "BS", "item_name": "BS", "item_group": _("Laboratory"),
-			"stock_uom": _("Unit"), "is_stock_item": 0, "is_purchase_item": 0, "is_sales_item": 1}
-	]
-	insert_record(records)
-
-def create_lab_test_template():
-	records = [
-		{"doctype": "Lab Test Template", "name": "MCH","test_name": "MCH","test_code": "MCH",
-		"test_group": _("Laboratory"),"department": _("Haematology"),"item": "MCH",
-		"test_template_type": "Single","is_billable": 1,"test_rate": 0.0,"test_uom": "Microgram",
-		"test_normal_range": "27 - 32 Microgram",
-		"sensitivity": 0,"test_description": "Mean Corpuscular Hemoglobin"},
-		{"doctype": "Lab Test Template", "name": "LDL","test_name": "LDL (Serum)","test_code": "LDL",
-		"test_group": _("Laboratory"),"department": _("Biochemistry"),
-		"item": "LDL","test_template_type": "Single",
-		"is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "70 - 160 mg/dlLow-density Lipoprotein (LDL)",
-		"sensitivity": 0,"test_description": "Low-density Lipoprotein (LDL)"},
-		{"doctype": "Lab Test Template", "name": "GTT","test_name": "GTT","test_code": "GTT",
-		"test_group": _("Laboratory"),"department": _("Haematology"),
-		"item": "GTT","test_template_type": "Single",
-		"is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "Less than 85 mg/dl",
-		"sensitivity": 0,"test_description": "Glucose Tolerance Test"},
-		{"doctype": "Lab Test Template", "name": "HDL","test_name": "HDL (Serum)","test_code": "HDL",
-		"test_group": _("Laboratory"),"department": _("Biochemistry"),
-		"item": "HDL","test_template_type": "Single",
-		"is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "35 - 65 mg/dl",
-		"sensitivity": 0,"test_description": "High-density Lipoprotein (HDL)"},
-		{"doctype": "Lab Test Template", "name": "BILT","test_name": "Bilirubin Total","test_code": "BILT",
-		"test_group": _("Laboratory"),"department": _("Biochemistry"),
-		"item": "BILT","test_template_type": "Single",
-		"is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "0.2 - 1.2 mg / dl",
-		"sensitivity": 0,"test_description": "Bilirubin Total"},
-		{"doctype": "Lab Test Template", "name": "BILD","test_name": "Bilirubin Direct","test_code": "BILD",
-		"test_group": _("Laboratory"),"department": _("Biochemistry"),
-		"item": "BILD","test_template_type": "Single",
-		"is_billable": 1,"test_rate": 0.0,"test_uom": "mg / dl","test_normal_range": "0.4 mg / dl",
-		"sensitivity": 0,"test_description": "Bilirubin Direct"},
-
-		{"doctype": "Lab Test Template", "name": "BP","test_name": "Bile Pigment","test_code": "BP",
-		"test_group": _("Laboratory"),"department": _("Pathology"),
-		"item": "BP","test_template_type": "Single",
-		"is_billable": 1,"test_rate": 0.0,"test_uom": "","test_normal_range": "",
-		"sensitivity": 0,"test_description": "Bile Pigment"},
-		{"doctype": "Lab Test Template", "name": "BS","test_name": "Bile Salt","test_code": "BS",
-		"test_group": _("Laboratory"),"department": _("Pathology"),
-		"item": "BS","test_template_type": "Single",
-		"is_billable": 1,"test_rate": 0.0,"test_uom": "","test_normal_range": "",
-		"sensitivity": 0,"test_description": "Bile Salt"}
-	]
-	insert_record(records)
-
 def create_sensitivity():
 	records = [
 		{"doctype": "Sensitivity", "sensitivity": _("Low Sensitivity")},
@@ -266,7 +197,7 @@
 	record = [
 	 {
 	  "doctype": "Healthcare Service Unit",
-	  "healthcare_service_unit_name": "All Healthcare Service Unit",
+	  "healthcare_service_unit_name": "All Healthcare Service Units",
 	  "is_group": 1
 	 }
 	]
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.json b/erpnext/hr/doctype/additional_salary/additional_salary.json
index bab078b9..426ce4b 100644
--- a/erpnext/hr/doctype/additional_salary/additional_salary.json
+++ b/erpnext/hr/doctype/additional_salary/additional_salary.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
  "allow_guest_to_view": 0, 
- "allow_import": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
  "beta": 0, 
@@ -53,39 +53,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -94,7 +61,7 @@
    "in_filter": 0, 
    "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,41 +74,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "employee.employee_name", 
-   "fieldname": "employee_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Employee Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
+   "search_index": 1, 
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
@@ -161,7 +94,7 @@
    "in_filter": 0, 
    "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
    "label": "Salary Component", 
    "length": 0, 
    "no_copy": 0, 
@@ -174,6 +107,38 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "translatable": 0, 
@@ -186,9 +151,9 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "salary_component.type", 
-   "fieldname": "type", 
-   "fieldtype": "Data", 
+   "default": "1", 
+   "fieldname": "overwrite_salary_structure_amount", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -196,15 +161,14 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Type", 
+   "label": "Overwrite Salary Structure Amount", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "", 
    "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, 
@@ -251,7 +215,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "from_date", 
+   "default": "", 
+   "fieldname": "payroll_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -260,7 +225,7 @@
    "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "From Date", 
+   "label": "Payroll Date", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -271,7 +236,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 0, 
+   "search_index": 1, 
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
@@ -283,58 +248,28 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "to_date", 
-   "fieldtype": "Date", 
+   "fetch_from": "employee.employee_name", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "To Date", 
+   "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 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, 
    "translatable": 0, 
@@ -381,6 +316,106 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salary_slip", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salary Slip", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Slip", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "salary_component.type", 
+   "fieldname": "type", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salary Component Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -417,7 +452,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-06-12 12:05:16.337082", 
+ "modified": "2018-07-30 18:30:40.606309", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Additional Salary", 
@@ -471,5 +506,6 @@
  "sort_order": "DESC", 
  "title_field": "employee", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.py b/erpnext/hr/doctype/additional_salary/additional_salary.py
index 90f6c0b..6f87954 100644
--- a/erpnext/hr/doctype/additional_salary/additional_salary.py
+++ b/erpnext/hr/doctype/additional_salary/additional_salary.py
@@ -17,11 +17,9 @@
 	def validate_dates(self):
  		date_of_joining, relieving_date = frappe.db.get_value("Employee", self.employee,
 			["date_of_joining", "relieving_date"])
- 		if getdate(self.from_date) > getdate(self.to_date):
- 			frappe.throw(_("To date can not be less than from date"))
- 		elif date_of_joining and getdate(self.from_date) < getdate(date_of_joining):
- 			frappe.throw(_("From date can not be less than employee's joining date"))
- 		elif relieving_date and getdate(self.to_date) > getdate(relieving_date):
+ 		if date_of_joining and getdate(self.payroll_date) < getdate(date_of_joining):
+ 			frappe.throw(_("Payroll date can not be less than employee's joining date"))
+ 		elif relieving_date and getdate(self.payroll_date) > getdate(relieving_date):
  			frappe.throw(_("To date can not greater than employee's relieving date"))
 
 	def get_amount(self, sal_start_date, sal_end_date):
@@ -39,39 +37,29 @@
 @frappe.whitelist()
 def get_additional_salary_component(employee, start_date, end_date):
 	additional_components = frappe.db.sql("""
-	select name from `tabAdditional Salary`
-	where employee=%(employee)s
-	and docstatus = 1
-	and (
-		(%(from_date)s between from_date and to_date)
-		or (%(to_date)s between from_date and to_date)
-		or (from_date between %(from_date)s and %(to_date)s)
-	)""", {
+		select salary_component, sum(amount) as amount, overwrite_salary_structure_amount from `tabAdditional Salary`
+		where employee=%(employee)s
+			and docstatus = 1
+			and payroll_date between %(from_date)s and %(to_date)s
+		group by salary_component, overwrite_salary_structure_amount
+		order by salary_component, overwrite_salary_structure_amount
+	""", {
 		'employee': employee,
 		'from_date': start_date,
 		'to_date': end_date
-	})
+	}, as_dict=1)
 
-	if additional_components:
-		additional_components_array = []
-		for additional_component in additional_components:
-			struct_row = {}
-			additional_components_dict = {}
-			additional_component_obj = frappe.get_doc("Additional Salary", additional_component[0])
-			amount = additional_component_obj.get_amount(start_date, end_date)
-			salary_component = frappe.get_doc("Salary Component", additional_component_obj.salary_component)
-			struct_row['depends_on_lwp'] = salary_component.depends_on_lwp
-			struct_row['salary_component'] = salary_component.name
-			struct_row['abbr'] = salary_component.salary_component_abbr
-			struct_row['do_not_include_in_total'] = salary_component.do_not_include_in_total
-			struct_row['is_tax_applicable'] = salary_component.is_tax_applicable
-			struct_row['variable_based_on_taxable_salary'] = salary_component.variable_based_on_taxable_salary
-			struct_row['is_additional_component'] = salary_component.is_additional_component
-			additional_components_dict['amount'] = amount
-			additional_components_dict['struct_row'] = struct_row
-			additional_components_dict['type'] = salary_component.type
-			additional_components_array.append(additional_components_dict)
+	additional_components_list = []
+	for d in additional_components:
+		component = frappe.get_doc("Salary Component", d.salary_component)
+		struct_row = {'salary_component': d.salary_component}
+		for field in ["depends_on_lwp", "abbr", "is_tax_applicable", "variable_based_on_taxable_salary", "is_additional_component"]:
+			struct_row[field] = component.get(field)
 
-		if len(additional_components_array) > 0:
-			return additional_components_array
-	return False
+		additional_components_list.append({
+			'amount': d.amount,
+			'type': component.type,
+			'struct_row': struct_row,
+			'overwrite': d.overwrite_salary_structure_amount
+		})
+	return additional_components_list
\ No newline at end of file
diff --git a/erpnext/hr/doctype/attendance/attendance.py b/erpnext/hr/doctype/attendance/attendance.py
index ad162c6..9f8cea8 100644
--- a/erpnext/hr/doctype/attendance/attendance.py
+++ b/erpnext/hr/doctype/attendance/attendance.py
@@ -32,7 +32,7 @@
 				else:
 					self.status = 'On Leave'
 					self.leave_type = d.leave_type
-					frappe.msgprint(_("Employee {0} on Leave on {1}").format(self.employee, self.attendance_date))
+					frappe.msgprint(_("Employee {0} is on Leave on {1}").format(self.employee, self.attendance_date))
 
 		if self.status == "On Leave" and not leave_record:
 			frappe.throw(_("No leave record found for employee {0} for {1}").format(self.employee, self.attendance_date))
diff --git a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
index a117997..9b6dba5 100644
--- a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
+++ b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py
@@ -200,7 +200,7 @@
 		# TODO: Check if there is benefit claim for employee then pro-rata divide the rest of amount (Late Benefit Application)
 		else:
 			component_max = frappe.db.get_value("Salary Component", struct_row.salary_component, "max_benefit_amount")
-			if component_max > 0:
+			if component_max:
 				benefit_amount = get_benefit_pro_rata_ratio_amount(sal_struct, component_max)
 				return get_amount(period_factor, benefit_amount, period_length)
 	return False
diff --git a/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py b/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py
index 64138e5..beaddd9 100644
--- a/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py
+++ b/erpnext/hr/doctype/employee_tax_exemption_declaration/test_employee_tax_exemption_declaration.py
@@ -3,9 +3,9 @@
 # See license.txt
 from __future__ import unicode_literals
 
-import frappe
+import frappe, erpnext
 import unittest
-from erpnext.hr.doctype.salary_structure.test_salary_structure import make_employee
+from erpnext.hr.doctype.employee.test_employee import make_employee
 
 class TestEmployeeTaxExemptionDeclaration(unittest.TestCase):
 	def setUp(self):
@@ -39,7 +39,7 @@
 		declaration = frappe.get_doc({
 			"doctype": "Employee Tax Exemption Declaration",
 			"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
-			"company": "_Test Company",
+			"company": erpnext.get_default_company(),
 			"payroll_period": "_Test Payroll Period",
 			"declarations": [dict(exemption_sub_category = "_Test Sub Category",
 							exemption_category = "_Test Category",
@@ -55,7 +55,7 @@
 		declaration = frappe.get_doc({
 			"doctype": "Employee Tax Exemption Declaration",
 			"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
-			"company": "_Test Company",
+			"company":  erpnext.get_default_company(),
 			"payroll_period": "_Test Payroll Period",
 			"declarations": [dict(exemption_sub_category = "_Test Sub Category",
 							exemption_category = "_Test Category",
@@ -70,7 +70,7 @@
 		duplicate_declaration = frappe.get_doc({
 			"doctype": "Employee Tax Exemption Declaration",
 			"employee": frappe.get_value("Employee", {"user_id":"employee@taxexepmtion.com"}, "name"),
-			"company": "_Test Company",
+			"company":  erpnext.get_default_company(),
 			"payroll_period": "_Test Payroll Period",
 			"declarations": [dict(exemption_sub_category = "_Test Sub Category",
 							exemption_category = "_Test Category",
@@ -87,10 +87,13 @@
 		payroll_period = frappe.get_doc(dict(
 			doctype = 'Payroll Period',
 			name = "_Test Payroll Period",
-			company = "_Test Company",
+			company =  erpnext.get_default_company(),
 			start_date = date(date.today().year, 1, 1),
 			end_date = date(date.today().year, 12, 31)
 		)).insert()
+		return payroll_period
+	else:
+		return frappe.get_doc("Payroll Period", "_Test Payroll Period")
 
 def create_exemption_category():
 	if not frappe.db.exists("Employee Tax Exemption Category", "_Test Category"):
diff --git a/erpnext/hr/doctype/job_offer/job_offer.js b/erpnext/hr/doctype/job_offer/job_offer.js
index f90feae..367ce38 100755
--- a/erpnext/hr/doctype/job_offer/job_offer.js
+++ b/erpnext/hr/doctype/job_offer/job_offer.js
@@ -13,13 +13,22 @@
 	},
 
 	refresh: function (frm) {
-		if ((!frm.doc.__islocal) && (frm.doc.status == 'Accepted') && (frm.doc.docstatus === 1)) {
+		if ((!frm.doc.__islocal) && (frm.doc.status == 'Accepted')
+			&& (frm.doc.docstatus === 1) && (!frm.doc.__onload.employee)) {
 			frm.add_custom_button(__('Make Employee'),
 				function () {
 					erpnext.job_offer.make_employee(frm);
 				}
 			);
 		}
+
+		if(frm.doc.__onload.employee) {
+			frm.add_custom_button(__('Show Employee'),
+				function () {
+					frappe.set_route("Form", "Employee", frm.doc.__onload.employee);
+				}
+			);
+		}
 	}
 
 });
diff --git a/erpnext/hr/doctype/job_offer/job_offer.py b/erpnext/hr/doctype/job_offer/job_offer.py
index 813b442..7e3014b 100644
--- a/erpnext/hr/doctype/job_offer/job_offer.py
+++ b/erpnext/hr/doctype/job_offer/job_offer.py
@@ -7,7 +7,9 @@
 from frappe.model.mapper import get_mapped_doc
 
 class JobOffer(Document):
-	pass
+	def onload(self):
+		employee = frappe.db.get_value("Employee", {"job_applicant": self.job_applicant}, "name") or ""
+		self.set_onload("employee", employee)
 
 @frappe.whitelist()
 def make_employee(source_name, target_doc=None):
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 654a82d..8e63bcc 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -1,733 +1,734 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "naming_series:",
- "beta": 0,
- "creation": "2013-02-20 19:10:38",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "naming_series:", 
+ "beta": 0, 
+ "creation": "2013-02-20 19:10:38", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Series",
-   "length": 0,
-   "no_copy": 1,
-   "options": "LAL/",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 1,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "naming_series", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "LAL/", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 1, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "employee",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Employee",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "employee",
-   "oldfieldtype": "Link",
-   "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": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Employee", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "employee", 
+   "oldfieldtype": "Link", 
+   "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": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "employee_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Employee 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": 1,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.employee_name", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Employee 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": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_from": "employee.department",
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Department",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Department",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_from": "employee.department", 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "leave_type",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Leave Type",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "leave_type",
-   "oldfieldtype": "Link",
-   "options": "Leave Type",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Leave Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "leave_type", 
+   "oldfieldtype": "Link", 
+   "options": "Leave Type", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "from_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "From Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "From Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "to_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "To Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_6",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allocation",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allocation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "new_leaves_allocated",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "New Leaves Allocated",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 1, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "new_leaves_allocated", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "New Leaves Allocated", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "carry_forward",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Add unused leaves from previous allocations",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "carry_forward", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Add unused leaves from previous allocations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "carry_forward",
-   "fieldname": "carry_forwarded_leaves",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Unused leaves",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "carry_forward", 
+   "fieldname": "carry_forwarded_leaves", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Unused leaves", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "total_leaves_allocated",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Leaves Allocated",
-   "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": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_leaves_allocated", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Leaves Allocated", 
+   "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": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.total_leaves_encashed>0",
-   "fieldname": "total_leaves_encashed",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Leaves Encashed",
-   "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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.total_leaves_encashed>0", 
+   "fieldname": "total_leaves_encashed", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Leaves Encashed", 
+   "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, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "compensatory_request",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Compensatory Leave Request",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Compensatory Leave Request",
-   "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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "compensatory_request", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Compensatory Leave Request", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Compensatory Leave Request", 
+   "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, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "leave_period",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Leave Period",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Leave Period",
-   "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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leave_period", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leave Period", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Leave Period", 
+   "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, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Amended From",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Data",
-   "options": "Leave Allocation",
-   "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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "amended_from", 
+   "oldfieldtype": "Data", 
+   "options": "Leave Allocation", 
+   "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, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "notes",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Notes",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "notes", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Notes", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "reason",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "reason", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "300px"
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-ok",
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-07-03 07:15:01.709826",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Leave Allocation",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-ok", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 1, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-07-26 15:38:53.177169", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Leave Allocation", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 1,
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 1,
+   "amend": 1, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
    "write": 1
   }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "employee,employee_name,leave_type,total_leaves_allocated",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "employee",
- "track_changes": 0,
- "track_seen": 0,
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "employee,employee_name,leave_type,total_leaves_allocated", 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "timeline_field": "employee", 
+ "track_changes": 0, 
+ "track_seen": 0, 
  "track_views": 0
 }
\ 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 79f5f5c..2fa23c5 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
  "allow_guest_to_view": 0, 
- "allow_import": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
  "beta": 0, 
@@ -15,6 +15,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,11 +43,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 1, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,11 +75,12 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,11 +106,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -133,11 +137,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -164,48 +169,50 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "employee.department",
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Department",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Department",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "fetch_from": "employee.department", 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "leave_balance", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -227,11 +234,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -257,11 +265,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -287,11 +296,12 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -317,11 +327,12 @@
    "reqd": 1, 
    "search_index": 1, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -347,11 +358,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -379,11 +391,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -410,11 +423,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -440,12 +454,13 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0, 
    "width": "50%"
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -471,11 +486,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -501,11 +517,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -533,11 +550,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -564,11 +582,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -594,11 +613,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -627,11 +647,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -657,11 +678,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -688,11 +710,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -719,11 +742,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -750,11 +774,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -779,11 +804,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -810,11 +836,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -841,11 +868,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -872,7 +900,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -887,7 +915,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2018-05-17 10:13:40.623098",
+ "modified": "2018-07-30 17:12:08.116946", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Application", 
@@ -1037,5 +1065,6 @@
  "timeline_field": "employee", 
  "title_field": "employee_name", 
  "track_changes": 0, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index bc6ffc1..2278036 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -88,15 +88,17 @@
 			self.validate_back_dated_application()
 
 	def validate_dates_across_allocation(self):
-		def _get_leave_alloction_record(date):
+		if frappe.db.get_value("Leave Type", self.leave_type, "allow_negative"):
+			return
+		def _get_leave_allocation_record(date):
 			allocation = frappe.db.sql("""select name from `tabLeave Allocation`
 				where employee=%s and leave_type=%s and docstatus=1
 				and %s between from_date and to_date""", (self.employee, self.leave_type, date))
 
 			return allocation and allocation[0][0]
 
-		allocation_based_on_from_date = _get_leave_alloction_record(self.from_date)
-		allocation_based_on_to_date = _get_leave_alloction_record(self.to_date)
+		allocation_based_on_from_date = _get_leave_allocation_record(self.from_date)
+		allocation_based_on_to_date = _get_leave_allocation_record(self.to_date)
 
 		if not (allocation_based_on_from_date or allocation_based_on_to_date):
 			frappe.throw(_("Application period cannot be outside leave allocation period"))
@@ -131,24 +133,15 @@
 			elif getdate(self.to_date) <= getdate(nowdate()):
 				for dt in daterange(getdate(self.from_date), getdate(self.to_date)):
 					date = dt.strftime("%Y-%m-%d")
-					if not date == self.half_day_date:
-						doc = frappe.new_doc("Attendance")
-						doc.employee = self.employee
-						doc.attendance_date = date
-						doc.company = self.company
-						doc.status = "On Leave"
-						doc.leave_type = self.leave_type
-						doc.insert(ignore_permissions=True)
-						doc.submit()
-					else:
-						doc = frappe.new_doc("Attendance")
-						doc.employee = self.employee
-						doc.attendance_date = date
-						doc.company = self.company
-						doc.status = "Half Day"
-						doc.leave_type = self.leave_type
-						doc.insert(ignore_permissions=True)
-						doc.submit()
+					doc = frappe.new_doc("Attendance")
+					doc.employee = self.employee
+					doc.attendance_date = date
+					doc.company = self.company
+					doc.leave_type = self.leave_type
+					doc.status = "Half Day" if date == self.half_day_date else "On Leave"
+					doc.flags.ignore_validate = True
+					doc.insert(ignore_permissions=True)
+					doc.submit()
 
 	def cancel_attendance(self):
 		if self.docstatus == 2:
diff --git a/erpnext/hr/doctype/leave_encashment/leave_encashment.py b/erpnext/hr/doctype/leave_encashment/leave_encashment.py
index a61210c..9944bc5 100644
--- a/erpnext/hr/doctype/leave_encashment/leave_encashment.py
+++ b/erpnext/hr/doctype/leave_encashment/leave_encashment.py
@@ -30,8 +30,7 @@
 		additional_salary.company = frappe.get_value("Employee", self.employee, "company")
 		additional_salary.employee = self.employee
 		additional_salary.salary_component = frappe.get_value("Leave Type", self.leave_type, "earning_component")
-		additional_salary.from_date = self.encashment_date
-		additional_salary.to_date = self.encashment_date
+		additional_salary.payroll_date = self.encashment_date
 		additional_salary.amount = self.encashment_amount
 		additional_salary.submit()
 
diff --git a/erpnext/hr/doctype/leave_period/leave_period.js b/erpnext/hr/doctype/leave_period/leave_period.js
index 19633e2..d4935cf 100644
--- a/erpnext/hr/doctype/leave_period/leave_period.js
+++ b/erpnext/hr/doctype/leave_period/leave_period.js
@@ -4,6 +4,11 @@
 frappe.ui.form.on('Leave Period', {
 	refresh: (frm)=>{
 		frm.set_df_property("grant_leaves", "hidden", frm.doc.__islocal ? 1:0);
+		if(!frm.is_new()) {
+			frm.add_custom_button(__('Grant Leaves'), function () {
+				frm.trigger("grant_leaves");
+			});
+		}
 	},
 	from_date: (frm)=>{
 		if (frm.doc.from_date && !frm.doc.to_date) {
@@ -11,19 +16,6 @@
 			frm.set_value("to_date", frappe.datetime.add_days(a_year_from_start, -1));
 		}
 	},
-	grant: (frm)=>{
-		frappe.call({
-			doc: frm.doc,
-			method: "grant_leave_allocation",
-			callback: function(r) {
-				if(!r.exc){
-					frm.reload_doc();
-				}
-			},
-			freeze: true,
-			freeze_message: __("Grant allocations......")
-		})
-	},
 	onload: (frm) => {
 		frm.set_query("department", function() {
 			return {
@@ -32,5 +24,70 @@
 				}
 			}
 		})
+	},
+	grant_leaves: function(frm) {
+		var d = new frappe.ui.Dialog({
+			title: __('Grant Leaves'),
+			fields: [
+				{
+					"label": "Filter Employees By (Optional)",
+					"fieldname": "sec_break",
+					"fieldtype": "Section Break",
+				},
+				{
+					"label": "Employee Grade",
+					"fieldname": "grade",
+					"fieldtype": "Link",
+					"options": "Employee Grade"
+				},
+				{
+					"label": "Department",
+					"fieldname": "department",
+					"fieldtype": "Link",
+					"options": "Department"
+				},
+				{
+					"fieldname": "col_break",
+					"fieldtype": "Column Break",
+				},
+				{
+					"label": "Designation",
+					"fieldname": "designation",
+					"fieldtype": "Link",
+					"options": "Designation"
+				},
+				{
+					"label": "Employee",
+					"fieldname": "employee",
+					"fieldtype": "Link",
+					"options": "Employee"
+				},
+				{
+					"fieldname": "sec_break",
+					"fieldtype": "Section Break",
+				},
+				{
+					"label": "Add unused leaves from previous allocations",
+					"fieldname": "carry_forward_leaves",
+					"fieldtype": "Check"
+				}
+			],
+			primary_action: function() {
+				var data = d.get_values();
+
+				frappe.call({
+					doc: frm.doc,
+					method: "grant_leave_allocation",
+					args: data,
+					callback: function(r) {
+						if(!r.exc) {
+							d.hide();
+						}
+					}
+				});
+			},
+			primary_action_label: __('Grant')
+		});
+		d.show();
 	}
 });
diff --git a/erpnext/hr/doctype/leave_period/leave_period.json b/erpnext/hr/doctype/leave_period/leave_period.json
index b184bef..ed0c57a 100644
--- a/erpnext/hr/doctype/leave_period/leave_period.json
+++ b/erpnext/hr/doctype/leave_period/leave_period.json
@@ -1,585 +1,294 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "HR-LPR-.####",
- "beta": 0,
- "creation": "2018-04-13 15:20:52.864288",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "HR-LPR-.####", 
+ "beta": 0, 
+ "creation": "2018-04-13 15:20:52.864288", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "from_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "From 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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "from_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "From 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, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "to_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "To Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Company",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "is_active",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Active",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_active", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Active", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "optional_holiday_list",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Holiday List for Optional Leave",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Holiday List",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "grant_leaves",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Grant Leaves Based on Leave Policy",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "filter_by",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Filter By",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "grade",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Employee Grade",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Employee Grade",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Department",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Department",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "designation",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Designation",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Designation",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "employee",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Employee",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Employee",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "grant",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Grant",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_12",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "carry_forward_leaves",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Carry Forward Leaves",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "optional_holiday_list", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Holiday List for Optional Leave", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Holiday List", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-07-02 08:15:51.853668",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Leave Period",
- "name_case": "",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-07-27 13:36:08.458731", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Leave Period", 
+ "name_case": "", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
   }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0, 
  "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_period/leave_period.py b/erpnext/hr/doctype/leave_period/leave_period.py
index 6a8e3bc..15fa8d6 100644
--- a/erpnext/hr/doctype/leave_period/leave_period.py
+++ b/erpnext/hr/doctype/leave_period/leave_period.py
@@ -8,91 +8,107 @@
 from frappe.utils import getdate, cstr
 from frappe.model.document import Document
 from erpnext.hr.utils import validate_overlap, get_employee_leave_policy
+from frappe.utils.background_jobs import enqueue
+from six import iteritems
 
 class LeavePeriod(Document):
-	def get_employees(self):
+	def get_employees(self, args):
 		conditions, values = [], []
-		for field in ["grade", "designation", "department"]:
-			if self.get(field):
+		for field, value in iteritems(args):
+			if value:
 				conditions.append("{0}=%s".format(field))
-				values.append(self.get(field))
+				values.append(value)
 
 		condition_str = " and " + " and ".join(conditions) if len(conditions) else ""
 
-		e = frappe.db.sql("select name from tabEmployee where status='Active' {condition}"
+		employees = frappe.db.sql_list("select name from tabEmployee where status='Active' {condition}"
 			.format(condition=condition_str), tuple(values))
 
-		return e
+		return employees
 
 	def validate(self):
 		self.validate_dates()
 		validate_overlap(self, self.from_date, self.to_date, self.company)
 
-	def grant_leave_allocation(self):
-		if self.employee:
-			leave_allocation = []
-			leave_allocation = self.grant_leave_alloc(self.employee, leave_allocation)
-			if leave_allocation:
-				self.print_message(leave_allocation)
-		else:
-			self.grant_leave_alloc_for_employees()
-
-	def grant_leave_alloc_for_employees(self):
-		employees = self.get_employees()
-		if employees:
-			leave_allocations = []
-			for employee in employees:
-				leave_allocations = self.grant_leave_alloc(cstr(employee[0]), leave_allocations)
-			if leave_allocations:
-				self.print_message(leave_allocations)
-		else:
-			frappe.msgprint(_("No employee found"))
-
-	def grant_leave_alloc(self, employee, leave_allocations):
-		self.validate_allocation_exists(employee)
-		leave_policy = get_employee_leave_policy(employee)
-		if leave_policy:
-			for leave_policy_detail in leave_policy.leave_policy_details:
-				if not frappe.db.get_value("Leave Type", leave_policy_detail.leave_type, "is_lwp"):
-					leave_allocations.append(self.create_leave_allocation(employee, leave_policy_detail.leave_type, leave_policy_detail.annual_allocation))
-		return leave_allocations
-
-	def validate_allocation_exists(self, employee):
-		leave_alloc = frappe.db.exists({
-				"doctype": "Leave Allocation",
-				"employee": employee,
-				"leave_period": self.name,
-				"docstatus": 1})
-		if leave_alloc:
-			frappe.throw(_("Employee {0} already have Leave Allocation {1} for this period").format(employee, leave_alloc[0][0])\
-			+ """ <b><a href="#Form/Leave Allocation/{0}">{0}</a></b>""".format(leave_alloc[0][0]))
-
 	def validate_dates(self):
 		if getdate(self.from_date) >= getdate(self.to_date):
 			frappe.throw(_("To date can not be equal or less than from date"))
 
-	def create_leave_allocation(self, employee, leave_type, new_leaves_allocated):
-		allocation = frappe.new_doc("Leave Allocation")
-		allocation.employee = employee
-		allocation.employee_name = frappe.db.get_value("Employee", employee, "employee_name")
-		allocation.leave_type = leave_type
-		allocation.from_date = self.from_date
-		allocation.to_date = self.to_date
-		# Earned Leaves and Compensatory Leaves are allocated by scheduler, initially allocate 0
-		is_earned_leave, is_compensatory = frappe.db.get_value("Leave Type", leave_type, ["is_earned_leave", "is_compensatory"])
-		if is_earned_leave == 1 or is_compensatory == 1:
-			new_leaves_allocated = 0
-		allocation.new_leaves_allocated = new_leaves_allocated
-		allocation.leave_period = self.name
-		if self.carry_forward_leaves:
-			if frappe.db.get_value("Leave Type", leave_type, "is_carry_forward"):
-				allocation.carry_forward = self.carry_forward_leaves
-		allocation.save(ignore_permissions = True)
-		allocation.submit()
-		return allocation.name
+
+	def grant_leave_allocation(self, grade=None, department=None, designation=None,
+			employee=None, carry_forward_leaves=0):
+		employees = self.get_employees({
+			"grade": grade,
+			"department": department, 
+			"designation": designation, 
+			"name": employee
+		})
+
+		if employees:
+			if len(employees) > 20:
+				frappe.enqueue(grant_leave_alloc_for_employees, timeout=600,
+					employees=employees, leave_period=self, carry_forward_leaves=carry_forward_leaves)
+			else:
+				grant_leave_alloc_for_employees(employees, self, carry_forward_leaves)
+		else:
+			frappe.msgprint(_("No Employee Found"))
+
+def grant_leave_alloc_for_employees(employees, leave_period, carry_forward_leaves=0):
+	leave_allocations = []
+	existing_allocations_for = get_existing_allocations(employees, leave_period.name)
+	leave_type_details = get_leave_type_details()
+	count=0
+	for employee in employees:
+		if employee in existing_allocations_for:
+			continue
+		count +=1
+		leave_policy = get_employee_leave_policy(employee)
+		if leave_policy:
+			for leave_policy_detail in leave_policy.leave_policy_details:
+				if not leave_type_details.get(leave_policy_detail.leave_type).is_lwp:
+					leave_allocation = create_leave_allocation(employee, leave_policy_detail.leave_type,
+						leave_policy_detail.annual_allocation, leave_type_details, leave_period, carry_forward_leaves)
+					leave_allocations.append(leave_allocation)
+		frappe.db.commit()
+		frappe.publish_progress(count*100/len(set(employees) - set(existing_allocations_for)), title = _("Allocating leaves..."))
+
+	if leave_allocations:
+		frappe.msgprint(_("Leaves has been granted sucessfully"))
+
+def get_existing_allocations(employees, leave_period):
+	leave_allocations = frappe.db.sql_list("""
+		select distinct employee from `tabLeave Allocation` 
+		where leave_period=%s and employee in (%s) and docstatus=1
+	""" % ('%s', ', '.join(['%s']*len(employees))), [leave_period] + employees)
+	if leave_allocations:
+		frappe.msgprint(_("Skipping Leave Allocation for the following employees, as Leave Allocation records already exists against them. {0}")
+			.format("\n".join(leave_allocations)))
+	return leave_allocations
+
+def get_leave_type_details():
+	leave_type_details = frappe._dict()
+	leave_types = frappe.get_all("Leave Type", fields=["name", "is_lwp", "is_earned_leave", "is_compensatory", "is_carry_forward"])
+	for d in leave_types:
+		leave_type_details.setdefault(d.name, d)
+	return leave_type_details
+
+def create_leave_allocation(employee, leave_type, new_leaves_allocated, leave_type_details, leave_period, carry_forward_leaves):
+	allocation = frappe.new_doc("Leave Allocation")
+	allocation.employee = employee
+	allocation.leave_type = leave_type
+	allocation.from_date = leave_period.from_date
+	allocation.to_date = leave_period.to_date
+	# Earned Leaves and Compensatory Leaves are allocated by scheduler, initially allocate 0
+	if leave_type_details.get(leave_type).is_earned_leave == 1 or leave_type_details.get(leave_type).is_compensatory == 1:
+		new_leaves_allocated = 0
+
+	allocation.new_leaves_allocated = new_leaves_allocated
+	allocation.leave_period = leave_period.name
+	if carry_forward_leaves:
+		if leave_type_details.get(leave_type).is_carry_forward:
+			allocation.carry_forward = carry_forward_leaves
+	allocation.save(ignore_permissions = True)
+	allocation.submit()
+	return allocation.name
 
 
-	def print_message(self, leave_allocations):
-		if leave_allocations:
-			frappe.msgprint(_("Leave Allocations {0} created").format(", "
-				.join(map(lambda x: """ <b><a href="#Form/Leave Allocation/{0}">{0}</a></b>""".format(x), leave_allocations))))
diff --git a/erpnext/hr/doctype/leave_period/leave_period_dashboard.py b/erpnext/hr/doctype/leave_period/leave_period_dashboard.py
new file mode 100644
index 0000000..5214a58
--- /dev/null
+++ b/erpnext/hr/doctype/leave_period/leave_period_dashboard.py
@@ -0,0 +1,12 @@
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'leave_period',
+		'transactions': [
+			{
+				'label': _('Transactions'),
+				'items': ['Leave Allocation']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_period/test_leave_period.py b/erpnext/hr/doctype/leave_period/test_leave_period.py
index 2924bf7..3fb035f 100644
--- a/erpnext/hr/doctype/leave_period/test_leave_period.py
+++ b/erpnext/hr/doctype/leave_period/test_leave_period.py
@@ -9,7 +9,7 @@
 from erpnext.hr.doctype.employee.test_employee import make_employee
 from erpnext.hr.doctype.leave_application.leave_application import get_leave_balance_on
 
-test_dependencies = ["Employee", "Leave Type"]
+test_dependencies = ["Employee", "Leave Type", "Leave Policy"]
 
 class TestLeavePeriod(unittest.TestCase):
 	def setUp(self):
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
index 3d9f8e6..fa1b63c 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.js
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.js
@@ -20,48 +20,61 @@
 	},
 
 	refresh: function(frm) {
+		if (frm.doc.docstatus == 0) {
+			if(!frm.is_new()) {
+				frm.page.clear_primary_action();
+				frm.add_custom_button(__("Get Employees"),
+					function() {
+						frm.events.get_employee_details(frm);
+					}
+				).toggleClass('btn-primary', !(frm.doc.employees || []).length);
+			}
+			if ((frm.doc.employees || []).length) {
+				frm.page.set_primary_action(__('Create Salary Slips'), () => {
+					frm.save('Submit');
+				});
+			}
+		}
 		if (frm.doc.docstatus == 1) {
 			if (frm.custom_buttons) frm.clear_custom_buttons();
 			frm.events.add_context_buttons(frm);
 		}
 	},
 
-	add_context_buttons: function(frm) {
-		frappe.call({
-			method: 'erpnext.hr.doctype.payroll_entry.payroll_entry.payroll_entry_has_created_slips',
-			args: {
-				'name': frm.doc.name
-			},
+	get_employee_details: function (frm) {
+		return frappe.call({
+			doc: frm.doc,
+			method: 'fill_employee_details',
 			callback: function(r) {
-				if(r.message) {
-					frm.events.add_salary_slip_buttons(frm, r.message);
-					if(r.message.submitted){
-						frm.events.add_bank_entry_button(frm);
+				if (r.docs[0].employees){
+					frm.save();
+					frm.refresh();
+					if(r.docs[0].validate_attendance){
+						render_employee_attendance(frm, r.message);
 					}
 				}
 			}
-		});
+		})
 	},
 
-	add_salary_slip_buttons: function(frm, slip_status) {
-		if (!slip_status.draft && !slip_status.submitted) {
-			return;
-		} else {
-			frm.add_custom_button(__("View Salary Slips"),
-				function() {
-					frappe.set_route(
-						'List', 'Salary Slip', {posting_date: frm.doc.posting_date}
-					);
-				}
-			);
-		}
+	create_salary_slips: function(frm) {
+		frm.call({
+			doc: frm.doc,
+			method: "create_salary_slips",
+			callback: function(r) {
+				frm.refresh();
+				frm.toolbar.refresh();
+			}
+		})
+	},
 
-		if (slip_status.draft) {
-			frm.add_custom_button(__("Submit Salary Slip"),
-				function() {
-					submit_salary_slip(frm);
-				}
-			).addClass("btn-primary");
+	add_context_buttons: function(frm) {
+		if(frm.doc.salary_slips_submitted) {
+			frm.events.add_bank_entry_button(frm);
+		} else if(frm.doc.salary_slips_created) {
+			frm.add_custom_button(__("Submit Salary Slip"), function() {
+				submit_salary_slip(frm);
+			}).addClass("btn-primary");
 		}
 	},
 
@@ -73,13 +86,9 @@
 			},
 			callback: function(r) {
 				if (r.message && !r.message.submitted) {
-					frm.add_custom_button("Bank Entry",
-						function() {
-							make_bank_entry(frm);
-						},
-						__('Make')
-					);
-					frm.page.set_inner_btn_group_as_primary(__('Make'));
+					frm.add_custom_button("Make Bank Entry", function() {
+						make_bank_entry(frm);
+					}).addClass("btn-primary");
 				}
 			}
 		});
@@ -115,23 +124,23 @@
 
 	payroll_frequency: function (frm) {
 		frm.trigger("set_start_end_dates");
-		frm.set_value('employees', []);
+		frm.events.clear_employee_table(frm);
 	},
 
 	company: function (frm) {
-		frm.set_value('employees', []);
+		frm.events.clear_employee_table(frm);
 	},
 
 	department: function (frm) {
-		frm.set_value('employees', []);
+		frm.events.clear_employee_table(frm);
 	},
 
 	designation: function (frm) {
-		frm.set_value('employees', []);
+		frm.events.clear_employee_table(frm);
 	},
 
 	branch: function (frm) {
-		frm.set_value('employees', []);
+		frm.events.clear_employee_table(frm);
 	},
 
 	start_date: function (frm) {
@@ -141,11 +150,11 @@
 			// reset flag
 			in_progress = false;
 		}
-		frm.set_value('employees', []);
+		frm.events.clear_employee_table(frm);
 	},
 
 	project: function (frm) {
-		frm.set_value('employees', []);
+		frm.events.clear_employee_table(frm);
 	},
 
 	salary_slip_based_on_timesheet: function (frm) {
@@ -201,7 +210,12 @@
 		}else{
 			frm.fields_dict.attendance_detail_html.html("");
 		}
-	}
+	},
+
+	clear_employee_table: function (frm) {
+		frm.clear_table('employees');
+		frm.refresh();
+	},
 });
 
 // Submit salary slips
@@ -227,18 +241,6 @@
 	);
 };
 
-cur_frm.cscript.get_employee_details = function (doc) {
-	var callback = function (r) {
-		if (r.docs[0].employees){
-			cur_frm.refresh_field('employees');
-			if(r.docs[0].validate_attendance){
-				render_employee_attendance(cur_frm, r.message);
-			}
-		}
-	};
-	return $c('runserverobj', { 'method': 'fill_employee_details', 'docs': doc }, callback);
-};
-
 let make_bank_entry = function (frm) {
 	var doc = frm.doc;
 	if (doc.company && doc.start_date && doc.end_date && doc.payment_account) {
@@ -247,7 +249,7 @@
 			method: "make_payment_entry",
 			callback: function() {
 				frappe.set_route(
-					'List', 'Journal Entry', {posting_date: frm.doc.posting_date}
+					'List', 'Journal Entry', {"Journal Entry Account.reference_name": frm.doc.name}
 				);
 			},
 			freeze: true,
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.json b/erpnext/hr/doctype/payroll_entry/payroll_entry.json
index 2cb6751..7dd8d9c 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.json
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.json
@@ -84,40 +84,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "", 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "default": "Today", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
@@ -218,6 +184,73 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "default": "", 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "collapsible_depends_on": "", 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employees", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "branch", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -284,6 +317,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "designation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -317,8 +381,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
+   "fieldname": "number_of_employees", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -326,13 +390,14 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Number Of Employees", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -348,8 +413,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "get_employee_details", 
-   "fieldtype": "Button", 
+   "fieldname": "sec_break20", 
+   "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -357,7 +422,6 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Get Employee Details", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -389,7 +453,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Employees", 
+   "label": "Employee Details", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Payroll Employee Detail", 
@@ -797,6 +861,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_from": "company.cost_center", 
    "fieldname": "cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1023,38 +1088,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "activity_log", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Activity Log", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1079,6 +1112,70 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salary_slips_created", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salary Slips Created", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salary_slips_submitted", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salary Slips Submitted", 
+   "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, 
+   "translatable": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -1092,7 +1189,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-06-28 13:55:48.295327", 
+ "modified": "2018-07-30 14:57:37.601430", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Payroll Entry", 
@@ -1126,5 +1223,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "track_changes": 0, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
index 2d866ba..8f54697 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
@@ -12,7 +12,6 @@
 from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
 
 class PayrollEntry(Document):
-
 	def on_submit(self):
 		self.create_salary_slips()
 
@@ -67,6 +66,7 @@
 		for d in employees:
 			self.append('employees', d)
 
+		self.number_of_employees = len(employees)
 		if self.validate_attendance:
 			return self.validate_employee_attendance()
 
@@ -97,41 +97,25 @@
 			Creates salary slip for selected employees if already not created
 		"""
 		self.check_permission('write')
-		self.created = 1;
-		emp_list = self.get_emp_list()
-		ss_list = []
+		self.created = 1
+		emp_list = [d.employee for d in self.get_emp_list()]
 		if emp_list:
-			for emp in emp_list:
-				if not frappe.db.sql("""select
-						name from `tabSalary Slip`
-					where
-						docstatus!= 2 and
-						employee = %s and
-						start_date >= %s and
-						end_date <= %s and
-						company = %s
-						""", (emp['employee'], self.start_date, self.end_date, self.company)):
-					ss = frappe.get_doc({
-						"doctype": "Salary Slip",
-						"salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
-						"payroll_frequency": self.payroll_frequency,
-						"start_date": self.start_date,
-						"end_date": self.end_date,
-						"employee": emp['employee'],
-						"employee_name": frappe.get_value("Employee", {"name":emp['employee']}, "employee_name"),
-						"company": self.company,
-						"posting_date": self.posting_date,
-						"deduct_tax_for_unclaimed_employee_benefits": self.deduct_tax_for_unclaimed_employee_benefits,
-						"deduct_tax_for_unsubmitted_tax_exemption_proof": self.deduct_tax_for_unsubmitted_tax_exemption_proof
-					})
-					ss.insert()
-					ss_dict = {}
-					ss_dict["Employee Name"] = ss.employee_name
-					ss_dict["Total Pay"] = fmt_money(ss.rounded_total,currency = frappe.defaults.get_global_default("currency"))
-					ss_dict["Salary Slip"] = format_as_links(ss.name)[0]
-					ss_list.append(ss_dict)
-		return create_log(ss_list)
-
+			args = frappe._dict({
+				"salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
+				"payroll_frequency": self.payroll_frequency,
+				"start_date": self.start_date,
+				"end_date": self.end_date,
+				"company": self.company,
+				"posting_date": self.posting_date,
+				"deduct_tax_for_unclaimed_employee_benefits": self.deduct_tax_for_unclaimed_employee_benefits,
+				"deduct_tax_for_unsubmitted_tax_exemption_proof": self.deduct_tax_for_unsubmitted_tax_exemption_proof,
+				"payroll_entry": self.name
+			})
+			if len(emp_list) > 30:
+				frappe.enqueue(create_salary_slips_for_employees, timeout=600, employees=emp_list, args=args)
+			else:
+				create_salary_slips_for_employees(emp_list, args, publish_progress=False)
+			
 	def get_sal_slip_list(self, ss_status, as_dict=False):
 		"""
 			Returns list of salary slips based on selected criteria
@@ -146,43 +130,12 @@
 		return ss_list
 
 	def submit_salary_slips(self):
-		"""
-			Submit all salary slips based on selected criteria
-		"""
 		self.check_permission('write')
-
-		# self.create_salary_slips()
-
-		jv_name = ""
 		ss_list = self.get_sal_slip_list(ss_status=0)
-		submitted_ss = []
-		not_submitted_ss = []
-		frappe.flags.via_payroll_entry = True
-		for ss in ss_list:
-			ss_obj = frappe.get_doc("Salary Slip",ss[0])
-			ss_dict = {}
-			ss_dict["Employee Name"] = ss_obj.employee_name
-			ss_dict["Total Pay"] = fmt_money(ss_obj.net_pay,
-				currency = frappe.defaults.get_global_default("currency"))
-			ss_dict["Salary Slip"] = format_as_links(ss_obj.name)[0]
-
-			if ss_obj.net_pay<0:
-				not_submitted_ss.append(ss_dict)
-			else:
-				try:
-					ss_obj.submit()
-					submitted_ss.append(ss_obj)
-
-				except frappe.ValidationError:
-					not_submitted_ss.append(ss_dict)
-		if submitted_ss:
-			jv_name = self.make_accrual_jv_entry()
-			frappe.msgprint(_("Salary Slip submitted for period from {0} to {1}")
-				.format(ss_obj.start_date, ss_obj.end_date))
-
-			self.email_salary_slip(submitted_ss)
-
-		return create_submit_log(submitted_ss, not_submitted_ss, jv_name)
+		if len(ss_list) > 30:
+			frappe.enqueue(submit_salary_slips_for_employees, timeout=600, payroll_entry=self, salary_slips=ss_list)
+		else:
+			submit_salary_slips_for_employees(self, ss_list, publish_progress=False)
 
 	def email_salary_slip(self, submitted_ss):
 		if frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee"):
@@ -509,61 +462,6 @@
 	else:
 		frappe.throw(_("Fiscal Year {0} not found").format(year))
 
-
-@frappe.whitelist()
-def create_log(ss_list):
-	if not ss_list:
-		frappe.throw(
-			_("There's no employee for the given criteria. Check that Salary Slips have not already been created."),
-			title='Error'
-		)
-	return ss_list
-
-
-def format_as_links(salary_slip):
-	return ['<a href="#Form/Salary Slip/{0}">{0}</a>'.format(salary_slip)]
-
-
-def create_submit_log(submitted_ss, not_submitted_ss, jv_name):
-
-	if not submitted_ss and not not_submitted_ss:
-		frappe.msgprint(_("No salary slip found to submit for the above selected criteria OR salary slip already submitted"))
-
-	if not_submitted_ss:
-		frappe.msgprint(_("Could not submit any Salary Slip <br>\
-			Possible reasons: <br>\
-			1. Net pay is less than 0. <br>\
-			2. Company Email Address specified in employee master is not valid. <br>"))
-
-
-def get_salary_slip_list(name, docstatus, as_dict=0):
-	payroll_entry = frappe.get_doc('Payroll Entry', name)
-
-	salary_slip_list = frappe.db.sql(
-		"select t1.name, t1.salary_structure from `tabSalary Slip` t1 "
-		"where t1.docstatus = %s "
-		"and t1.start_date >= %s "
-		"and t1.end_date <= %s",
-		(docstatus, payroll_entry.start_date, payroll_entry.end_date),
-		as_dict=as_dict
-	)
-
-	return salary_slip_list
-
-
-@frappe.whitelist()
-def payroll_entry_has_created_slips(name):
-	response = {}
-
-	draft_salary_slips = get_salary_slip_list(name, docstatus=0)
-	submitted_salary_slips = get_salary_slip_list(name, docstatus=1)
-
-	response['draft'] = 1 if draft_salary_slips else 0
-	response['submitted'] = 1 if submitted_salary_slips else 0
-
-	return response
-
-
 def get_payroll_entry_bank_entries(payroll_entry_name):
 	journal_entries = frappe.db.sql(
 		'select name from `tabJournal Entry Account` '
@@ -579,8 +477,73 @@
 @frappe.whitelist()
 def payroll_entry_has_bank_entries(name):
 	response = {}
-
 	bank_entries = get_payroll_entry_bank_entries(name)
 	response['submitted'] = 1 if bank_entries else 0
 
 	return response
+
+def create_salary_slips_for_employees(employees, args, publish_progress=True):
+	salary_slips_exists_for = get_existing_salary_slips(employees, args)
+	count=0
+	for emp in employees:
+		if emp not in salary_slips_exists_for:
+			args.update({
+				"doctype": "Salary Slip",
+				"employee": emp
+			})
+			ss = frappe.get_doc(args)
+			ss.insert()
+			count+=1
+			if publish_progress:
+				frappe.publish_progress(count*100/len(set(employees) - set(salary_slips_exists_for)),
+					title = _("Creating Salary Slips..."))
+
+	payroll_entry = frappe.get_doc("Payroll Entry", args.payroll_entry)
+	payroll_entry.db_set("salary_slips_created", 1)
+	payroll_entry.notify_update()
+
+def get_existing_salary_slips(employees, args):
+	return frappe.db.sql_list("""
+		select distinct employee from `tabSalary Slip` 
+		where docstatus!= 2 and company = %s
+			and start_date >= %s and end_date <= %s 
+			and employee in (%s)
+	""" % ('%s', '%s', '%s', ', '.join(['%s']*len(employees))),
+		[args.company, args.start_date, args.end_date] + employees)
+
+def submit_salary_slips_for_employees(payroll_entry, salary_slips, publish_progress=True):
+	submitted_ss = []
+	not_submitted_ss = []
+	frappe.flags.via_payroll_entry = True
+
+	count = 0
+	for ss in salary_slips:
+		ss_obj = frappe.get_doc("Salary Slip",ss[0])
+		if ss_obj.net_pay<0:
+			not_submitted_ss.append(ss[0])
+		else:
+			try:
+				ss_obj.submit()
+				submitted_ss.append(ss_obj)
+			except frappe.ValidationError:
+				not_submitted_ss.append(ss[0])
+		
+		count += 1
+		if publish_progress:
+			frappe.publish_progress(count*100/len(salary_slips), title = _("Submitting Salary Slips..."))
+
+	if submitted_ss:
+		payroll_entry.make_accrual_jv_entry()
+		frappe.msgprint(_("Salary Slip submitted for period from {0} to {1}")
+			.format(ss_obj.start_date, ss_obj.end_date))
+
+		payroll_entry.email_salary_slip(submitted_ss)
+	
+	payroll_entry.db_set("salary_slips_submitted", 1)
+	payroll_entry.notify_update()
+
+	if not submitted_ss and not not_submitted_ss:
+		frappe.msgprint(_("No salary slip found to submit for the above selected criteria OR salary slip already submitted"))
+
+	if not_submitted_ss:
+		frappe.msgprint(_("Could not submit some Salary Slips"))	
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry_dashboard.py b/erpnext/hr/doctype/payroll_entry/payroll_entry_dashboard.py
new file mode 100644
index 0000000..c4fa7f6
--- /dev/null
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry_dashboard.py
@@ -0,0 +1,15 @@
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'payroll_entry',
+		'non_standard_fieldnames': {
+			'Journal Entry': 'reference_name',
+			'Payment Entry': 'reference_name',
+		},
+		'transactions': [
+			{
+				'items': ['Salary Slip', 'Journal Entry']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
index 7ff5a45..ada8e3d 100644
--- a/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
+++ b/erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
@@ -18,8 +18,8 @@
 		for dt in ["Salary Slip", "Salary Component", "Salary Component Account", "Payroll Entry", "Loan"]:
 			frappe.db.sql("delete from `tab%s`" % dt)
 
-		make_earning_salary_component(["Basic Salary", "Special Allowance", "HRA", "Leave Encashment"])
-		make_deduction_salary_component(["Professional Tax", "TDS"])
+		make_earning_salary_component(setup=True)
+		make_deduction_salary_component(setup=True)
 
 	def test_payroll_entry(self): # pylint: disable=no-self-use
 		company = erpnext.get_default_company()
@@ -107,6 +107,7 @@
 	payroll_entry.posting_date = nowdate()
 	payroll_entry.payroll_frequency = "Monthly"
 	payroll_entry.branch = args.branch or None
+	payroll_entry.save()
 	payroll_entry.create_salary_slips()
 	payroll_entry.submit_salary_slips()
 	if payroll_entry.get_sal_slip_list(ss_status = 1):
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
index 755bb40..cbbc9e9 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -39,10 +39,13 @@
 	start_date: function(frm, dt, dn){
 		if(frm.doc.start_date){
 			frm.trigger("set_end_date");
-			get_emp_and_leave_details(frm.doc, dt, dn);
 		}
 	},
 
+	end_date: function(frm, dt, dn) {
+		get_emp_and_leave_details(frm.doc, dt, dn);
+	},
+
 	set_end_date: function(frm){
 		frappe.call({
 			method: 'erpnext.hr.doctype.payroll_entry.payroll_entry.get_end_date',
@@ -82,8 +85,6 @@
 	payroll_frequency: function(frm, dt, dn) {
 		frm.trigger("toggle_fields");
 		frm.set_value('end_date', '');
-		frm.set_value('start_date', '');
-		get_emp_and_leave_details(frm.doc, dt, dn);
 	},
 
 	employee: function(frm, dt, dn) {
@@ -121,21 +122,14 @@
 // Get leave details
 //---------------------------------------------------------------------
 var get_emp_and_leave_details = function(doc, dt, dn) {
-	if(!doc.start_date){
-		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.employee = function(doc,dt,dn){
-	doc.salary_structure = ''
-	get_emp_and_leave_details(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.leave_without_pay = function(doc,dt,dn){
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index 473d6e3..2e2856d 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -325,6 +325,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "payroll_entry", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payroll Entry", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payroll Entry", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1872,7 +1905,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-06-28 12:18:50.538159", 
+ "modified": "2018-07-27 19:23:35.587516", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 23528af..a009fb0 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -83,10 +83,11 @@
 			for additional_component in additional_components:
 				additional_component = frappe._dict(additional_component)
 				amount = additional_component.amount
+				overwrite = additional_component.overwrite
 				key = "earnings"
 				if additional_component.type == "Deduction":
 					key = "deductions"
-				self.update_component_row(frappe._dict(additional_component.struct_row), amount, key)
+				self.update_component_row(frappe._dict(additional_component.struct_row), amount, key, overwrite=overwrite)
 
 		self.get_last_payroll_period_benefit()
 
@@ -125,12 +126,11 @@
 			if benefit_claim_amount:
 				self.update_component_row(struct_row, benefit_claim_amount, "earnings")
 
-	def update_component_row(self, struct_row, amount, key, benefit_tax=None, additional_tax=None):
+	def update_component_row(self, struct_row, amount, key, benefit_tax=None, additional_tax=None, overwrite=1):
 		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,
@@ -147,7 +147,13 @@
 				'tax_on_additional_salary': additional_tax
 			})
 		else:
-			component_row.amount = amount
+			if overwrite:
+				component_row.default_amount = amount
+				component_row.amount = amount
+			else:
+				component_row.default_amount += amount
+				component_row.amount = component_row.default_amount
+
 			component_row.tax_on_flexible_benefit = benefit_tax
 			component_row.tax_on_additional_salary = additional_tax
 
@@ -241,10 +247,14 @@
 		if self.payroll_frequency:
 			cond += """and ss.payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency}
 
-		st_name = frappe.db.sql("""select sa.salary_structure from `tabSalary Structure Assignment` sa
-			join `tabSalary Structure` ss where sa.salary_structure=ss.name
-			and sa.docstatus = 1 and ss.docstatus = 1 and ss.is_active ='Yes' %s
-			order by sa.from_date desc limit 1 """ %cond, {'employee': self.employee, 'start_date': self.start_date,
+		st_name = frappe.db.sql("""
+			select sa.salary_structure
+			from `tabSalary Structure Assignment` sa join `tabSalary Structure` ss
+			where sa.salary_structure=ss.name
+				and sa.docstatus = 1 and ss.docstatus = 1 and ss.is_active ='Yes' %s
+			order by sa.from_date desc
+			limit 1
+		""" %cond, {'employee': self.employee, 'start_date': self.start_date,
 			'end_date': self.end_date, 'joining_date': joining_date})
 
 		if st_name:
@@ -429,7 +439,7 @@
 	def calculate_net_pay(self):
 		if self.salary_structure:
 			self.calculate_component_amounts()
-
+		
 		disable_rounded_total = cint(frappe.db.get_value("Global Defaults", None, "disable_rounded_total"))
 
 		self.total_deduction = 0
@@ -443,6 +453,9 @@
 		self.net_pay = flt(self.gross_pay) - (flt(self.total_deduction) + flt(self.total_loan_repayment))
 		self.rounded_total = rounded(self.net_pay,
 			self.precision("net_pay") if disable_rounded_total else 0)
+		
+		if self.net_pay < 0:
+			frappe.throw(_("Net Pay cannnot be negative"))
 
 	def set_loan_repayment(self):
 		self.set('loans', [])
@@ -480,17 +493,26 @@
 		else:
 			self.set_status()
 			self.update_status(self.name)
+			self.update_salary_slip_in_additional_salary()
 			if (frappe.db.get_single_value("HR Settings", "email_salary_slip_to_employee")) and not frappe.flags.via_payroll_entry:
 				self.email_salary_slip()
 
 	def on_cancel(self):
 		self.set_status()
 		self.update_status()
+		self.update_salary_slip_in_additional_salary()
 
 	def on_trash(self):
 		from frappe.model.naming import revert_series_if_last
 		revert_series_if_last(self.series, self.name)
 
+	def update_salary_slip_in_additional_salary(self):
+		salary_slip = self.name if self.docstatus==1 else None
+		frappe.db.sql("""
+			update `tabAdditional Salary` set salary_slip=%s
+			where employee=%s and payroll_date between %s and %s and docstatus=1
+		""", (salary_slip, self.employee, self.start_date, self.end_date))
+
 	def email_salary_slip(self):
 		receiver = frappe.db.get_value("Employee", self.employee, "prefered_email")
 
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index b856487..0b23238 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -6,18 +6,19 @@
 import frappe
 import erpnext
 import calendar
+import random
 from erpnext.accounts.utils import get_fiscal_year
 from frappe.utils.make_random import get_random
-from frappe.utils import getdate, nowdate, add_days, add_months, flt
+from frappe.utils import getdate, nowdate, add_days, add_months, flt, get_first_day, get_last_day
 from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
 from erpnext.hr.doctype.payroll_entry.payroll_entry import get_month_details
 from erpnext.hr.doctype.employee.test_employee import make_employee
-
+from erpnext.hr.doctype.employee_tax_exemption_declaration.test_employee_tax_exemption_declaration import create_payroll_period, create_exemption_category
 
 class TestSalarySlip(unittest.TestCase):
 	def setUp(self):
-		make_earning_salary_component(["Basic Salary", "Special Allowance", "HRA"])
-		make_deduction_salary_component(["Professional Tax", "TDS"])
+		make_earning_salary_component(setup=True)
+		make_deduction_salary_component(setup=True)
 
 		for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]:
 			frappe.db.sql("delete from `tab%s`" % dt)
@@ -164,6 +165,96 @@
 			elif payroll_frequncy == "Daily":
 				self.assertEqual(ss.end_date, nowdate())
 
+	def test_tax_for_payroll_period(self):
+		data = {}
+		# test the impact of tax exemption declaration, tax exemption proof submission and deduct check boxes in annual tax calculation
+		# as per assigned salary structure 40500 in monthly salary so 236000*5/100/12
+		frappe.db.sql("""delete from `tabPayroll Period`""")
+		frappe.db.sql("""delete from `tabSalary Component`""")
+		payroll_period = create_payroll_period()
+		create_tax_slab(payroll_period)
+		employee = make_employee("test_tax@salary.slip")
+		delete_docs = ["Salary Slip", "Additional Salary",
+						"Employee Tax Exemption Declaration",
+						"Employee Tax Exemption Proof Submission",
+						"Employee Benefit Claim", "Salary Structure Assignment"]
+		for doc in delete_docs:
+			frappe.db.sql("delete from `tab%s` where employee='%s'" % (doc, employee))
+
+		from erpnext.hr.doctype.salary_structure.test_salary_structure import \
+			make_salary_structure, create_salary_structure_assignment
+		salary_structure = make_salary_structure("Stucture to test tax", "Monthly",
+			other_details={"max_benefits": 100000}, test_tax=True)
+		create_salary_structure_assignment(employee, salary_structure.name,
+			payroll_period.start_date)
+
+		# create salary slip for whole period deducting tax only on last period
+		# to find the total tax amount paid
+		create_salary_slips_for_payroll_period(employee, salary_structure.name,
+			payroll_period, deduct_random=False)
+		tax_paid = get_tax_paid_in_period(employee)
+
+		# total taxable income 586000, 250000 @ 5%, 86000 @ 20% ie. 12500 + 17200
+		annual_tax = 29700
+		try:
+			self.assertEqual(tax_paid, annual_tax)
+		except AssertionError:
+			print("\nSalary Slip - Annual tax calculation failed\n")
+			raise
+		frappe.db.sql("""delete from `tabSalary Slip` where employee=%s""", (employee))
+
+		# create exemption declaration so the tax amount varies
+		create_exemption_declaration(employee, payroll_period.name)
+
+		# create for payroll deducting in random months
+		data["deducted_dates"] = create_salary_slips_for_payroll_period(employee,
+			salary_structure.name, payroll_period)
+		tax_paid = get_tax_paid_in_period(employee)
+
+		# No proof, benefit claim sumitted, total tax paid, should not change
+		try:
+			self.assertEqual(tax_paid, annual_tax)
+		except AssertionError:
+			print("\nSalary Slip - Tax calculation failed on following case\n", data, "\n")
+			raise
+
+		# Submit proof for total 120000
+		data["proof-1"] = create_proof_submission(employee, payroll_period, 50000)
+		data["proof-2"] = create_proof_submission(employee, payroll_period, 70000)
+
+		# Submit benefit claim for total 50000
+		data["benefit-1"] = create_benefit_claim(employee, payroll_period, 15000, "Medical Allowance")
+		data["benefit-2"] = create_benefit_claim(employee, payroll_period, 35000, "Leave Travel Allowance")
+
+
+		frappe.db.sql("""delete from `tabSalary Slip` where employee=%s""", (employee))
+		data["deducted_dates"] = create_salary_slips_for_payroll_period(employee,
+			salary_structure.name, payroll_period)
+		tax_paid = get_tax_paid_in_period(employee)
+
+		# total taxable income 416000, 166000 @ 5% ie. 8300
+		try:
+			self.assertEqual(tax_paid, 8300)
+		except AssertionError:
+			print("\nSalary Slip - Tax calculation failed on following case\n", data, "\n")
+			raise
+
+		# create additional salary of 150000
+		frappe.db.sql("""delete from `tabSalary Slip` where employee=%s""", (employee))
+		data["additional-1"] = create_additional_salary(employee, payroll_period, 50000)
+		data["additional-2"] = create_additional_salary(employee, payroll_period, 100000)
+		data["deducted_dates"] = create_salary_slips_for_payroll_period(employee,
+			salary_structure.name, payroll_period)
+
+		# total taxable income 566000, 250000 @ 5%, 66000 @ 20%, 12500 + 13200
+		tax_paid = get_tax_paid_in_period(employee)
+		try:
+			self.assertEqual(tax_paid, 25700)
+		except AssertionError:
+			print("\nSalary Slip - Tax calculation failed on following case\n", data, "\n")
+			raise
+		frappe.db.sql("""delete from `tabAdditional Salary` where employee=%s""", (employee))
+
 	def make_holiday_list(self):
 		fiscal_year = get_fiscal_year(nowdate(), company=erpnext.get_default_company())
 		if not frappe.db.get_value("Holiday List", "Salary Slip Test Holiday List"):
@@ -212,28 +303,22 @@
 
 	return salary_slip
 
-
-def make_earning_salary_component(salary_components):
+def make_salary_component(salary_components, test_tax):
 	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_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)
+		if not frappe.db.exists('Salary Component', salary_component["salary_component"]):
+			if test_tax:
+				if salary_component["type"] == "Earning":
+					salary_component["is_tax_applicable"] = 1
+				elif salary_component["salary_component"] == "TDS":
+					salary_component["variable_based_on_taxable_salary"] = 1
+					salary_component["amount_based_on_formula"] = 0
+					salary_component["amount"] = 0
+					salary_component["formula"] = ""
+					salary_component["condition"] = ""
+			salary_component["doctype"] = "Salary Component"
+			salary_component["salary_component_abbr"] = salary_component["abbr"]
+			frappe.get_doc(salary_component).insert()
+		get_salary_component_account(salary_component["salary_component"])
 
 def get_salary_component_account(sal_comp):
 	company = erpnext.get_default_company()
@@ -244,7 +329,6 @@
 	})
 	sal_comp.save()
 
-
 def create_account(company):
 	salary_account = frappe.db.get_value("Account", "Salary - " + frappe.db.get_value('Company', company, 'abbr'))
 	if not salary_account:
@@ -256,64 +340,184 @@
 		}).insert()
 	return salary_account
 
-
-def get_earnings_component(setup=False):
-	if setup:
-		make_earning_salary_component(["Basic Salary", "Special Allowance", "HRA"])
-
-	return [
-				{
-					"salary_component": 'Basic Salary',
-					"abbr":'BS',
-					"condition": 'base > 10000',
-					"formula": 'base*.5',
-					"idx": 1
-				},
-				{
+def make_earning_salary_component(setup=False, test_tax=False):
+	data = [
+			{
+				"salary_component": 'Basic Salary',
+				"abbr":'BS',
+				"condition": 'base > 10000',
+				"formula": 'base*.5',
+				"type": "Earning"
+			},
+			{
+				"salary_component": 'HRA',
+				"abbr":'H',
+				"amount": 3000,
+				"type": "Earning"
+			},
+			{
+				"salary_component": 'Special Allowance',
+				"abbr":'SA',
+				"condition": 'H < 10000',
+				"formula": 'BS*.5',
+				"type": "Earning"
+			},
+			{
+				"salary_component": "Leave Encashment",
+				"abbr": 'LE',
+				"is_additional_component": 1,
+				"type": "Earning"
+			}
+		]
+	if test_tax:
+		data.extend([
+						{
+							"salary_component": "Leave Travel Allowance",
+							"abbr": 'B',
+							"is_flexible_benefit": 1,
+							"type": "Earning",
+							"pay_against_benefit_claim": 1,
+							"max_benefit_amount": 100000
+						},
+						{
+							"salary_component": "Medical Allowance",
+							"abbr": 'B',
+							"is_flexible_benefit": 1,
+							"pay_against_benefit_claim": 0,
+							"type": "Earning",
+							"max_benefit_amount": 15000
+						},
+						{
+							"salary_component": "Perfomance Bonus",
+							"abbr": 'B',
+							"is_additional_component": 1,
+							"type": "Earning"
+						}
+					])
+	if setup or test_tax:
+		make_salary_component(data, test_tax)
+	data.append({
 					"salary_component": 'Basic Salary',
 					"abbr":'BS',
 					"condition": 'base < 10000',
 					"formula": 'base*.2',
-					"idx": 2
-				},
-				{
-					"salary_component": 'HRA',
-					"abbr":'H',
-					"amount": 3000,
-					"idx": 3
-				},
-				{
-					"salary_component": 'Special Allowance',
-					"abbr":'SA',
-					"condition": 'H < 10000',
-					"formula": 'BS*.5',
-					"idx": 4
-				},
-			]
+					"type": "Earning"
+				})
+	return data
 
-def get_deductions_component(setup=False):
-	if setup:
-		make_deduction_salary_component(["Professional Tax", "TDS"])
-
-	return [
+def make_deduction_salary_component(setup=False, test_tax=False):
+	data =  [
 				{
 					"salary_component": 'Professional Tax',
 					"abbr":'PT',
 					"condition": 'base > 10000',
 					"formula": 'base*.1',
-					"idx": 1
+					"type": "Deduction"
 				},
 				{
 					"salary_component": 'TDS',
 					"abbr":'T',
 					"formula": 'base*.1',
-					"idx": 2
-				},
-				{
-					"salary_component": 'TDS',
-					"abbr":'T',
-					"condition": 'employment_type=="Intern"',
-					"formula": 'base*.1',
-					"idx": 3
+					"type": "Deduction"
 				}
 			]
+	if not test_tax:
+		data.append({
+			"salary_component": 'TDS',
+			"abbr":'T',
+			"condition": 'employment_type=="Intern"',
+			"formula": 'base*.1',
+			"type": "Deduction"
+		})
+	if setup or test_tax:
+		make_salary_component(data, test_tax)
+
+	return data
+
+def get_tax_paid_in_period(employee):
+	tax_paid_amount = frappe.db.sql("""select sum(sd.amount) from `tabSalary Detail`
+		sd join `tabSalary Slip` ss where ss.name=sd.parent and ss.employee=%s
+		and ss.docstatus=1 and sd.salary_component='TDS'""", (employee))
+	return tax_paid_amount[0][0]
+
+def create_exemption_declaration(employee, payroll_period):
+	create_exemption_category()
+	declaration = frappe.get_doc({"doctype": "Employee Tax Exemption Declaration",
+									"employee": employee,
+									"payroll_period": payroll_period,
+									"company": erpnext.get_default_company()})
+	declaration.append("declarations", {"exemption_sub_category": "_Test Sub Category",
+							"exemption_category": "_Test Category",
+							"amount": 100000})
+	declaration.submit()
+
+def create_proof_submission(employee, payroll_period, amount):
+	submission_date = add_months(payroll_period.start_date, random.randint(0, 11))
+	proof_submission = frappe.get_doc({"doctype": "Employee Tax Exemption Proof Submission",
+									"employee": employee,
+									"payroll_period": payroll_period.name,
+									"submission_date": submission_date})
+	proof_submission.append("tax_exemption_proofs", {"exemption_sub_category": "_Test Sub Category",
+				"exemption_category": "_Test Category", "type_of_proof": "Test", "amount": amount})
+	proof_submission.submit()
+	return submission_date
+
+def create_benefit_claim(employee, payroll_period, amount, component):
+	claim_date = add_months(payroll_period.start_date, random.randint(0, 11))
+	frappe.get_doc({"doctype": "Employee Benefit Claim", "employee": employee,
+		"claimed_amount": amount, "claim_date": claim_date, "earning_component":
+		component}).submit()
+	return claim_date
+
+def create_tax_slab(payroll_period):
+	data = [{
+				"from_amount": 250000,
+				"to_amount": 500000,
+				"percent_deduction": 5
+			},
+			{
+				"from_amount": 500000,
+				"to_amount": 1000000,
+				"percent_deduction": 20
+			},
+			{
+				"from_amount": 1000000,
+				"percent_deduction": 30
+			}]
+	payroll_period.taxable_salary_slabs = []
+	for item in data:
+		payroll_period.append("taxable_salary_slabs", item)
+	payroll_period.save()
+
+def create_salary_slips_for_payroll_period(employee, salary_structure, payroll_period, deduct_random=True):
+	deducted_dates = []
+	i = 0
+	while i < 12:
+		slip = frappe.get_doc({"doctype": "Salary Slip", "employee": employee,
+				"salary_structure": salary_structure, "frequency": "Monthly"})
+		if i == 0:
+			posting_date = add_days(payroll_period.start_date, 25)
+		else:
+			posting_date = add_months(posting_date, 1)
+		if i == 11:
+			slip.deduct_tax_for_unsubmitted_tax_exemption_proof = 1
+			slip.deduct_tax_for_unclaimed_employee_benefits = 1
+		if deduct_random and not random.randint(0, 2):
+			slip.deduct_tax_for_unsubmitted_tax_exemption_proof = 1
+			deducted_dates.append(posting_date)
+		slip.posting_date = posting_date
+		slip.start_date = get_first_day(posting_date)
+		slip.end_date = get_last_day(posting_date)
+		doc = make_salary_slip(salary_structure, slip, employee)
+		doc.submit()
+		i += 1
+	return deducted_dates
+
+def create_additional_salary(employee, payroll_period, amount):
+	salary_date = add_months(payroll_period.start_date, random.randint(0, 11))
+	frappe.get_doc({"doctype": "Additional Salary", "employee": employee,
+					"company": erpnext.get_default_company(),
+					"salary_component": "Perfomance Bonus",
+					"payroll_date": salary_date,
+					"amount": amount, "type": "Earning"}).submit()
+	return salary_date
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index 6b195a8..4a111e7 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -19,8 +19,7 @@
 		frm.set_query("salary_component", "earnings", function() {
 			return {
 				filters: {
-					type: "earning",
-					is_additional_component: 0
+					type: "earning"
 				}
 			}
 		});
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index 5480c0e..ce8b64e 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -14,6 +14,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -45,6 +46,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -77,6 +79,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -107,6 +110,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -141,6 +145,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -175,6 +180,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -208,6 +214,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -239,6 +246,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -271,6 +279,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -301,6 +310,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -335,6 +345,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -368,6 +379,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -399,6 +411,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -430,6 +443,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -465,6 +479,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -498,6 +513,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -532,6 +548,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -565,6 +582,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -598,6 +616,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -629,6 +648,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -659,6 +679,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -692,6 +713,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -725,6 +747,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -756,6 +779,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -787,6 +811,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -819,6 +844,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -849,6 +875,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -873,7 +900,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "translatable": 0, 
@@ -881,6 +908,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -922,7 +950,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-14 16:05:11.002259", 
+ "modified": "2018-07-24 18:36:25.169098", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure", 
@@ -976,5 +1004,6 @@
  "timeline_field": "", 
  "title_field": "", 
  "track_changes": 0, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index 48d67fc..6b190db 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -8,13 +8,25 @@
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
 from frappe.model.document import Document
+from six import iteritems
 
 class SalaryStructure(Document):
 	def validate(self):
+		self.set_missing_values()
 		self.validate_amount()
 		self.strip_condition_and_formula_fields()
 		self.validate_max_benefits_with_flexi()
 
+	def set_missing_values(self):
+		fields = ["depends_on_lwp", "variable_based_on_taxable_salary", "is_tax_applicable", "is_flexible_benefit"]
+		for table in ["earnings", "deductions"]:
+			for d in self.get(table):
+				component_default_value = frappe.db.get_value("Salary Component", str(d.salary_component), fields, as_dict=1)
+				if component_default_value:
+					for fieldname, value in iteritems(component_default_value):
+						if d.get(fieldname) != value:
+							d[fieldname] = value		
+
 	def validate_amount(self):
 		if flt(self.net_pay) < 0 and self.salary_slip_based_on_timesheet:
 			frappe.throw(_("Net pay cannot be negative"))
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure_dashboard.py b/erpnext/hr/doctype/salary_structure/salary_structure_dashboard.py
new file mode 100644
index 0000000..7a29878
--- /dev/null
+++ b/erpnext/hr/doctype/salary_structure/salary_structure_dashboard.py
@@ -0,0 +1,11 @@
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'salary_structure',
+		'transactions': [
+			{
+				'items': ['Salary Structure Assignment']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure/test_salary_structure.py b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
index 78b16f2..1a16db7 100644
--- a/erpnext/hr/doctype/salary_structure/test_salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
@@ -8,8 +8,8 @@
 from frappe.utils.make_random import get_random
 from frappe.utils import nowdate, add_days, add_years, getdate, add_months
 from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
-from erpnext.hr.doctype.salary_slip.test_salary_slip import get_earnings_component,\
-	get_deductions_component, make_employee_salary_slip
+from erpnext.hr.doctype.salary_slip.test_salary_slip import make_earning_salary_component,\
+	make_deduction_salary_component, make_employee_salary_slip
 from erpnext.hr.doctype.employee.test_employee import make_employee
 
 
@@ -34,7 +34,7 @@
 				"from_date": nowdate(),
 				"to_date": add_years(nowdate(), 1),
 				"weekly_off": "Sunday"
-			}).insert()	
+			}).insert()
 			holiday_list.get_weekly_off_dates()
 			holiday_list.save()
 
@@ -72,14 +72,16 @@
 			self.assertFalse(("\n" in row.formula) or ("\n" in row.condition))
 
 
-def make_salary_structure(salary_structure, payroll_frequency, employee=None, dont_submit=False, other_details=None):
+def make_salary_structure(salary_structure, payroll_frequency, employee=None, dont_submit=False, other_details=None, test_tax=False):
+	if test_tax:
+		frappe.db.sql("""delete from `tabSalary Structure` where name=%s""",(salary_structure))
 	if not frappe.db.exists('Salary Structure', salary_structure):
 		details = {
 			"doctype": "Salary Structure",
 			"name": salary_structure,
 			"company": erpnext.get_default_company(),
-			"earnings": get_earnings_component(),
-			"deductions": get_deductions_component(),
+			"earnings": make_earning_salary_component(test_tax=test_tax),
+			"deductions": make_deduction_salary_component(test_tax=test_tax),
 			"payroll_frequency": payroll_frequency,
 			"payment_account": get_random("Account")
 		}
@@ -97,14 +99,16 @@
 
 	return salary_structure_doc
 
-def create_salary_structure_assignment(employee, salary_structure):
+def create_salary_structure_assignment(employee, salary_structure, from_date=None):
+	if frappe.db.exists("Salary Structure Assignment", {"employee": employee}):
+		frappe.db.sql("""delete from `tabSalary Structure Assignment` where employee=%s""",(employee))
 	salary_structure_assignment = frappe.new_doc("Salary Structure Assignment")
 	salary_structure_assignment.employee = employee
 	salary_structure_assignment.base = 50000
 	salary_structure_assignment.variable = 5000
-	salary_structure_assignment.from_date = add_months(nowdate(), -1)
+	salary_structure_assignment.from_date = from_date or add_months(nowdate(), -1)
 	salary_structure_assignment.salary_structure = salary_structure
 	salary_structure_assignment.company = erpnext.get_default_company()
 	salary_structure_assignment.save(ignore_permissions=True)
 	salary_structure_assignment.submit()
-	return salary_structure_assignment
\ No newline at end of file
+	return salary_structure_assignment
diff --git a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json
index 95308dc..30ee906 100644
--- a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json
+++ b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json
@@ -28,7 +28,7 @@
    "in_filter": 0, 
    "in_global_search": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -41,7 +41,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 0, 
+   "search_index": 1, 
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
@@ -96,7 +96,7 @@
    "in_filter": 0, 
    "in_global_search": 0, 
    "in_list_view": 0, 
-   "in_standard_filter": 0, 
+   "in_standard_filter": 1, 
    "label": "Department", 
    "length": 0, 
    "no_copy": 0, 
@@ -121,27 +121,28 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "salary_structure", 
+   "fetch_from": "employee.designation", 
+   "fieldname": "designation", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Salary Structure", 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Designation", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Salary Structure", 
+   "options": "Designation", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "translatable": 0, 
@@ -185,6 +186,39 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "salary_structure", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Salary Structure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salary Structure", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "from_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -412,7 +446,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-06-22 14:54:05.494234", 
+ "modified": "2018-07-30 18:55:14.712301", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure Assignment", 
@@ -485,5 +519,6 @@
  "sort_order": "DESC", 
  "title_field": "employee_name", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py
index 210f75d..cf09066 100644
--- a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py
+++ b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py
@@ -38,7 +38,7 @@
 		select salary_structure from `tabSalary Structure Assignment`
 		where employee=%(employee)s
 		and docstatus = 1
-		and %(on_date)s > from_date order by from_date desc limit 1""", {
+		and %(on_date)s >= from_date order by from_date desc limit 1""", {
 			'employee': employee,
 			'on_date': on_date,
 		})
diff --git a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json b/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
deleted file mode 100644
index f2295ff..0000000
--- a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
+++ /dev/null
@@ -1,233 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0,
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "employee", 
- "beta": 0, 
- "creation": "2016-07-26 11:53:43.621605", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "employee.employee_name",
-   "fieldname": "employee_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Employee Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "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, 
-   "translatable": 0,
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "from_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0,
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "From 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, 
-   "translatable": 0,
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "to_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0,
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "To Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Base", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "variable", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Variable", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }
- ], 
- "has_web_view": 0,
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-05-16 22:43:05.329951",
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Salary Structure Employee", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.py b/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.py
deleted file mode 100644
index dfcac3f..0000000
--- a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class SalaryStructureEmployee(Document):
-	pass
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 cb4003a..9f299df 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
@@ -1,4 +1,5 @@
 {
+ "align_labels_right": 0, 
  "creation": "2016-07-07 11:45:14.872204", 
  "custom_format": 0, 
  "disabled": 0, 
@@ -6,13 +7,16 @@
  "docstatus": 0, 
  "doctype": "Print Format", 
  "font": "Default", 
- "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \"   <h3 style=\\\"text-align: right;\\\"><span style=\\\"line-height: 1.42857;\\\">{{doc.name}}</span></h3>\\n<div>\\n    <hr style=\\\"text-align: center;\\\">\\n</div>   \"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"employee\"}, {\"print_hide\": 0, \"fieldname\": \"company\"}, {\"print_hide\": 0, \"fieldname\": \"employee_name\"}, {\"print_hide\": 0, \"fieldname\": \"department\"}, {\"print_hide\": 0, \"fieldname\": \"designation\"}, {\"print_hide\": 0, \"fieldname\": \"branch\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\"}, {\"print_hide\": 0, \"fieldname\": \"total_working_days\"}, {\"print_hide\": 0, \"fieldname\": \"leave_without_pay\"}, {\"print_hide\": 0, \"fieldname\": \"payment_days\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"earnings\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"deductions\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"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\": \"Custom 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\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"employee\", \"label\": \"Employee\"}, {\"print_hide\": 0, \"fieldname\": \"company\", \"label\": \"Company\"}, {\"print_hide\": 0, \"fieldname\": \"employee_name\", \"label\": \"Employee Name\"}, {\"print_hide\": 0, \"fieldname\": \"department\", \"label\": \"Department\"}, {\"print_hide\": 0, \"fieldname\": \"designation\", \"label\": \"Designation\"}, {\"print_hide\": 0, \"fieldname\": \"branch\", \"label\": \"Branch\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\", \"label\": \"Start Date\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\", \"label\": \"End Date\"}, {\"print_hide\": 0, \"fieldname\": \"total_working_days\", \"label\": \"Working Days\"}, {\"print_hide\": 0, \"fieldname\": \"leave_without_pay\", \"label\": \"Leave Without Pay\"}, {\"print_hide\": 0, \"fieldname\": \"payment_days\", \"label\": \"Payment Days\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"earnings\", \"label\": \"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\", \"label\": \"Deductions\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"gross_pay\", \"label\": \"Gross Pay\"}, {\"print_hide\": 0, \"fieldname\": \"total_deduction\", \"label\": \"Total Deduction\"}, {\"print_hide\": 0, \"fieldname\": \"net_pay\", \"label\": \"Net Pay\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\", \"label\": \"Rounded Total\"}, {\"print_hide\": 0, \"fieldname\": \"total_in_words\", \"label\": \"Total in words\"}]", 
  "idx": 0, 
- "modified": "2016-08-22 00:21:42.600548", 
+ "line_breaks": 0, 
+ "modified": "2018-07-24 19:31:39.040701", 
  "modified_by": "Administrator", 
+ "module": "HR", 
  "name": "Salary Slip Standard", 
  "owner": "Administrator", 
  "print_format_builder": 1, 
  "print_format_type": "Server", 
+ "show_section_headings": 0, 
  "standard": "Yes"
 }
\ No newline at end of file
diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py
index acb94fe..fb03044 100644
--- a/erpnext/hr/utils.py
+++ b/erpnext/hr/utils.py
@@ -170,7 +170,7 @@
 		doc.name = "New "+doc.doctype
 
 	overlap_doc = frappe.db.sql(query.format(doc.doctype),{
-			"employee": doc.employee,
+			"employee": doc.get("employee"),
 			"from_date": from_date,
 			"to_date": to_date,
 			"name": doc.name,
@@ -209,10 +209,10 @@
 			leave_policy = frappe.db.get_value("Employee Grade", employee_grade, "default_leave_policy")
 			if not leave_policy:
 				frappe.throw(_("Employee {0} of grade {1} have no default leave policy").format(employee, employee_grade))
-		else:
-			frappe.throw(_("Employee {0} has no grade to get default leave policy").format(employee))
 	if leave_policy:
 		return frappe.get_doc("Leave Policy", leave_policy)
+	else:
+		frappe.throw(_("Please set leave policy for employee {0} in Employee / Grade record").format(employee))
 
 def validate_tax_declaration(declarations):
 	subcategories = []
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index 29e0048..1214191 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -14,6 +14,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -45,6 +46,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -77,6 +79,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -112,6 +115,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -145,6 +149,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -180,6 +185,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -212,6 +218,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -243,6 +250,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -274,6 +282,41 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -307,6 +350,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -341,6 +385,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -376,7 +421,8 @@
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -408,6 +454,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -441,6 +488,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -473,6 +521,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -504,6 +553,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -535,6 +585,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -568,6 +619,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -597,6 +649,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -629,6 +682,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -660,6 +714,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -692,6 +747,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -724,7 +780,8 @@
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -756,6 +813,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -787,6 +845,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -817,6 +876,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -848,6 +908,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -879,7 +940,8 @@
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -910,6 +972,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -943,6 +1006,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -976,6 +1040,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1009,6 +1074,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1041,6 +1107,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1073,6 +1140,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1105,6 +1173,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1135,6 +1204,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1167,6 +1237,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1198,6 +1269,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1228,6 +1300,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1262,39 +1335,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1325,6 +1366,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1358,6 +1400,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1389,6 +1432,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1420,6 +1464,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1452,6 +1497,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1483,6 +1529,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1515,6 +1562,7 @@
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1558,7 +1606,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-30 12:49:21.211740", 
+ "modified": "2018-07-19 11:08:32.198681", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Work Order", 
@@ -1610,5 +1658,6 @@
  "sort_order": "ASC", 
  "title_field": "production_item", 
  "track_changes": 1, 
- "track_seen": 1
+ "track_seen": 1, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index a9958cb..7d069ec 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -379,7 +379,6 @@
 erpnext.patches.v7_2.arrear_leave_encashment_as_salary_component
 erpnext.patches.v7_2.rename_att_date_attendance
 erpnext.patches.v7_2.update_attendance_docstatus
-erpnext.patches.v7_2.move_dates_from_salary_structure_to_employee
 erpnext.patches.v7_2.make_all_assessment_group
 erpnext.patches.v8_0.repost_reserved_qty_for_multiple_sales_uom
 erpnext.patches.v8_0.addresses_linked_to_lead
@@ -445,7 +444,6 @@
 erpnext.patches.v8_8.add_new_fields_in_accounts_settings
 erpnext.patches.v8_9.set_print_zero_amount_taxes
 erpnext.patches.v8_9.set_default_customer_group
-erpnext.patches.v8_9.remove_employee_from_salary_structure_parent
 erpnext.patches.v8_9.delete_gst_doctypes_for_outside_india_accounts
 erpnext.patches.v8_9.set_default_fields_in_variant_settings
 erpnext.patches.v8_9.update_billing_gstin_for_indian_account
@@ -524,7 +522,6 @@
 erpnext.patches.v10_0.taxes_issue_with_pos
 erpnext.patches.v11_0.update_account_type_in_party_type
 erpnext.patches.v10_1.transfer_subscription_to_auto_repeat
-erpnext.patches.v10_1.drop_old_subscription_records
 erpnext.patches.v11_0.update_brand_in_item_price
 erpnext.patches.v11_0.create_default_success_action
 erpnext.patches.v11_0.add_healthcare_service_unit_tree_root
diff --git a/erpnext/patches/v10_1/drop_old_subscription_records.py b/erpnext/patches/v10_1/drop_old_subscription_records.py
deleted file mode 100644
index 7573f15..0000000
--- a/erpnext/patches/v10_1/drop_old_subscription_records.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-
-def execute():
-	frappe.db.sql('DELETE from `tabSubscription`')
diff --git a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
index a9078e3..5c18985 100644
--- a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
+++ b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
@@ -4,25 +4,21 @@
 
 
 def execute():
-	to_rename = ['Purchase Order', 'Journal Entry', 'Sales Invoice', 'Payment Entry',
-		'Delivery Note', 'Purchase Invoice', 'Quotation', 'Sales Order',
-		'Purchase Receipt', 'Supplier Quotation']
-
-	frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
-	frappe.reload_doc('accounts', 'doctype', 'purchase_invoice')
-	frappe.reload_doc('accounts', 'doctype', 'payment_entry')
-	frappe.reload_doc('accounts', 'doctype', 'journal_entry')
-	frappe.reload_doc('buying', 'doctype', 'purchase_order')
-	frappe.reload_doc('buying', 'doctype', 'supplier_quotation')
 	frappe.reload_doc('desk', 'doctype', 'auto_repeat')
-	frappe.reload_doc('selling', 'doctype', 'quotation')
-	frappe.reload_doc('selling', 'doctype', 'sales_order')
-	frappe.reload_doc('stock', 'doctype', 'purchase_receipt')
-	frappe.reload_doc('stock', 'doctype', 'delivery_note')
 
-	for doctype in to_rename:
-		if frappe.db.has_column(doctype, 'subscription'):
-			rename_field(doctype, 'subscription', 'auto_repeat')
+	doctypes_to_rename = {
+		'accounts': ['Journal Entry', 'Payment Entry', 'Purchase Invoice', 'Sales Invoice'],
+		'buying': ['Purchase Order', 'Supplier Quotation'],
+		'selling': ['Quotation', 'Sales Order'],
+		'stock': ['Delivery Note', 'Purchase Receipt']
+	}
+
+	for module, doctypes in doctypes_to_rename.items():
+		for doctype in doctypes:
+			frappe.reload_doc(module, 'doctype', frappe.scrub(doctype))
+
+			if frappe.db.has_column(doctype, 'subscription'):
+				rename_field(doctype, 'subscription', 'auto_repeat')
 
 	subscriptions = frappe.db.sql('select * from `tabSubscription`', as_dict=1)
 
@@ -30,3 +26,19 @@
 		doc['doctype'] = 'Auto Repeat'
 		auto_repeat = frappe.get_doc(doc)
 		auto_repeat.db_insert()
+
+	frappe.db.sql('delete from `tabSubscription`')
+	frappe.db.commit()
+	drop_columns_from_subscription()
+
+def drop_columns_from_subscription():
+	fields_to_drop = {'Subscription': []}
+	for field in ['naming_series', 'reference_doctype', 'reference_document', 'start_date',
+		'end_date', 'submit_on_creation', 'disabled', 'frequency', 'repeat_on_day',
+		'next_schedule_date', 'notify_by_email', 'subject', 'recipients', 'print_format',
+		'message', 'status', 'amended_from']:
+
+		if field in frappe.db.get_table_columns("Subscription"):
+			fields_to_drop['Subscription'].append(field)
+
+	frappe.model.delete_fields(fields_to_drop, delete=1)
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py b/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py
index 17368bf..0c4209a 100644
--- a/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py
+++ b/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py
@@ -4,10 +4,11 @@
 def execute():
 	""" assign lft and rgt appropriately """
 	frappe.reload_doc("healthcare", "doctype", "healthcare_service_unit")
+	frappe.reload_doc("healthcare", "doctype", "healthcare_service_unit_type")
 
-	if not frappe.db.exists("Healthcare Service Unit", _('All Healthcare Service Unit')):
+	if not frappe.db.exists("Healthcare Service Unit", _('All Healthcare Service Units')):
 		frappe.get_doc({
 			'doctype': 'Healthcare Service Unit',
-			'healthcare_service_unit_name': _('All Healthcare Service Unit'),
+			'healthcare_service_unit_name': _('All Healthcare Service Units'),
 			'is_group': 1
 		}).insert(ignore_permissions=True)
diff --git a/erpnext/patches/v11_0/create_salary_structure_assignments.py b/erpnext/patches/v11_0/create_salary_structure_assignments.py
index 712269a..596fe84 100644
--- a/erpnext/patches/v11_0/create_salary_structure_assignments.py
+++ b/erpnext/patches/v11_0/create_salary_structure_assignments.py
@@ -7,21 +7,32 @@
 from erpnext.hr.doctype.salary_structure_assignment.salary_structure_assignment import DuplicateAssignment
 
 def execute():
+	frappe.reload_doc('hr', 'doctype', 'salary_structure')
 	frappe.reload_doc("hr", "doctype", "salary_structure_assignment")
 	frappe.db.sql("""
 		delete from `tabSalary Structure Assignment`
 		where salary_structure in (select name from `tabSalary Structure` where is_active='No' or docstatus!=1)
 	""")
-	for d in frappe.db.sql("""
-		select sse.*, ss.company
-		from `tabSalary Structure Employee` sse, `tabSalary Structure` ss
-		where ss.name = sse.parent AND ss.is_active='Yes'
-		AND sse.employee in (select name from `tabEmployee` where ifNull(status, '') != 'Left')""", as_dict=1):
+	if frappe.db.table_exists('Salary Structure Employee'):
+		ss_details = frappe.db.sql("""
+			select sse.employee, sse.employee_name, sse.from_date, sse.to_date,
+				sse.base, sse.variable, sse.parent as salary_structure, ss.company
+			from `tabSalary Structure Employee` sse, `tabSalary Structure` ss
+			where ss.name = sse.parent AND ss.is_active='Yes'
+			AND sse.employee in (select name from `tabEmployee` where ifNull(status, '') != 'Left')""", as_dict=1)
+	else:
+		ss_details = frappe.db.sql("""
+			select name as salary_structure, employee, employee_name, from_date, to_date, base, variable, company
+			from `tabSalary Structure`
+			where is_active='Yes'
+			AND sse.employee in (select name from `tabEmployee` where ifNull(status, '') != 'Left')""", as_dict=1)
+	
+	for d in ss_details:
 		try:
 			s = frappe.new_doc("Salary Structure Assignment")
 			s.employee = d.employee
 			s.employee_name = d.employee_name
-			s.salary_structure = d.parent
+			s.salary_structure = d.salary_structure
 			s.from_date = d.from_date
 			s.to_date = d.to_date if isinstance(d.to_date, datetime) else None
 			s.base = d.base
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
deleted file mode 100644
index b5172db..0000000
--- a/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import frappe
-
-def execute():
-	frappe.reload_doc('hr', 'doctype', 'salary_structure')
-	frappe.reload_doc('hr', 'doctype', 'salary_structure_employee')
-	if not frappe.db.has_column('Salary Structure', 'employees'):
-		return
-	for ss in frappe.db.sql(""" select employee, name from `tabSalary Structure`""", as_dict=True):
-		ss_doc = frappe.get_doc('Salary Structure', ss.name)
-		salary_employee = ss_doc.append('employees',{})
-		salary_employee.employee = ss.employee
-		salary_employee.base = 0
-		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_2/move_dates_from_salary_structure_to_employee.py b/erpnext/patches/v7_2/move_dates_from_salary_structure_to_employee.py
deleted file mode 100644
index 98e076e..0000000
--- a/erpnext/patches/v7_2/move_dates_from_salary_structure_to_employee.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import frappe
-
-def execute():
-	frappe.reload_doc('hr', 'doctype', 'salary_structure_employee')
-	salary_structures = frappe.db.sql("""select name, to_date, from_date from `tabSalary Structure`""", as_dict=True)
-
-	for salary_structure in salary_structures:
-		frappe.db.sql(""" update `tabSalary Structure Employee` set from_date = %s, to_date = %s
-			where parent = %s """, (salary_structure.from_date, salary_structure.to_date or 'null', salary_structure.name))
\ No newline at end of file
diff --git a/erpnext/patches/v8_7/add_more_gst_fields.py b/erpnext/patches/v8_7/add_more_gst_fields.py
index fc76a06..d2085e0 100644
--- a/erpnext/patches/v8_7/add_more_gst_fields.py
+++ b/erpnext/patches/v8_7/add_more_gst_fields.py
@@ -6,6 +6,6 @@
 	if not company:
 		return
 
-	frappe.reload_doc('hr', 'doctype', 'Employee Tax Exemption Declaration')
-	frappe.reload_doc('hr', 'doctype', 'Employee Tax Exemption Proof Submission')
+	frappe.reload_doc('hr', 'doctype', 'employee_tax_exemption_declaration')
+	frappe.reload_doc('hr', 'doctype', 'employee_tax_exemption_proof_submission')
 	make_custom_fields()
\ No newline at end of file
diff --git a/erpnext/patches/v9_2/repost_reserved_qty_for_production.py b/erpnext/patches/v9_2/repost_reserved_qty_for_production.py
index 27cce1d..c4eab19 100644
--- a/erpnext/patches/v9_2/repost_reserved_qty_for_production.py
+++ b/erpnext/patches/v9_2/repost_reserved_qty_for_production.py
@@ -1,7 +1,8 @@
 import frappe
 
 def execute():
+	frappe.reload_doc("stock", "doctype", "bin")
 	bins = frappe.db.sql("select name from `tabBin` where reserved_qty_for_production > 0")
 	for d in bins:
 		bin_doc = frappe.get_doc("Bin", d[0])
-		bin_doc.update_reserved_qty_for_production()
\ No newline at end of file
+		bin_doc.update_reserved_qty_for_production()
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index d289b82..6acad06 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -133,8 +133,8 @@
 					task.flags.ignore_recursion_check = True
 					task.save()
 
-	def has_webform_permission(doc):
-		project_user = frappe.db.get_value("Project User", {"parent": doc.project, "user":frappe.session.user} , "user")
+	def has_webform_permission(self):
+		project_user = frappe.db.get_value("Project User", {"parent": self.project, "user":frappe.session.user} , "user")
 		if project_user:
 			return True
 
diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
index 1f274db..9f1c586 100644
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -19,10 +19,10 @@
 	def setUp(self):
 		for dt in ["Salary Slip", "Salary Structure", "Salary Structure Assignment", "Timesheet"]:
 			frappe.db.sql("delete from `tab%s`" % dt)
-		
-		from erpnext.hr.doctype.salary_slip.test_salary_slip import make_earning_salary_component
-		make_earning_salary_component(["Timesheet Component"])
-		
+
+		if not frappe.db.exists("Salary Component", "Timesheet Component"):
+			frappe.get_doc({"doctype": "Salary Component", "salary_component": "Timesheet Component"}).insert()
+
 
 	def test_timesheet_billing_amount(self):
 		make_salary_structure_for_timesheet("_T-Employee-00001")
diff --git a/erpnext/projects/web_form/tasks/tasks.json b/erpnext/projects/web_form/tasks/tasks.json
index 98a2055..c646210 100644
--- a/erpnext/projects/web_form/tasks/tasks.json
+++ b/erpnext/projects/web_form/tasks/tasks.json
@@ -1,23 +1,33 @@
 {
+ "accept_payment": 0, 
  "allow_comments": 1, 
  "allow_delete": 1, 
  "allow_edit": 1, 
+ "allow_incomplete": 0, 
  "allow_multiple": 1, 
+ "allow_print": 0, 
+ "amount": 0.0, 
+ "amount_based_on_field": 0, 
  "breadcrumbs": "[{\"title\":\"Tasks\", \"name\":\"tasks\"}]", 
  "creation": "2016-06-24 15:50:33.091287", 
  "doc_type": "Task", 
  "docstatus": 0, 
  "doctype": "Web Form", 
  "idx": 0, 
+ "introduction_text": "", 
  "is_standard": 1, 
  "login_required": 1, 
- "modified": "2016-08-06 11:59:21.494549", 
+ "max_attachment_size": 0, 
+ "modified": "2018-07-24 11:32:07.805956", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "tasks", 
  "owner": "Administrator", 
+ "payment_button_label": "Buy Now", 
  "published": 1, 
  "route": "tasks", 
+ "show_sidebar": 1, 
+ "sidebar_items": [], 
  "success_url": "", 
  "title": "Task", 
  "web_form_fields": [
@@ -26,6 +36,8 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "label": "Project", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Project", 
    "read_only": 1, 
    "reqd": 1
@@ -35,6 +47,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Subject", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 1
   }, 
@@ -43,15 +57,19 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "label": "Status", 
-   "options": "Open\nClosed\nCancelled", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "Open\nWorking\nPending Review\nOverdue\nClosed\nCancelled", 
    "read_only": 0, 
    "reqd": 0
   }, 
   {
    "fieldname": "description", 
-   "fieldtype": "Text", 
+   "fieldtype": "Text Editor", 
    "hidden": 0, 
    "label": "Details", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -60,6 +78,8 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "label": "Priority", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Low\nMedium\nHigh\nUrgent", 
    "read_only": 0, 
    "reqd": 0
@@ -69,6 +89,8 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "label": "Expected Start Date", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -77,6 +99,8 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "label": "Expected End Date", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index b7bb77e..2fcdbb4 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -2,20 +2,22 @@
 
 erpnext.financial_statements = {
 	"filters": get_filters(),
-	"formatter": function(row, cell, value, columnDef, dataContext, default_formatter) {
-		if (columnDef.df.fieldname=="account") {
-			value = dataContext.account_name;
+	"formatter": function(value, row, column, data, default_formatter) {
+		if (column.fieldname=="account") {
+			value = data.account_name;
 
-			columnDef.df.link_onclick =
-				"erpnext.financial_statements.open_general_ledger(" + JSON.stringify(dataContext) + ")";
-			columnDef.df.is_tree = true;
+			column.link_onclick =
+				"erpnext.financial_statements.open_general_ledger(" + JSON.stringify(data) + ")";
+			column.is_tree = true;
 		}
 
-		value = default_formatter(row, cell, value, columnDef, dataContext);
+		value = default_formatter(value, row, column, data);
 
-		if (!dataContext.parent_account) {
+		if (!data.parent_account) {
+			value = $(`<span>${value}</span>`);
+
 			var $value = $(value).css("font-weight", "bold");
-			if (dataContext.warn_if_negative && dataContext[columnDef.df.fieldname] < 0) {
+			if (data.warn_if_negative && data[column.fieldname] < 0) {
 				$value.addClass("text-danger");
 			}
 
diff --git a/erpnext/public/js/hub/hub_factory.js b/erpnext/public/js/hub/hub_factory.js
index 6451e1d..d656605 100644
--- a/erpnext/public/js/hub/hub_factory.js
+++ b/erpnext/public/js/hub/hub_factory.js
@@ -1,6 +1,6 @@
 frappe.provide('erpnext.hub.pages');
 
-frappe.views.HubFactory = frappe.views.Factory.extend({
+frappe.views.HubFactory = class HubFactory extends frappe.views.Factory {
 	make(route) {
 		const page_name = frappe.get_route_str();
 		const page = route[1];
@@ -60,7 +60,7 @@
 				window.hub_page = erpnext.hub.pages[page_name];
 			}
 		});
-	},
+	}
 
 	render_offline_card() {
 		let html = `<div class='page-card' style='margin: 140px auto;'>
@@ -77,4 +77,4 @@
 
 		return;
 	}
-});
+};
diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py
index cd0bc9a..7bb09e9 100644
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -249,7 +249,6 @@
 
 	set_salary_components(docs)
 	set_tds_account(docs, company)
-	set_tax_withholding_category(docs, company)
 
 	for d in docs:
 		try:
@@ -259,6 +258,9 @@
 		except frappe.NameError:
 			pass
 
+	# create tds fixtures
+	set_tax_withholding_category(company)
+
 def set_salary_components(docs):
 	docs.extend([
 		{'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax', 'type': 'Deduction'},
@@ -269,31 +271,33 @@
 		{'doctype': 'Salary Component', 'salary_component': 'Leave Encashment', 'description': 'Leave Encashment', 'type': 'Earning'}
 	])
 
-def set_tax_withholding_category(docs, company):
+def set_tax_withholding_category(company):
 	accounts = []
-	tds_account = frappe.db.get_value("Account", filter={"account_type": "Payable",
-		"account_name": "TDS", "company": company})
+	abbr = frappe.get_value("Company", company, "abbr")
+	tds_account = frappe.get_value("Account", 'TDS Payable - {0}'.format(abbr), 'name')
 
 	if company and tds_account:
-		accounts = [
-				{
-					'company': company,
-					'account': tds_account
-				}
-			]
+		accounts = [dict(company=company, account=tds_account)]
 
-	docs.extend([
-		{
-			'doctype': 'Tax Withholding Category', '__newname': 'TDS',
-			'percent_of_tax_withheld': 10,'threshold': 150000, 'book_on_invoice': 1,
-			'withhold_cumulative_tax_amount': 0, 'accounts': accounts
-		}
-	])
+	tds = frappe.get_doc({
+		'doctype': 'Tax Withholding Category', 'name': 'TDS',
+		'percent_of_tax_withheld': 10,'threshold': 150000, 'book_on_invoice': 1,
+		'withhold_cumulative_tax_amount': 0, 'accounts': accounts
+	})
+
+	try:
+		tds.flags.ignore_permissions = True
+		tds.insert()
+	except frappe.DuplicateEntryError:
+		tds = frappe.get_doc("Tax Withholding Category", tds.get("name"))
+		tds.append("accounts", accounts[0])
+		tds.save()
 
 def set_tds_account(docs, company):
+	abbr = frappe.get_value("Company", company, "abbr")
 	docs.extend([
 		{
-			'doctype': 'Account', 'account_name': 'TDS', 'account_type': 'Tax',
-			'parent_account': 'Duties and Taxes', 'company': company
+			"doctype": "Account", "account_name": "TDS Payable", "account_type": "Tax",
+			"parent_account": "Duties and Taxes - {0}".format(abbr), "company": company
 		}
 	])
diff --git a/erpnext/hr/doctype/salary_structure_employee/__init__.py b/erpnext/regional/report/eway_bill/__init__.py
similarity index 100%
copy from erpnext/hr/doctype/salary_structure_employee/__init__.py
copy to erpnext/regional/report/eway_bill/__init__.py
diff --git a/erpnext/regional/report/eway_bill/eway_bill.js b/erpnext/regional/report/eway_bill/eway_bill.js
new file mode 100644
index 0000000..ab00946
--- /dev/null
+++ b/erpnext/regional/report/eway_bill/eway_bill.js
@@ -0,0 +1,33 @@
+// Copyright (c) 2016, FinByz Tech Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Eway Bill"] = {
+	"filters": [
+		{
+			'fieldname': 'delivery_note',
+			'label': __("Delivery Note"),
+			'fieldtype': 'Link',
+			'options': 'Delivery Note'
+		},
+		{
+			'fieldname': 'posting_date',
+			'label': __("Date"),
+			'fieldtype': 'DateRange',
+			'default': [frappe.datetime.nowdate(), frappe.datetime.nowdate()]
+		},
+		{
+			'fieldname': 'customer',
+			'label': __("Customer"),
+			'fieldtype': 'Link',
+			'options': 'Customer'
+		},
+		{
+			"fieldname":"company",
+			"label": __("Company"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"default": frappe.defaults.get_user_default("Company")
+		},
+	]
+}
diff --git a/erpnext/regional/report/eway_bill/eway_bill.json b/erpnext/regional/report/eway_bill/eway_bill.json
new file mode 100644
index 0000000..41d6c93
--- /dev/null
+++ b/erpnext/regional/report/eway_bill/eway_bill.json
@@ -0,0 +1,32 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2018-07-13 19:59:18.922829", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "modified": "2018-07-19 12:08:07.400295", 
+ "modified_by": "Administrator", 
+ "module": "Regional", 
+ "name": "Eway Bill", 
+ "owner": "Administrator", 
+ "ref_doctype": "Delivery Note", 
+ "report_name": "Eway Bill", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/regional/report/eway_bill/eway_bill.py b/erpnext/regional/report/eway_bill/eway_bill.py
new file mode 100644
index 0000000..0ded917
--- /dev/null
+++ b/erpnext/regional/report/eway_bill/eway_bill.py
@@ -0,0 +1,385 @@
+# Copyright (c) 2013, FinByz Tech Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+import re
+from frappe import _
+from frappe.utils import nowdate
+
+def execute(filters=None):
+	if not filters: filters.setdefault('posting_date', [nowdate(), nowdate()])
+	columns, data = [], []
+	columns = get_columns()
+	data = get_data(filters)
+	return columns, data
+
+def get_data(filters):
+	
+	conditions = get_conditions(filters)
+
+	data = frappe.db.sql("""
+		SELECT
+			dn.name as dn_id, dn.posting_date, dn.company, dn.company_gstin, dn.customer, dn.customer_gstin, dni.item_code, dni.item_name, dni.description, dni.gst_hsn_code, dni.uom, dni.qty, dni.amount, dn.transport_mode, dn.distance, dn.transporter_name, dn.transporter, dn.lr_no, dn.lr_date, dn.vehicle_no, dn.vehicle_type, dn.company_address, dn.shipping_address_name
+		FROM
+			`tabDelivery Note` AS dn join `tabDelivery Note Item` AS dni on (dni.parent = dn.name)
+		WHERE
+			dn.docstatus < 2 
+			%s """ % conditions, as_dict=1)
+
+	unit = {
+		'Bag': "BAGS",
+		'Bottle': "BOTTLES",
+		'Kg': "KILOGRAMS",
+		'Liter': "LITERS",
+		'Meter': "METERS",
+		'Nos': "NUMBERS",
+		'PKT': "PACKS",
+		'Roll': "ROLLS",
+		'Set': "SETS"
+	}
+
+	# Regular expression set to remove all the special characters 
+	special_characters = "[$%^*()+\\[\]{};':\"\\|<>.?]"
+
+	for row in data:
+		set_defaults(row)
+		set_taxes(row, filters)
+		set_address_details(row, special_characters)
+		
+		# Eway Bill accepts date as dd/mm/yyyy and not dd-mm-yyyy
+		row.posting_date = '/'.join(str(row.posting_date).replace("-", "/").split('/')[::-1])
+		row.lr_date = '/'.join(str(row.lr_date).replace("-", "/").split('/')[::-1])
+
+		row.item_name = re.sub(special_characters, " ", row.item_name)
+		row.description = row.item_name
+
+		row.uom = unit.get(row.uom, row.uom)
+
+		# For removing special charactes and numbers from customer.
+		row.customer = re.sub(special_characters[:-1] + "&0-9" + "]", "", row.customer)
+
+	return data
+
+def get_conditions(filters):
+	
+	conditions = ""
+
+	conditions += filters.get('company') and " AND dn.company = '%s' " % filters.get('company') or ""
+	conditions += filters.get('posting_date') and " AND dn.posting_date >= '%s' AND dn.posting_date <= '%s' " % (filters.get('posting_date')[0], filters.get('posting_date')[1]) or ""
+	conditions += filters.get('delivery_note') and " AND dn.name = '%s' " % filters.get('delivery_note') or ""
+	conditions += filters.get('customer') and " AND dn.customer = '%s' " % filters.get('customer').replace("'", "\'") or ""
+
+	return conditions
+
+def set_defaults(row):
+	row.setdefault(u'supply_type', "Outward")
+	row.setdefault(u'sub_type', "Supply")
+	row.setdefault(u'doc_type', "Delivery Challan")
+
+def set_address_details(row, special_characters):
+
+	if row.get('company_address'):
+		address_line1, address_line2, city, pincode, state = frappe.db.get_value("Address", row.get('company_address'), ['address_line1', 'address_line2', 'city', 'pincode', 'state'])
+
+		row.update({'from_address_1': re.sub(special_characters, "", address_line1 or '')})
+		row.update({'from_address_2': re.sub(special_characters, "", address_line2 or '')})
+		row.update({'from_place': city and city.upper() or ''})
+		row.update({'from_pin_code': pincode and pincode.replace(" ", "") or ''})
+		row.update({'from_state': state and state.upper() or ''})
+		row.update({'dispatch_state': row.from_state})
+		
+	if row.get('shipping_address_name'):
+		address_line1, address_line2, city, pincode, state = frappe.db.get_value("Address", row.get('shipping_address_name'), ['address_line1', 'address_line2', 'city', 'pincode', 'state'])
+
+		row.update({'to_address_1': re.sub(special_characters, "", address_line1 or '')})
+		row.update({'to_address_2': re.sub(special_characters, "", address_line2 or '')})
+		row.update({'to_place': city and city.upper() or ''})
+		row.update({'to_pin_code': pincode and pincode.replace(" ", "") or ''})
+		row.update({'to_state': state and state.upper() or ''})
+		row.update({'ship_to_state': row.to_state})
+
+def set_taxes(row, filters):
+	taxes = frappe.get_list("Sales Taxes and Charges", 
+				filters={
+					'parent': row.dn_id
+				}, 
+				fields=('item_wise_tax_detail', 'account_head'))
+
+	account_list = ["cgst_account", "sgst_account", "igst_account", "cess_account"]
+	taxes_list = frappe.get_list("GST Account",
+		filters={
+			"parent": "GST Settings", 
+			"company": filters.company
+		},
+		fields=account_list)
+
+	item_tax_rate = {}
+
+	for tax in taxes:
+		item_wise_tax = json.loads(tax.item_wise_tax_detail)
+		item_tax_rate[tax.account_head] = item_wise_tax.get(row.item_code)
+
+	tax_rate = []
+
+	tax = taxes_list[0]
+	for key in account_list:
+		if tax[key] not in item_tax_rate.keys():
+			item_tax_rate[tax[key]] = [0.0, 0.0]
+
+		tax_rate.append(str(item_tax_rate[tax[key]][0]))
+		row.update({key[:5] + "amount": round(item_tax_rate.get(tax[key], 0.0)[1], 2)})
+		item_tax_rate.pop(tax[key])
+
+	row.amount = float(row.amount) + sum(i[1] for i in item_tax_rate.values())
+	row.update({'tax_rate': '+'.join(tax_rate)})
+
+def get_columns():
+	columns = [
+		{
+			"fieldname": "supply_type",
+			"label": _("Supply Type"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "sub_type",
+			"label": _("Sub Type"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "doc_type",
+			"label": _("Doc Type"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "dn_id",
+			"label": _("Doc Name"),
+			"fieldtype": "Link",
+			"options": "Delivery Note",
+			"width": 140
+		},
+		{
+			"fieldname": "posting_date",
+			"label": _("Doc Date"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "company",
+			"label": _("From Party Name"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"width": 120
+		},
+		{
+			"fieldname": "company_gstin",
+			"label": _("From GSTIN"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "from_address_1",
+			"label": _("From Address 1"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "from_address_2",
+			"label": _("From Address 2"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "from_place",
+			"label": _("From Place"),
+			"fieldtype": "Data",
+			"width": 80
+		},
+		{
+			"fieldname": "from_pin_code",
+			"label": _("From Pin Code"),
+			"fieldtype": "Data",
+			"width": 80
+		},
+		{
+			"fieldname": "from_state",
+			"label": _("From State"),
+			"fieldtype": "Data",
+			"width": 80
+		},
+		{
+			"fieldname": "dispatch_state",
+			"label": _("Dispatch State"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "customer",
+			"label": _("To Party Name"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "customer_gstin",
+			"label": _("To GSTIN"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "to_address_1",
+			"label": _("To Address 1"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "to_address_2",
+			"label": _("To Address 2"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "to_place",
+			"label": _("To Place"),
+			"fieldtype": "Data",
+			"width": 80
+		},
+		{
+			"fieldname": "to_pin_code",
+			"label": _("To Pin Code"),
+			"fieldtype": "Data",
+			"width": 80
+		},
+		{
+			"fieldname": "to_state",
+			"label": _("To State"),
+			"fieldtype": "Data",
+			"width": 80
+		},
+		{
+			"fieldname": "ship_to_state",
+			"label": _("Ship To State"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "item_name",
+			"label": _("Product"),
+			"fieldtype": "Link",
+			"options": "Item",
+			"width": 120
+		},
+		{
+			"fieldname": "description",
+			"label": _("Description"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "gst_hsn_code",
+			"label": _("HSN"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "uom",
+			"label": _("Unit"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "qty",
+			"label": _("Qty"),
+			"fieldtype": "Float",
+			"width": 100
+		},
+		{
+			"fieldname": "amount",
+			"label": _("Accessable Value"),
+			"fieldtype": "Float",
+			"width": 120
+		},
+		{
+			"fieldname": "tax_rate",
+			"label": _("Tax Rate"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "cgst_amount",
+			"label": _("CGST Amount"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "sgst_amount",
+			"label": _("SGST Amount"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "igst_amount",
+			"label": _("IGST Amount"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "cess_amount",
+			"label": _("CESS Amount"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "transport_mode",
+			"label": _("Transport Mode"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "distance",
+			"label": _("Distance"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "transporter_name",
+			"label": _("Transporter Name"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "transporter_id",
+			"label": _("Transporter ID"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "lr_no",
+			"label": _("Transporter Doc No"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "lr_date",
+			"label": _("Transporter Date"),
+			"fieldtype": "Data",
+			"width": 120
+		},
+		{
+			"fieldname": "vehicle_no",
+			"label": _("Vehicle No"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+		{
+			"fieldname": "vehicle_type",
+			"label": _("Vehicle Type"),
+			"fieldtype": "Data",
+			"width": 100
+		},
+	]
+
+	return columns
\ No newline at end of file
diff --git a/erpnext/regional/report/gstr_2/gstr_2.py b/erpnext/regional/report/gstr_2/gstr_2.py
index 0a2e968..0605695 100644
--- a/erpnext/regional/report/gstr_2/gstr_2.py
+++ b/erpnext/regional/report/gstr_2/gstr_2.py
@@ -71,8 +71,6 @@
 			is_igst = True if d[1] in self.gst_accounts.igst_account else False
 			if is_igst and d[0] not in self.igst_invoices:
 				self.igst_invoices.append(d[0])
-			if is_igst:
-				break
 
 	def get_conditions(self):
 		conditions = ""
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index d3ca4f8..c6f8a66 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -3163,7 +3163,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2018-07-17 03:23:15.354674",
+ "modified": "2018-07-30 08:36:29.125285",
  "modified_by": "Administrator",
  "module": "Selling", 
  "name": "Quotation", 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 2669dd9..4124967 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -3917,7 +3917,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-07-06 18:16:01.516600", 
+ "modified": "2018-07-30 08:36:11.652659",
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 84c8286..4a4cc90 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1,2888 +1,2889 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:company_name",
- "beta": 0,
- "creation": "2013-04-10 08:35:39",
- "custom": 0,
- "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:company_name", 
+ "beta": 0, 
+ "creation": "2013-04-10 08:35:39", 
+ "custom": 0, 
+ "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "details",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "company_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Company",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "company_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 1
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "abbr", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Abbr", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "abbr", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "abbr",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Abbr",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "abbr",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")", 
+   "fieldname": "change_abbr", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Change Abbreviation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
-   "fieldname": "change_abbr",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Change Abbreviation",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "is_group",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Is Group",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_finance_book", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Finance Book", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Finance Book", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_finance_book",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Finance Book",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Finance Book",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "cb0",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "domain", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Domain", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Domain", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "domain",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Domain",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Domain",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Parent Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "parent_company",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Parent Comapny",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sales_settings",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Sales",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_monthly_history", 
+   "fieldtype": "Small Text", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Monthly History", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sales_monthly_history",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Sales Monthly History",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transactions_annual_history", 
+   "fieldtype": "Code", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transactions Annual History", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "transactions_annual_history",
-   "fieldtype": "Code",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Transactions Annual History",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "monthly_sales_target", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Monthly Sales Target", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "monthly_sales_target",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Monthly Sales Target",
-   "length": 0,
-   "no_copy": 0,
-   "options": "default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_goals", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_goals",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_monthly_sales", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Monthly Sales", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "total_monthly_sales",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Monthly Sales",
-   "length": 0,
-   "no_copy": 1,
-   "options": "default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "charts_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Values", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "charts_section",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Values",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_currency", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Currency", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_currency",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Currency",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_letter_head", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Letter Head", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Letter Head", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_letter_head",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Letter Head",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Letter Head",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_holiday_list", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Holiday List", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Holiday List", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_holiday_list",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Holiday List",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Holiday List",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_terms", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Terms", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Terms and Conditions", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_terms",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Terms",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Terms and Conditions",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "country", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Country", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Country", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "country",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Country",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Country",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "create_chart_of_accounts_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Create Chart Of Accounts Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nStandard Template\nExisting Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "create_chart_of_accounts_based_on",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Create Chart Of Accounts Based On",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nStandard Template\nExisting Company",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"", 
+   "fieldname": "chart_of_accounts", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Chart Of Accounts Template", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
-   "fieldname": "chart_of_accounts",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Chart Of Accounts Template",
-   "length": 0,
-   "no_copy": 1,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"", 
+   "fieldname": "existing_company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Existing Company ", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
-   "fieldname": "existing_company",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Existing Company ",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Company",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "tax_id", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Tax ID", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "tax_id",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Tax ID",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_establishment", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date of Establishment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "date_of_establishment",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Date of Establishment",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounts Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_settings",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Accounts Settings",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_bank_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Bank Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "default_bank_account", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_bank_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Bank Account",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "default_bank_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_cash_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Cash Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_cash_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Cash Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_receivable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Receivable Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "receivables_group", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_receivable_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Receivable Account",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "receivables_group",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "round_off_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Round Off Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "round_off_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Round Off Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "write_off_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Write Off Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "write_off_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Write Off Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "exchange_gain_loss_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Exchange Gain / Loss Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "exchange_gain_loss_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Exchange Gain / Loss Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "unrealized_exchange_gain_loss_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Unrealized Exchange Gain/Loss Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "unrealized_exchange_gain_loss_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Unrealized Exchange Gain/Loss Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_payable_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Payable Account",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "payables_group",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_payable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Payable Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "payables_group", 
+   "oldfieldtype": "Link", 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_employee_advance_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Employee Advance Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_employee_advance_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Employee Advance Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Cost of Goods Sold Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Cost of Goods Sold Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_income_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Income Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Income Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_deferred_revenue_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Deferred Revenue Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_deferred_revenue_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Deferred Revenue Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_payroll_payable_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Payroll Payable Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_payroll_payable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Payroll Payable Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "round_off_cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Round Off Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "round_off_cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Round Off Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_22",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_22", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Cost Center",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Cost Center", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_26",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_26", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "credit_limit",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Credit Limit",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "credit_limit",
-   "oldfieldtype": "Currency",
-   "options": "default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "credit_limit", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Credit Limit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "credit_limit", 
+   "oldfieldtype": "Currency", 
+   "options": "default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "payment_terms",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Payment Terms Template",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Payment Terms Template",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "payment_terms", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Payment Terms Template", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Payment Terms Template", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "auto_accounting_for_stock_settings",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock Settings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "auto_accounting_for_stock_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "fieldname": "enable_perpetual_inventory",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Enable Perpetual Inventory",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "enable_perpetual_inventory", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Enable Perpetual Inventory", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "default_inventory_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Default Inventory Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_inventory_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Inventory Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_adjustment_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock Adjustment Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_adjustment_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock Adjustment Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_32",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_32", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_received_but_not_billed",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock Received But Not Billed",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_received_but_not_billed", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock Received But Not Billed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "expenses_included_in_valuation",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Expenses Included In Valuation",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expenses_included_in_valuation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Expenses Included In Valuation", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "fixed_asset_depreciation_settings",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Fixed Asset Depreciation Settings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fixed_asset_depreciation_settings", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Fixed Asset Depreciation Settings", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "accumulated_depreciation_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Accumulated Depreciation Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accumulated_depreciation_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accumulated Depreciation Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "depreciation_expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Depreciation Expense Account",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depreciation_expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Depreciation Expense Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "series_for_depreciation_entry",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Series for Asset Depreciation Entry (Journal Entry)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "series_for_depreciation_entry", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Series for Asset Depreciation Entry (Journal Entry)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "expenses_included_in_asset_valuation",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Expenses Included In Asset Valuation",
-   "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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "expenses_included_in_asset_valuation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Expenses Included In Asset Valuation", 
+   "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, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_40",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_40", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "disposal_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Gain/Loss Account on Asset Disposal",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disposal_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Gain/Loss Account on Asset Disposal", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "depreciation_cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Asset Depreciation Cost Center",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "depreciation_cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Depreciation Cost Center", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "capital_work_in_progress_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Capital Work In Progress 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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "capital_work_in_progress_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Capital Work In Progress 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, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "asset_received_but_not_billed",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Asset Received But Not Billed",
-   "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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "asset_received_but_not_billed", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Asset Received But Not Billed", 
+   "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, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "budget_detail",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Budget Detail",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "budget_detail", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Budget Detail", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "exception_budget_approver_role",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Exception Budget Approver Role",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Role",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "exception_budget_approver_role", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Exception Budget Approver Role", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Role", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "For reference only.",
-   "fieldname": "company_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Company Info",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "For reference only.", 
+   "fieldname": "company_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company Info", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "date_of_incorporation",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Date of Incorporation",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_incorporation", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date of Incorporation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "address_html",
-   "fieldtype": "HTML",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.date_of_incorporation",
-   "fieldname": "date_of_commencement",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Date of Commencement",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.date_of_incorporation", 
+   "fieldname": "date_of_commencement", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date of Commencement", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "phone_no",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Phone No",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "phone_no",
-   "oldfieldtype": "Data",
-   "options": "Phone",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "phone_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Phone No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "phone_no", 
+   "oldfieldtype": "Data", 
+   "options": "Phone", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "fax",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Fax",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "fax",
-   "oldfieldtype": "Data",
-   "options": "Phone",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "fax", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Fax", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "fax", 
+   "oldfieldtype": "Data", 
+   "options": "Phone", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "email",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Email",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "email",
-   "oldfieldtype": "Data",
-   "options": "Email",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "email", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Email", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "email", 
+   "oldfieldtype": "Data", 
+   "options": "Email", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "website",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "website",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "website", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "website", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "registration_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "registration_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Section Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Company registration numbers for your reference. Tax numbers etc.",
-   "fieldname": "registration_details",
-   "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Registration Details",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "registration_details",
-   "oldfieldtype": "Code",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Company registration numbers for your reference. Tax numbers etc.", 
+   "fieldname": "registration_details", 
+   "fieldtype": "Code", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Registration Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "registration_details", 
+   "oldfieldtype": "Code", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "delete_company_transactions",
-   "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Delete Company Transactions",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "delete_company_transactions", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Delete Company Transactions", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "company_logo",
-   "fieldtype": "Attach Image",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Company Logo",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company_logo", 
+   "fieldtype": "Attach Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company Logo", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "lft",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Lft",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Lft", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "rgt",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Rgt",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rgt", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "old_parent",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "old_parent",
-   "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,
-   "translatable": 0,
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Data", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "old_parent", 
+   "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, 
+   "translatable": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-building",
- "idx": 1,
- "image_field": "company_logo",
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2018-06-21 20:05:09.457580",
- "modified_by": "Administrator",
- "module": "Setup",
- "name": "Company",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-building", 
+ "idx": 1, 
+ "image_field": "company_logo", 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2018-07-30 12:07:33.016473", 
+ "modified_by": "Administrator", 
+ "module": "Setup", 
+ "name": "Company", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 0,
-   "role": "Accounts User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Employee",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "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, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "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, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Stock User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Stock User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
-  },
+  }, 
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Projects User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Projects User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
    "write": 0
   }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 1,
- "sort_order": "ASC",
- "track_changes": 1,
- "track_seen": 0
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
+ "sort_order": "ASC", 
+ "track_changes": 1, 
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index 247445d..4d4c5ac 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -50,6 +50,11 @@
 					(select name from `tab{1}` where `{2}`=%s)""".format(df.options,
 						doctype, company_fieldname), company_name)
 
+		#delete version log
+		frappe.db.sql("""delete from `tabVersion` where ref_doctype=%s and docname in
+			(select name from `tab{0}` where `{1}`=%s)""".format(doctype,
+				company_fieldname), (doctype, company_name))
+
 		# delete parent
 		frappe.db.sql("""delete from `tab{0}`
 			where {1}= %s """.format(doctype, company_fieldname), company_name)
diff --git a/erpnext/setup/setup_wizard/operations/defaults_setup.py b/erpnext/setup/setup_wizard/operations/defaults_setup.py
index 3f69252..657905d 100644
--- a/erpnext/setup/setup_wizard/operations/defaults_setup.py
+++ b/erpnext/setup/setup_wizard/operations/defaults_setup.py
@@ -57,8 +57,8 @@
 
 	hr_settings = frappe.get_doc("HR Settings")
 	hr_settings.emp_created_by = "Naming Series"
-	hr_settings.leave_approval_notification_template = "Leave Approval Notification"
-	hr_settings.leave_status_notification_template = "Leave Status Notification"
+	hr_settings.leave_approval_notification_template = _("Leave Approval Notification")
+	hr_settings.leave_status_notification_template = _("Leave Status Notification")
 	hr_settings.save()
 
 def set_no_copy_fields_in_variant_settings():
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 7500240..59e6577 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -232,8 +232,6 @@
 		# Share Management
 		{"doctype": "Share Type", "title": _("Equity")},
 		{"doctype": "Share Type", "title": _("Preference")},
-
-
 	]
 
 	from erpnext.setup.setup_wizard.data.industry_type import get_industry_types
@@ -269,23 +267,30 @@
 	# add UOMs
 	uoms = json.loads(open(frappe.get_app_path("erpnext", "setup", "setup_wizard", "data", "uom_data.json")).read())
 	for d in uoms:
-		if not frappe.db.exists('UOM', d.get("uom_name")):
-			uom_doc = frappe.new_doc('UOM')
-			uom_doc.update(d)
-			uom_doc.save(ignore_permissions=True)
+		if not frappe.db.exists('UOM', _(d.get("uom_name"))):
+			uom_doc = frappe.get_doc({
+				"doctype": "UOM",
+				"uom_name": _(d.get("uom_name")),
+				"name": _(d.get("uom_name")),
+				"must_be_whole_number": d.get("must_be_whole_number")
+			}).insert(ignore_permissions=True)
 
 	# bootstrap uom conversion factors
 	uom_conversions = json.loads(open(frappe.get_app_path("erpnext", "setup", "setup_wizard", "data", "uom_conversion_data.json")).read())
 	for d in uom_conversions:
-		if not frappe.db.exists("UOM Category", d.get("category")):
+		if not frappe.db.exists("UOM Category", _(d.get("category"))):
 			frappe.get_doc({
 				"doctype": "UOM Category",
-				"category_name": d.get("category")
+				"category_name": _(d.get("category"))
 			}).insert(ignore_permissions=True)
 
-		uom_conversion = frappe.new_doc('UOM Conversion Factor')
-		uom_conversion.update(d)
-		uom_conversion.save(ignore_permissions=True)
+		uom_conversion = frappe.get_doc({
+			"doctype": "UOM Conversion Factor",
+			"category": _(d.get("category")),
+			"from_uom": _(d.get("from_uom")),
+			"to_uom": _(d.get("to_uom")),
+			"value": d.get("value")
+		}).insert(ignore_permissions=True)
 
 def make_fixture_records(records):
 	from frappe.modules import scrub
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index edd594a..157dbfe 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -166,6 +166,7 @@
 		frappe.call({
 			method: 'erpnext.stock.doctype.stock_entry.stock_entry_utils.make_stock_entry',
 			args: values,
+			freeze: true,
 			callback: function(r) {
 				frappe.show_alert(__('Stock Entry {0} created',
 					['<a href="#Form/Stock Entry/'+r.message.name+'">' + r.message.name+ '</a>']));
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 9d13657..ef0a317 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -251,8 +251,8 @@
 
 def get_batches(item_code, warehouse, qty=1, throw=False):
 	batches = frappe.db.sql(
-		'select batch_id, sum(actual_qty) as qty from `tabBatch` join `tabStock Ledger Entry` '
-		'on `tabBatch`.batch_id = `tabStock Ledger Entry`.batch_no '
+		'select batch_id, sum(actual_qty) as qty from `tabBatch` join `tabStock Ledger Entry` ignore index (item_code, warehouse) '
+		'on (`tabBatch`.batch_id = `tabStock Ledger Entry`.batch_no )'
 		'where `tabStock Ledger Entry`.item_code = %s and  `tabStock Ledger Entry`.warehouse = %s '
 		'and (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL)'
 		'group by batch_id '
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 5572baf..4a00728 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -2708,6 +2708,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "transporter", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transporter ID", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "transporter_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -2742,6 +2772,67 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "transport_mode", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Transport Mode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nRoad\nAir\nRail\nShip", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "distance", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Distance (KM)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break34", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -2773,6 +2864,67 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "vehicle_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Vehicle 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_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "vehicle_type", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Vehicle Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "\nRegular\nODC", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "lr_no", 
    "fieldtype": "Data", 
@@ -2783,7 +2935,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Vehicle No", 
+   "label": "Transporter Doc No", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "lr_no", 
@@ -2819,7 +2971,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Vehicle Dispatch Date", 
+   "label": "Transporter Date", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "lr_date", 
@@ -3290,36 +3442,36 @@
   }, 
   {
    "allow_bulk_edit": 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_global_search": 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,
+   "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_global_search": 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_bulk_edit": 0,
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -3881,7 +4033,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-07-17 03:03:35.035396",
+ "modified": "2018-07-30 08:36:00.841655",
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 51ccfcd..9ca788c 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -2356,6 +2356,38 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:!doc.disable_rounded_total", 
+   "fieldname": "rounded_total", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rounded Total", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "in_words", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -2386,6 +2418,36 @@
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disable_rounded_total", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disable Rounded Total", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "collapsible_depends_on": "terms", 
    "columns": 0, 
@@ -3105,69 +3167,69 @@
   }, 
   {
    "allow_bulk_edit": 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_global_search": 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,
+   "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_global_search": 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_bulk_edit": 0,
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "column_break_97",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "fieldname": "column_break_97", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "other_details", 
    "fieldtype": "HTML", 
    "hidden": 1, 
@@ -3436,7 +3498,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-07-17 02:59:59.609643",
+ "modified": "2018-07-30 08:35:37.895217",
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 085e87f..3c60896 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -131,3 +131,5 @@
 			add index posting_sort_index(posting_date, posting_time, name)""")
 
 	frappe.db.add_index("Stock Ledger Entry", ["voucher_no", "voucher_type"])
+	frappe.db.add_index("Stock Ledger Entry", ["batch_no", "item_code", "warehouse"])
+	
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 774803f..e6ca5c2 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -17,6 +17,11 @@
 	columns = get_columns()
 	items = get_items(filters)
 	sle = get_stock_ledger_entries(filters, items)
+
+	# if no stock ledger entry found return
+	if not sle:
+		return columns, []
+
 	iwb_map = get_item_warehouse_map(filters, sle)
 	item_map = get_item_details(items, sle, filters)
 	item_reorder_detail_map = get_item_reorder_details(item_map.keys())
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index fe46512..37caf47 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -225,9 +225,10 @@
 				tuple(serial_no))[0][0])
 
 		new_stock_qty = self.qty_after_transaction + actual_qty
+
 		if new_stock_qty > 0:
 			new_stock_value = (self.qty_after_transaction * self.valuation_rate) + stock_value_change
-			if new_stock_value > 0:
+			if new_stock_value >= 0:
 				# calculate new valuation rate only if stock value is positive
 				# else it remains the same as that of previous entry
 				self.valuation_rate = new_stock_value / new_stock_qty
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 77c59f4..d0a9bf3 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -1,9 +1,9 @@
 frappe.ui.form.on("Issue", {
-	"onload": function(frm) {
+	onload: function(frm) {
 		frm.email_field = "raised_by";
 	},
 
-	"refresh": function(frm) {
+	refresh: function(frm) {
 		if(frm.doc.status!=="Closed") {
 			frm.add_custom_button(__("Close"), function() {
 				frm.set_value("status", "Closed");
@@ -33,5 +33,39 @@
 					frappe.set_route('Form', 'Help Article', doc.name);
 				});
 		}
+
+		if (!frm.timeline.wrapper.find('.btn-split-issue').length) {
+			let split_issue = __("Split Issue")
+			$(`<button class="btn btn-xs btn-link btn-add-to-kb text-muted hidden-xs btn-split-issue pull-right" style="display:inline-block; margin-right: 15px">
+				${split_issue} 
+			</button>`)
+				.appendTo(frm.timeline.wrapper.find('.comment-header .asset-details:not([data-communication-type="Comment"])'))
+			if (!frm.timeline.wrapper.data("split-issue-event-attached")){
+				frm.timeline.wrapper.on('click', '.btn-split-issue', (e) => {
+					var dialog = new frappe.ui.Dialog({
+						title: __("Split Issue"),
+						fields: [
+							{fieldname: 'subject', fieldtype: 'Data', reqd:1, label: __('Subject'), description: __('All communications including and above this shall be moved into the new Issue')}
+						],
+						primary_action_label: __("Split"),
+						primary_action: function() {
+							frm.call("split_issue", {
+								subject: dialog.fields_dict.subject.value,
+								communication_id: e.currentTarget.closest(".timeline-item").getAttribute("data-name")
+							}, (r) => {
+								let url = window.location.href
+								let arr = url.split("/");
+								let result = arr[0] + "//" + arr[2]
+								frappe.msgprint(`New issue created: <a href="${result}/desk#Form/Issue/${r.message}">${r.message}</a>`)
+								frm.reload_doc();
+								dialog.hide();
+							});
+						}
+					});
+					dialog.show()
+				})
+				frm.timeline.wrapper.data("split-issue-event-attached", true)
+			}
+		}
 	}
 });
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 43cfd3f..153a4c1 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -81,6 +81,22 @@
 
 		self.db_set("description", "")
 
+	def split_issue(self, subject, communication_id):
+		# Bug: Pressing enter doesn't send subject
+		from copy import deepcopy
+		replicated_issue = deepcopy(self)
+		replicated_issue.subject = subject
+		frappe.get_doc(replicated_issue).insert()
+		# Replicate linked Communications
+		# todo get all communications in timeline before this, and modify them to append them to new doc
+		comm_to_split_from = frappe.get_doc("Communication", communication_id)
+		communications = frappe.get_all("Communication", filters={"reference_name": 'ISS-00001', "reference_doctype": "Issue", "creation": ('>=', comm_to_split_from.creation)})
+		for communication in communications:
+			doc = frappe.get_doc("Communication", communication.name)
+			doc.reference_name = replicated_issue.name
+			doc.save()
+		return replicated_issue.name
+
 def get_list_context(context=None):
 	return {
 		"title": _("Issues"),
@@ -135,7 +151,10 @@
 		set_status(name, status)
 
 def has_website_permission(doc, ptype, user, verbose=False):
-	return doc.raised_by==user
+	from erpnext.controllers.website_list_for_contact import has_website_permission
+	permission_based_on_customer = has_website_permission(doc, ptype, user, verbose)
+
+	return permission_based_on_customer or doc.raised_by==user
 
 
 def update_issue(contact, method):
diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json
index a8c7ab9..6d89d11 100644
--- a/erpnext/support/web_form/issues/issues.json
+++ b/erpnext/support/web_form/issues/issues.json
@@ -18,7 +18,7 @@
  "is_standard": 1, 
  "login_required": 1, 
  "max_attachment_size": 0, 
- "modified": "2018-05-07 05:54:22.213127", 
+ "modified": "2018-07-20 13:08:43.797886", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "issues", 
@@ -85,6 +85,18 @@
    "reqd": 0
   }, 
   {
+   "default": "Medium", 
+   "fieldname": "priority", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "label": "Priority", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "Low\nMedium\nHigh", 
+   "read_only": 0, 
+   "reqd": 1
+  }, 
+  {
    "default": "1", 
    "fieldname": "via_customer_portal", 
    "fieldtype": "Check", 
diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html
index eb5c0a4..637fde2 100644
--- a/erpnext/templates/includes/issue_row.html
+++ b/erpnext/templates/includes/issue_row.html
@@ -5,12 +5,29 @@
             <span class="indicator {{ "red" if doc.status=="Open" else "darkgrey"   }}">
                 {{ doc.name }}</span>
 				   </div>
-                <div class="col-xs-6 items-preview ellipsis ellipsis-width">
-                    {{ doc.subject }}</div>
-
+                <div class="col-xs-5 items-preview ellipsis ellipsis-width">
+					{{ doc.subject }}</div>
+					<div class="col-xs-2 text-muted">
+						<span class="indicator
+							{% if doc.status == "Open" %}
+								{% if doc.priority == "Medium" %}
+									orange"> Medium
+								{% elif doc.priority == "Low" %}
+									yellow"> Low
+								{% else %}
+									red"> High
+								{% endif  %}
+							{% elif doc.status == "Closed" %}
+								green"> Closed
+							{% else %}
+								darkgrey"> {{ doc.status }}
+							{% endif %}
+						</span>
+					</div>
         <div class="col-xs-3 text-right small text-muted">
             {{ frappe.format_date(doc.modified) }}
         </div>
     </div>
     </a>
 </div>
+ 
\ No newline at end of file
diff --git a/erpnext/templates/pages/integrations/gocardless_checkout.html b/erpnext/templates/pages/integrations/gocardless_checkout.html
index eb124ca..7193d75 100644
--- a/erpnext/templates/pages/integrations/gocardless_checkout.html
+++ b/erpnext/templates/pages/integrations/gocardless_checkout.html
@@ -9,8 +9,8 @@
 {% endblock %}
 
 {%- block page_content -%}
-<p class='lead text-center centered'>
+<p class='lead text-center'>
 	<span class='gocardless-loading'>{{ _("Loading Payment System") }}</span>
 </p>
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/integrations/gocardless_checkout.py b/erpnext/templates/pages/integrations/gocardless_checkout.py
index 3c2466e..2ba7001 100644
--- a/erpnext/templates/pages/integrations/gocardless_checkout.py
+++ b/erpnext/templates/pages/integrations/gocardless_checkout.py
@@ -73,4 +73,4 @@
 
 	except Exception as e:
 		frappe.log_error(e, "GoCardless Payment Error")
-		return {"redirect_to": '/integrations/payment-failed'}
+		return {"redirect_to": '/integrations/payment-failed'}
\ No newline at end of file
diff --git a/erpnext/templates/pages/integrations/gocardless_confirmation.html b/erpnext/templates/pages/integrations/gocardless_confirmation.html
index 1baf23b..6ba154a 100644
--- a/erpnext/templates/pages/integrations/gocardless_confirmation.html
+++ b/erpnext/templates/pages/integrations/gocardless_confirmation.html
@@ -9,8 +9,8 @@
 {% endblock %}
 
 {%- block page_content -%}
-<p class='lead text-center centered'>
+<p class='lead text-center'>
 	<span class='gocardless-loading'>{{ _("Payment Confirmation") }}</span>
 </p>
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/integrations/gocardless_confirmation.py b/erpnext/templates/pages/integrations/gocardless_confirmation.py
index fc564c3..697ed3c 100644
--- a/erpnext/templates/pages/integrations/gocardless_confirmation.py
+++ b/erpnext/templates/pages/integrations/gocardless_confirmation.py
@@ -36,10 +36,15 @@
 				"session_token": frappe.session.user
 		})
 
+		confirmation_url = redirect_flow.confirmation_url
+		gocardless_success_page = frappe.get_hooks('gocardless_success_page')
+		if gocardless_success_page:
+			confirmation_url = frappe.get_attr(gocardless_success_page[-1])(reference_doctype, reference_docname)
+
 		data = {
 			"mandate": redirect_flow.links.mandate,
 			"customer": redirect_flow.links.customer,
-			"redirect_to": redirect_flow.confirmation_url,
+			"redirect_to": confirmation_url,
 			"redirect_message": "Mandate successfully created",
 			"reference_doctype": reference_doctype,
 			"reference_docname": reference_docname
@@ -53,7 +58,7 @@
 		gateway_controller = get_gateway_controller(reference_docname)
 		frappe.get_doc("GoCardless Settings", gateway_controller).create_payment_request(data)
 
-		return {"redirect_to": redirect_flow.confirmation_url}
+		return {"redirect_to": confirmation_url}
 
 	except Exception as e:
 		frappe.log_error(e, "GoCardless Payment Error")
@@ -82,4 +87,4 @@
 			}).insert(ignore_permissions=True)
 
 		except Exception:
-			frappe.log_error(frappe.get_traceback())
+			frappe.log_error(frappe.get_traceback())
\ No newline at end of file
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index cccccc6..7a37ee1 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -1,45 +1,45 @@
 DocType: Accounting Period,Period Name,期间名称
-DocType: Employee,Salary Mode,薪酬模式
+DocType: Employee,Salary Mode,工资发放方式
 DocType: Patient,Divorced,离异
 DocType: Support Settings,Post Route Key,邮政路线密钥
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,允许一个交易中存在相同物料
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,取消此保修要求之前请先取消物料访问{0}
-apps/erpnext/erpnext/config/education.py +118,Assessment Reports,评估报告
+apps/erpnext/erpnext/config/education.py +118,Assessment Reports,评估报表
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +19,Consumer Products,消费类产品
 DocType: Supplier Scorecard,Notify Supplier,通知供应商
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +52,Please select Party Type first,请先选择往来单位
 DocType: Item,Customer Items,客户物料
 DocType: Project,Costing and Billing,成本核算和计费
-apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +43,Advance account currency should be same as company currency {0},预付帐户货币应与公司货币{0}相同
+apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +43,Advance account currency should be same as company currency {0},预付科目货币应与公司货币{0}相同
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: Parent account {1} can not be a ledger,科目{0}的上级科目{1}不能是分类账
 DocType: Item,Publish Item to hub.erpnext.com,发布项目hub.erpnext.com
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +278,Cannot find active Leave Period,找不到有效的休假期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +278,Cannot find active Leave Period,找不到有效的休假期间
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,评估
 DocType: Item,Default Unit of Measure,默认计量单位
 DocType: SMS Center,All Sales Partner Contact,所有的销售合作伙伴联系人
-DocType: Department,Leave Approvers,假期审批人
-DocType: Employee,Bio / Cover Letter,生物/求职信
+DocType: Department,Leave Approvers,休假审批人
+DocType: Employee,Bio / Cover Letter,履历/求职信
 DocType: Work Order,WO-,WO-
 DocType: Consultation,Investigations,调查
 DocType: Restaurant Order Entry,Click Enter To Add,点击输入要添加
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +29,"Missing value for Password, API Key or Shopify URL",缺少密码，API密钥或Shopify网址的值
 DocType: Employee,Rented,租
 DocType: Purchase Order,PO-,PO-
-apps/erpnext/erpnext/public/js/setup_wizard.js +231,All Accounts,所有帐户
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,无法转移状态为左的员工
+apps/erpnext/erpnext/public/js/setup_wizard.js +231,All Accounts,所有科目
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +15,Cannot transfer Employee with status Left,状态为已离职的员工不能进行调动
 DocType: Vehicle Service,Mileage,里程
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +309,Do you really want to scrap this asset?,难道你真的想放弃这项资产？
 DocType: Drug Prescription,Update Schedule,更新时间排程
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,选择默认供应商
 DocType: Exchange Rate Revaluation Account,New Exchange Rate,新汇率
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},价格表{0}需要制定货币
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},价格清单{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
 DocType: Purchase Order,Customer Contact,客户联系
 DocType: Patient Appointment,Check availability,检查可用性
 DocType: Retention Bonus,Bonus Payment Date,奖金支付日期
 DocType: Employee,Job Applicant,求职者
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,这是基于对这种供应商的交易。详情请参阅以下时间表
-DocType: Manufacturing Settings,Overproduction Percentage For Work Order,工作订单的生产率过高百分比
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,本统计基于该供应商的过往交易。详情请参阅表单下方的时间线记录
+DocType: Manufacturing Settings,Overproduction Percentage For Work Order,最大允许超订单量入库百分比
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +327,Legal,法律
 DocType: Shopify Settings,Sales Order Series,销售订单系列
 apps/erpnext/erpnext/hr/utils.py +221,"More than one selection for {0} not \
@@ -48,8 +48,8 @@
 DocType: Allowed To Transact With,Allowed To Transact With,允许与
 DocType: Bank Guarantee,Customer,客户
 DocType: Purchase Receipt Item,Required By,必选
-DocType: Delivery Note,Return Against Delivery Note,射向送货单
-DocType: Asset Category,Finance Book Detail,财务图书细节
+DocType: Delivery Note,Return Against Delivery Note,基于销售出货单退货
+DocType: Asset Category,Finance Book Detail,账簿信息
 DocType: Purchase Order,% Billed,% 已记账
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +41,Exchange Rate must be same as {0} {1} ({2}),汇率必须一致{0} {1}（{2}）
 DocType: Employee Tax Exemption Declaration,HRA Exemption,HRA豁免
@@ -60,45 +60,45 @@
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,会计分录和维护余额操作针对的组(头)
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),未付{0}不能小于零（ {1} ）
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
-DocType: Leave Type,Leave Type Name,假期类型名称
+DocType: Leave Type,Leave Type Name,休假类型名称
 apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公开显示
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +156,Series Updated Successfully,系列已成功更新
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +6,Checkout,查看
 apps/erpnext/erpnext/controllers/accounts_controller.py +742,{0} in row {1},{1}行中的{0}
 DocType: Asset Finance Book,Depreciation Start Date,折旧开始日期
 DocType: Pricing Rule,Apply On,应用于
-DocType: Item Price,Multiple Item prices.,多个品目的价格。
-,Purchase Order Items To Be Received,采购订单项目可收
+DocType: Item Price,Multiple Item prices.,多个物料的价格。
+,Purchase Order Items To Be Received,待收货采购订单项
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
 DocType: Support Settings,Support Settings,支持设置
 apps/erpnext/erpnext/projects/doctype/project/project.py +76,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
 apps/erpnext/erpnext/utilities/transaction_base.py +115,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必须与{1}：{2}（{3} / {4}）
-,Batch Item Expiry Status,批处理项到期状态
+,Batch Item Expiry Status,物料批号到期状态
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +160,Bank Draft,银行汇票
-DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
+DocType: Mode of Payment Account,Mode of Payment Account,付款方式默认科目
 DocType: Consultation,Consultation,会诊
-DocType: Accounts Settings,Show Payment Schedule in Print,在打印中显示付款时间表
+DocType: Accounts Settings,Show Payment Schedule in Print,在打印中显示付款工时单
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +21,Sales and Returns,销售和退货
 apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,显示变体
 DocType: Academic Term,Academic Term,学期
 DocType: Employee Tax Exemption Sub Category,Employee Tax Exemption Sub Category,员工免税子类别
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +71,Making website,制作网站
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +71,Making website,创建网站
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +58,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of benefit application pro-rata component\
-			amount and previous claimed amount",员工{0}的最高福利超过{1}，福利应用程序按比例分量\金额和上次索赔金额的总和{2}
+			amount and previous claimed amount",员工{0}的福利已超过{1}，按有效天数折算的可用福利扣减已申报金额的总和{2}
 DocType: Opening Invoice Creation Tool Item,Quantity,数量
 ,Customers Without Any Sales Transactions,没有任何销售交易的客户
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +585,Accounts table cannot be blank.,账表不能为空。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Loans (Liabilities),借款（负债）
 DocType: Staffing Plan Detail,Total Estimated Cost,预计总成本
-DocType: Employee Education,Year of Passing,按年排序
+DocType: Employee Education,Year of Passing,年份
 DocType: Item,Country of Origin,原产国
 DocType: Soil Texture,Soil Texture Criteria,土壤质地标准
 apps/erpnext/erpnext/templates/includes/product_page.js +34,In Stock,库存
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品代码&gt;商品分组&gt;品牌
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,物料代码&gt;物料组&gt;品牌
 apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +16,Primary Contact Details,主要联系方式
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,开放式问题
-DocType: Production Plan Item,Production Plan Item,生产计划项目
+DocType: Production Plan Item,Production Plan Item,生产计划项
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +159,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
 DocType: Lab Test Groups,Add new line,添加新行
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +31,Health Care,医疗保健
@@ -110,7 +110,7 @@
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +951,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
 DocType: Bank Statement Transaction Invoice Item,Invoice,发票
-DocType: Purchase Invoice Item,Item Weight Details,项目重量细节
+DocType: Purchase Invoice Item,Item Weight Details,物料重量
 DocType: Asset Maintenance Log,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
 DocType: Crop Cycle,The minimum distance between rows of plants for optimum growth,植株之间的最小距离，以获得最佳生长
@@ -121,43 +121,43 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +78,Row # {0}:,行＃{0}：
 DocType: Timesheet,Total Costing Amount,总成本计算金额
 DocType: Delivery Note,Vehicle No,车辆编号
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,请选择价格表
-DocType: Accounts Settings,Currency Exchange Settings,货币兑换设置
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +163,Please select Price List,请选择价格清单
+DocType: Accounts Settings,Currency Exchange Settings,外币汇率设置
 apps/erpnext/erpnext/public/js/hub/hub_factory.js +70,Please check your network connection.,请检查您的网络连接。
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款单据才能完成trasaction
 DocType: Work Order Operation,Work In Progress,在制品
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +13,Please select date,请选择日期
-DocType: Finance Book,Finance Book,金融书
+DocType: Finance Book,Finance Book,账簿
 DocType: Daily Work Summary Group,Holiday List,假期列表
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +115,Accountant,会计
-DocType: Hub Settings,Selling Price List,卖价格表
+DocType: Hub Settings,Selling Price List,销售价格清单
 DocType: Patient,Tobacco Current Use,烟草当前使用
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,卖出率
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +62,Selling Rate,销售价
 DocType: Cost Center,Stock User,库存用户
 DocType: Soil Analysis,(Ca+Mg)/K,（钙+镁）/ K
 DocType: Company,Phone No,电话号码
 DocType: Delivery Trip,Initial Email Notification Sent,初始电子邮件通知已发送
-DocType: Bank Statement Settings,Statement Header Mapping,声明标题映射
+DocType: Bank Statement Settings,Statement Header Mapping,对帐单抬头对照关系
 ,Sales Partners Commission,销售合作伙伴佣金
 DocType: Soil Texture,Sandy Clay Loam,桑迪粘土壤土
 DocType: Purchase Invoice,Rounding Adjustment,舍入调整
 apps/erpnext/erpnext/setup/doctype/company/company.py +50,Abbreviation cannot have more than 5 characters,缩写不能超过5个字符
-DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,医师计划时间表
-DocType: Payment Request,Payment Request,付款请求
+DocType: Physician Schedule Time Slot,Physician Schedule Time Slot,医师计划工时单
+DocType: Payment Request,Payment Request,付款申请
 DocType: Asset,Value After Depreciation,折旧后
 DocType: Student,O+,O +
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py +8,Related,有关
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,考勤日期不得少于员工的加盟日期
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +46,Attendance date can not be less than employee's joining date,考勤日期不得早于员工入职日期
 DocType: Grading Scale,Grading Scale Name,分级标准名称
-apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,这是一个root帐户，不能被编辑。
+apps/erpnext/erpnext/accounts/doctype/account/account.js +37,This is a root account and cannot be edited.,这是一个顶层（根）科目，不能被编辑。
 DocType: Sales Invoice,Company Address,公司地址
 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: Subscription,Subscription Start Date,订阅开始日期
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有两列，一为旧名称，一个用于新名称
-apps/erpnext/erpnext/accounts/utils.py +74,{0} {1} not in any active Fiscal Year.,{0} {1} 没有在任何活动的财政年度中。
-DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，商品编号：{1}和顾客：{2}
+apps/erpnext/erpnext/accounts/utils.py +74,{0} {1} not in any active Fiscal Year.,{0} {1} 不在任一激活的财务年度中。
+DocType: Packed Item,Parent Detail docname,上级物料名
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，物料代号：{1}和顾客：{2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +356,{0} {1} is not present in the parent company,母公司中不存在{0} {1}
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +221,Trial Period End Date Cannot be before Trial Period Start Date,试用期结束日期不能在试用期开始日期之前
 apps/erpnext/erpnext/utilities/user_progress.py +146,Kg,千克
@@ -169,18 +169,18 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +74,Timespan,时间跨度
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Warehouse...,选择仓库...
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +6,Advertising,广告
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,公司代码在另一行已输入过，重复了
 DocType: Patient,Married,已婚
 apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允许{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Get items from,从获取物料
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +598,Get items from,从...获取物料
 DocType: Price List,Price Not UOM Dependant,价格不依赖于UOM
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +494,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +494,Stock cannot be updated against Delivery Note {0},销售出货单{0}不能更新库存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
-apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,没有列出项目
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,没有物料
 DocType: Asset Repair,Error Description,错误说明
 DocType: Payment Reconciliation,Reconcile,核消（对帐）
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +30,Grocery,杂货
-DocType: Quality Inspection Reading,Reading 1,阅读1
+DocType: Quality Inspection Reading,Reading 1,检验结果1
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +40,Pension Funds,养老基金
 DocType: Exchange Rate Revaluation Account,Gain/Loss,收益/损失
 DocType: Crop,Perennial,多年生
@@ -189,50 +189,50 @@
 DocType: Accounts Settings,Use Custom Cash Flow Format,使用自定义现金流量格式
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月，如果你在你的业务有季节性。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1765,Not items found,未找到项目
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +255,Salary Structure Missing,薪酬结构缺失
-DocType: Lead,Person Name,人姓名
-DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1765,Not items found,未找到物料
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +255,Salary Structure Missing,未分配薪资结构
+DocType: Lead,Person Name,姓名
+DocType: Sales Invoice Item,Sales Invoice Item,销售发票物料
 DocType: Account,Credit,贷方
-DocType: POS Profile,Write Off Cost Center,核销成本中心
+DocType: POS Profile,Write Off Cost Center,销帐成本中心
 apps/erpnext/erpnext/public/js/setup_wizard.js +117,"e.g. ""Primary School"" or ""University""",如“小学”或“大学”
-apps/erpnext/erpnext/config/stock.py +28,Stock Reports,库存报告
+apps/erpnext/erpnext/config/stock.py +28,Stock Reports,库存报表
 DocType: Warehouse,Warehouse Detail,仓库详细信息
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,该期限结束日期不能晚于学年年终日期到这个词联系在一起（学年{}）。请更正日期，然后再试一次。
 apps/erpnext/erpnext/stock/doctype/item/item.py +285,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
 DocType: Delivery Trip,Departure Time,出发时间
 DocType: Vehicle Service,Brake Oil,刹车油
 DocType: Tax Rule,Tax Type,税收类型
-,Completed Work Orders,完成的工作订单
+,Completed Work Orders,完成的工单
 DocType: Support Settings,Forum Posts,论坛帖子
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +598,Taxable Amount,应税金额
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
-DocType: Leave Policy,Leave Policy Details,退出政策详情
-DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
+DocType: Leave Policy,Leave Policy Details,休假政策信息
+DocType: BOM,Item Image (if not slideshow),物料图片(如果没有轮播图片)
 DocType: Work Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：参考文档类型必须是费用索赔或日记帐分录之一
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1105,Row #{0}: Reference Document Type must be one of Expense Claim or Journal Entry,行＃{0}：参考文档类型必须是费用报销或手工凭证之一
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1022,Select BOM,选择BOM
 DocType: SMS Log,SMS Log,短信日志
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付品目成本
+apps/erpnext/erpnext/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 +39,The holiday on {0} is not between From Date and To Date,在{0}这个节日之间没有从日期和结束日期
 DocType: Student Log,Student Log,学生登录
 apps/erpnext/erpnext/config/buying.py +165,Templates of supplier standings.,供应商榜单。
 DocType: Lead,Interested,有兴趣
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +236,Opening,开盘
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +236,Opening,开帐
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +33,From {0} to {1},从{0}至 {1}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +234,Program: ,程序：
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +50,Failed to setup taxes,无法设置税收
-DocType: Item,Copy From Item Group,从品目组复制
+DocType: Item,Copy From Item Group,从物料组复制
 DocType: Delivery Trip,Delivery Notification,送达通知
-DocType: Journal Entry,Opening Entry,开放报名
+DocType: Journal Entry,Opening Entry,开帐凭证
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,账户仅用于支付
 DocType: Loan,Repay Over Number of Periods,偿还期的超过数
 DocType: Stock Entry,Additional Costs,额外费用
 apps/erpnext/erpnext/accounts/doctype/account/account.py +140,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
 DocType: Lead,Product Enquiry,产品查询
 DocType: Education Settings,Validate Batch for Students in Student Group,验证学生组学生的批次
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +38,No leave record found for employee {0} for {1},未找到员工的假期记录{0} {1}
-DocType: Company,Unrealized Exchange Gain/Loss Account,未实现的汇兑收益/损失账户
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +38,No leave record found for employee {0} for {1},未找到员工的休假记录{0} {1}
+DocType: Company,Unrealized Exchange Gain/Loss Account,未实现汇兑损益科目
 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 +426,Please select Company first,请首先选择公司
 DocType: Employee Education,Under Graduate,本科
@@ -241,7 +241,7 @@
 DocType: BOM,Total Cost,总成本
 DocType: Soil Analysis,Ca/K,钙/ K
 DocType: Salary Slip,Employee Loan,员工贷款
-DocType: Fee Schedule,Send Payment Request Email,发送付款请求电子邮件
+DocType: Fee Schedule,Send Payment Request Email,发送付款申请电子邮件
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +268,Item {0} does not exist in the system or has expired,物料{0}不存在于系统中或已过期
 DocType: Supplier,Leave blank if the Supplier is blocked indefinitely,如果供应商被无限期封锁，请留空
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +44,Real Estate,房地产
@@ -249,7 +249,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +41,Pharmaceuticals,制药
 DocType: Purchase Invoice Item,Is Fixed Asset,是固定的资产
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +317,"Available qty is {0}, you need {1}",可用数量：{0}，需要：{1}
-DocType: Expense Claim Detail,Claim Amount,报销金额
+DocType: Expense Claim Detail,Claim Amount,申报金额
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +716,Work Order has been {0},工单已{0}
 DocType: Budget,Applicable on Purchase Order,适用于采购订单
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +56,Duplicate customer group found in the cutomer group table,在CUTOMER组表中找到重复的客户群
@@ -260,7 +260,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +71,Consumable,耗材
 DocType: Student,B-,B-
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +140,Successfully unregistered.,成功注销。
-DocType: Assessment Result,Grade,年级
+DocType: Assessment Result,Grade,职级
 DocType: Restaurant Table,No of Seats,座位数
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: Asset Maintenance Task,Asset Maintenance Task,资产维护任务
@@ -275,57 +275,57 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +111,Select Target Warehouse,选择目标仓库
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +87,Please enter Preferred Contact Email,请输入首选电子邮件联系
 DocType: Journal Entry,Contra Entry,对销分录
-DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
+DocType: Journal Entry Account,Credit in Company Currency,基于公司本货的信用额度
 DocType: Lab Test UOM,Lab Test UOM,实验室测试UOM
 DocType: Delivery Note,Installation Status,安装状态
 DocType: BOM,Quality Inspection Template,质量检验模板
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +135,"Do you want to update attendance?<br>Present: {0}\
-					<br>Absent: {1}",你想更新考勤？ <br>现任：{0} \ <br>缺席：{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +404,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量须等于条目{0}的已接收数量
+					<br>Absent: {1}",你想更新考勤？ <br>出勤：{0} \ <br>缺勤：{1}
+apps/erpnext/erpnext/controllers/buying_controller.py +404,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: Item,Supply Raw Materials for Purchase,采购时提供原材料给供应商
 DocType: Agriculture Analysis Criteria,Fertilizer,肥料
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +171,At least one mode of payment is required for POS invoice.,需要为POS发票定义至少付款模式
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,银行对账单交易发票项目
 DocType: Products Settings,Show Products as a List,产品展示作为一个列表
-DocType: Salary Detail,Tax on flexible benefit,对灵活福利征税
+DocType: Salary Detail,Tax on flexible benefit,弹性福利计税
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py +102,Item {0} is not active or end of life has been reached,物料{0}处于非活动或寿命终止状态
 DocType: Student Admission Program,Minimum Age,最低年龄
 apps/erpnext/erpnext/utilities/user_progress.py +190,Example: Basic Mathematics,例如：基础数学
 DocType: Customer,Primary Address,主要地址
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +39,Diff Qty,差异数量
-DocType: Production Plan,Material Request Detail,材料请求详情
+DocType: Production Plan,Material Request Detail,物料申请信息
 DocType: Selling Settings,Default Quotation Validity Days,默认报价有效天数
 apps/erpnext/erpnext/controllers/accounts_controller.py +835,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括税款，行{0}项率，税收行{1}也必须包括在内
 DocType: SMS Center,SMS Center,短信中心
-DocType: Payroll Entry,Validate Attendance,验证出席
-DocType: Sales Invoice,Change Amount,涨跌额
+DocType: Payroll Entry,Validate Attendance,验证考勤
+DocType: Sales Invoice,Change Amount,找零
 DocType: Party Tax Withholding Config,Certificate Received,已收到证书
 DocType: GST Settings,Set Invoice Value for B2C. B2CL and B2CS calculated based on this invoice value.,设置B2C的发票值。 B2CL和B2CS根据此发票值计算。
 DocType: BOM Update Tool,New BOM,新建物料清单
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +241,Prescribed Procedures,规定程序
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +36,Show only POS,只显示POS
-DocType: Supplier Group,Supplier Group Name,供应商集团名称
+DocType: Supplier Group,Supplier Group Name,供应商群组名称
 DocType: Driver,Driving License Categories,驾驶执照类别
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +120,Please enter Delivery Date,请输入交货日期
-DocType: Depreciation Schedule,Make Depreciation Entry,计提折旧进入
+DocType: Depreciation Schedule,Make Depreciation Entry,创建计算折旧凭证
 DocType: Closed Document,Closed Document,封闭文件
 DocType: HR Settings,Leave Settings,保留设置
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.js +76,Number of positions cannot be less then current count of employees,职位数量不能少于当前员工人数
 DocType: Appraisal Template Goal,KRA,KRA
-DocType: Lead,Request Type,请求类型
-DocType: Purpose of Travel,Purpose of Travel,旅行目的
+DocType: Lead,Request Type,需求类型
+DocType: Purpose of Travel,Purpose of Travel,出差目的
 DocType: Payroll Period,Payroll Periods,工资期间
-apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,使员工
+apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.js +17,Make Employee,创建员工
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +14,Broadcasting,广播
 apps/erpnext/erpnext/config/accounts.py +319,Setup mode of POS (Online / Offline),POS（在线/离线）的设置模式
-DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,禁止根据工作订单创建时间日志。不得根据工作指令跟踪操作
+DocType: Manufacturing Settings,Disables creation of time logs against Work Orders. Operations shall not be tracked against Work Order,禁止根据工单创建时间日志。不得根据工作指令跟踪操作
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +167,Execution,执行
-apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,生产操作详情。
+apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,生产操作信息。
 DocType: Asset Maintenance Log,Maintenance Status,维护状态
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +10,Membership Details,会员资格
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：供应商对于应付账款科目来说是必输的{2}
-apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,项目和定价
+apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,物料和定价
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},总时间：{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
 DocType: Drug Prescription,Interval,间隔
@@ -343,20 +343,20 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,财务报表
 DocType: Guardian,Students,学生们
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,规则适用的定价和折扣。
-DocType: Daily Work Summary,Daily Work Summary Group,日常工作总结小组
+DocType: Daily Work Summary,Daily Work Summary Group,每日工作总结组
 DocType: Physician Schedule,Time Slots,时隙
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,房产价格必须适用于购买或出售
-DocType: Shift Assignment,Shift Request,移位请求
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},项目{0}的安装日期不能早于交付日期
-DocType: Pricing Rule,Discount on Price List Rate (%),折扣价目表率（％）
-apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,项目模板
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,房产价格必须适用于采购或出售
+DocType: Shift Assignment,Shift Request,工作班别申请
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},物料{0}的安装日期不能早于交付日期
+DocType: Pricing Rule,Discount on Price List Rate (%),基于价格清单价格的折扣（％）
+apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +112,Item Template,物料模板
 apps/erpnext/erpnext/healthcare/setup.py +216,Biochemistry,生物化学
 DocType: Job Offer,Select Terms and Conditions,选择条款和条件
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +74,Out Value,输出值
-DocType: Bank Statement Settings Item,Bank Statement Settings Item,银行对账单设置项目
+DocType: Bank Statement Settings Item,Bank Statement Settings Item,银行对账单设置项
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce设置
 DocType: Production Plan,Sales Orders,销售订单
-DocType: Purchase Taxes and Charges,Valuation,估值
+DocType: Purchase Taxes and Charges,Valuation,库存评估价
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +436,Set as Default,设置为默认
 DocType: Production Plan,PLN-,PLN-
 ,Purchase Order Trends,采购订单趋势
@@ -368,25 +368,25 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +319,Insufficient Stock,库存不足
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用容量规划和时间跟踪
 DocType: Email Digest,New Sales Orders,新建销售订单
-DocType: Bank Account,Bank Account,银行帐户
+DocType: Bank Account,Bank Account,银行科目
 DocType: Travel Itinerary,Check-out Date,离开日期
 DocType: Leave Type,Allow Negative Balance,允许负余额
-apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',您不能删除项目类型“外部”
-apps/erpnext/erpnext/public/js/utils.js +214,Select Alternate Item,选择备用项目
+apps/erpnext/erpnext/projects/doctype/project_type/project_type.py +13,You cannot delete Project Type 'External',您不能删除“外部”类型的项目
+apps/erpnext/erpnext/public/js/utils.js +214,Select Alternate Item,选择替代物料
 DocType: Employee,Create User,创建用户
 DocType: Selling Settings,Default Territory,默认地区
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +53,Television,电视
 DocType: Work Order Operation,Updated via 'Time Log',通过“时间日志”更新
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +13,Select the customer or supplier.,选择客户或供应商。
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +444,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +444,Advance amount cannot be greater than {0} {1},预付金额不能大于{0} {1}
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +55,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",时隙滑动，时隙{0}到{1}与现有时隙{2}重叠到{3}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
-DocType: Company,Enable Perpetual Inventory,启用永久库存
-DocType: Bank Guarantee,Charges Incurred,收费发生
-DocType: Company,Default Payroll Payable Account,默认情况下，应付职工薪酬帐户
+DocType: Company,Enable Perpetual Inventory,启用永续库存功能（每次库存移动实时生成会计凭证）
+DocType: Bank Guarantee,Charges Incurred,产生的费用
+DocType: Company,Default Payroll Payable Account,默认应付职工薪资科目
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +51,Update Email Group,更新电子邮件组
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
-DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ",如果取消选中，该项目不会出现在销售发票中，但可用于创建组测试。
+DocType: Lab Test Template,"If unchecked, the item wont be appear in Sales Invoice, but can be used in group test creation. ",如果不勾选，该物料不会出现在销售发票中，但可用于创建组测试。
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
 DocType: Course Schedule,Instructor Name,导师姓名
 DocType: Company,Arrear Component,欠费组件
@@ -395,19 +395,19 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
 DocType: Codification Table,Medical Code,医疗法
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +20,Please enter Company,你不能输入行没有。大于或等于当前行没有。这种充电式
-DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
+DocType: Delivery Note Item,Against Sales Invoice Item,销售发票项
 DocType: Agriculture Analysis Criteria,Linked Doctype,链接的文档类型
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Cash from Financing,从融资净现金
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2383,"LocalStorage is full , did not save",localStorage的满了，没救
 DocType: Lead,Address & Contact,地址及联系方式
-DocType: Leave Allocation,Add unused leaves from previous allocations,从以前的分配中添加未使用的休假
+DocType: Leave Allocation,Add unused leaves from previous allocations,结转之前已分配未使用的休假
 DocType: Sales Partner,Partner website,合作伙伴网站
-DocType: Restaurant Order Entry,Add Item,新增项目
-DocType: Party Tax Withholding Config,Party Tax Withholding Config,党的预扣税配置
+DocType: Restaurant Order Entry,Add Item,新增
+DocType: Party Tax Withholding Config,Party Tax Withholding Config,业务伙伴的预扣税配置
 DocType: Lab Test,Custom Result,自定义结果
 DocType: Delivery Stop,Contact Name,联系人姓名
 DocType: Course Assessment Criteria,Course Assessment Criteria,课程评价标准
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,税号：
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +31,Tax Id: ,纳税登记号：
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +216,Student ID: ,学生卡：
 DocType: POS Customer Group,POS Customer Group,POS客户群
 DocType: Land Unit,Land Unit describing various land assets,描绘各种土地资产的土地单位
@@ -417,37 +417,37 @@
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,请求您的报价。
 DocType: POS Closing Voucher Details,Collected Amount,收集金额
 DocType: Lab Test,Submitted Date,提交日期
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,这是基于对这个项目产生的考勤表
-,Open Work Orders,打开工作订单
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,基于项目工时单
+,Open Work Orders,打开工单
 DocType: Payment Term,Credit Months,信贷月份
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +479,Net Pay cannot be less than 0,净工资不能低于0
 DocType: Contract,Fulfilled,达到
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,Relieving Date must be greater than Date of Joining,离职日期必须晚于入职日期
 DocType: POS Closing Voucher,Cashier,出纳员
-apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +221,Leaves per Year,每年叶
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +162,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：请检查'是推进'对帐户{1}，如果这是一个进步条目。
+apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +221,Leaves per Year,每年休假（天）
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +162,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：如果预付凭证，请为科目{1}勾选'预付？'。
 apps/erpnext/erpnext/stock/utils.py +245,Warehouse {0} does not belong to company {1},仓库{0}不属于公司{1}
 DocType: Email Digest,Profit & Loss,利润损失
 apps/erpnext/erpnext/utilities/user_progress.py +147,Litre,升
-DocType: Task,Total Costing Amount (via Time Sheet),总成本计算量（通过时间表）
+DocType: Task,Total Costing Amount (via Time Sheet),总成本计算量（通过工时单）
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.py +76,Please setup Students under Student Groups,请设置学生组的学生
-DocType: Item Website Specification,Item Website Specification,项目网站规格
+DocType: Item Website Specification,Item Website Specification,网站上显示的物料详细规格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +553,Leave Blocked,已禁止请假
 apps/erpnext/erpnext/stock/doctype/item/item.py +776,Item {0} has reached its end of life on {1},物料{0}已经到达寿命终止日期{1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +82,Bank Entries,银行条目
 DocType: Customer,Is Internal Customer,是内部客户
 DocType: Crop,Annual,全年
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +27,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",如果选中自动选择，则客户将自动与相关的忠诚度计划链接（保存时）
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
+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,不要联系
+DocType: Lead,Do Not Contact,请勿打扰
 apps/erpnext/erpnext/utilities/user_progress.py +210,People who teach at your organisation,谁在您的组织教人
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +123,Software Developer,软件开发人员
 DocType: Item,Minimum Order Qty,最小起订量
 DocType: Course Scheduling Tool,Course Start Date,课程开始日期
-,Student Batch-Wise Attendance,学生分批出席
+,Student Batch-Wise Attendance,学生按批考勤
 DocType: POS Profile,Allow user to edit Rate,允许用户编辑率
 DocType: Item,Publish in Hub,在发布中心
 DocType: Student Admission,Student Admission,学生入学
@@ -458,31 +458,31 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1088,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清算日期
 ,GSTR-2,GSTR-2
-DocType: Item,Purchase Details,购买详情
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
-DocType: Salary Slip,Total Principal Amount,本金总额
+DocType: Item,Purchase Details,采购信息
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +456,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},物料{0}未定义在采购订单{1}发给供应商的原材料清单中
+DocType: Salary Slip,Total Principal Amount,贷款本金总额
 DocType: Student Guardian,Relation,关系
 DocType: Student Guardian,Mother,母亲
 DocType: Restaurant Reservation,Reservation End Time,预订结束时间
 DocType: Crop,Biennial,双年展
-,BOM Variance Report,BOM差异报告
+,BOM Variance Report,BOM差异报表
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,确认客户订单。
-DocType: Purchase Receipt Item,Rejected Quantity,拒绝数量
-apps/erpnext/erpnext/education/doctype/fees/fees.py +80,Payment request {0} created,已创建付款请求{0}
+DocType: Purchase Receipt Item,Rejected Quantity,拒收数量
+apps/erpnext/erpnext/education/doctype/fees/fees.py +80,Payment request {0} created,已创建付款申请{0}
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Open Orders,开放订单
 apps/erpnext/erpnext/healthcare/setup.py +256,Low Sensitivity,低灵敏度
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.js +16,Order rescheduled for sync,订单重新安排同步
 DocType: Notification Control,Notification Control,通知控制
 apps/erpnext/erpnext/templates/emails/training_event.html +17,Please confirm once you have completed your training,完成培训后请确认
 DocType: Lead,Suggestions,建议
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,为此区域设置品目群组特定的预算。你还可以设置“分布”，为预算启动季节性。
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,为此区域设置物料群组特定的预算。你还可以设置“分布”，为预算启动季节性。
 DocType: Payment Term,Payment Term Name,付款条款名称
 DocType: Healthcare Settings,Create documents for sample collection,创建样本收集文件
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +308,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对{0} {1}的付款不能大于总未付金额{2}
 DocType: Bank Account,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html +35,Mode of Payments,付款方式
-DocType: Maintenance Schedule,Generate Schedule,生成时间表
+DocType: Maintenance Schedule,Generate Schedule,生成工时单
 DocType: Purchase Invoice Item,Expense Head,总支出
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,预计日期不能前材料申请日期
 DocType: Crop,"You can define all the tasks which need to carried out for this crop here. The day field is used to mention the day on which the task needs to be carried out, 1 being the 1st day, etc.. ",你可以在这里定义所有需要进行的作业。日场是用来提及任务需要执行的日子，1日是第一天等。
@@ -491,17 +491,17 @@
 DocType: Asset Maintenance Task,2 Yearly,每年2次
 DocType: Education Settings,Education Settings,教育设置
 DocType: Vehicle Service,Inspection,检查
-DocType: Exchange Rate Revaluation Account,Balance In Base Currency,平衡基础货币
+DocType: Exchange Rate Revaluation Account,Balance In Base Currency,本币余额
 DocType: Supplier Scorecard Scoring Standing,Max Grade,最高等级
 DocType: Email Digest,New Quotations,新报价
-apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +60,Attendance not submitted for {0} as {1} on leave.,在{0}上没有针对{1}上的考勤出席。
+apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +60,Attendance not submitted for {0} as {1} on leave.,因{1}尚在休假中，{0}的考勤未能提交。
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,电子邮件工资单员工根据员工选择首选的电子邮件
 DocType: Tax Rule,Shipping County,航运县
 DocType: Currency Exchange,For Selling,出售
 apps/erpnext/erpnext/config/desktop.py +159,Learn,学习
 DocType: Asset,Next Depreciation Date,接下来折旧日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每个员工活动费用
-DocType: Accounts Settings,Settings for Accounts,帐户设置
+DocType: Accounts Settings,Settings for Accounts,科目设置
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +742,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,求职信
@@ -512,31 +512,31 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +85,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +440,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
-DocType: Period Closing Voucher,Closing Account Head,结算帐户头
+DocType: Period Closing Voucher,Closing Account Head,结算科目
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +111,Circular Reference Error,循环引用错误
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +206,Student Report Card,学生报告卡
+apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +206,Student Report Card,学生报表卡
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +169,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Appointment Type,Is Inpatient,住院病人
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Name,Guardian1名称
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在送货单保存后显示。
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在销售出货单保存后显示。
 DocType: Cheque Print Template,Distance from left edge,从左侧边缘的距离
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]的单位（＃窗体/项目/ {1}）在[{2}]研究发现（＃窗体/仓储/ {2}）
 DocType: Lead,Industry,行业
 DocType: BOM Item,Rate & Amount,价格和金额
-apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,这是基于对本公司的交易。有关详情，请参阅下面的时间表
+apps/erpnext/erpnext/setup/doctype/company/company_dashboard.py +6,This is based on transactions against this Company. See timeline below for details,本统计基于该公司的过往交易。详情请参阅表单下方的时间线记录
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 apps/erpnext/erpnext/healthcare/setup.py +260,Resistant,耐
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +77,Please set Hotel Room Rate on {},请在{}上设置酒店房价
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,发票类型
 DocType: Employee Benefit Claim,Expense Proof,费用证明
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +979,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +979,Delivery Note,销售出货
 DocType: Consultation,Encounter Impression,遇到印象
-apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立税
+apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,设置税码及税务规则
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Cost of Sold Asset,出售资产的成本
 DocType: Volunteer,Morning,早上
-apps/erpnext/erpnext/accounts/utils.py +352,Payment Entry has been modified after you pulled it. Please pull it again.,获取付款记录后有修改，请重获取。
+apps/erpnext/erpnext/accounts/utils.py +352,Payment Entry has been modified after you pulled it. Please pull it again.,获取付款凭证后有修改，请重新获取。
 DocType: Program Enrollment Tool,New Student Batch,新学生批次
 apps/erpnext/erpnext/stock/doctype/item/item.py +495,{0} entered twice in Item Tax,{0}输入了两次税项
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +115,Summary for this week and pending activities,本周和待活动总结
@@ -547,19 +547,19 @@
 apps/erpnext/erpnext/public/js/templates/item_quick_entry.html +1,Variant Attributes,变量属性
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +114,Please select month and year,请选择年份和月份
 DocType: Employee,Company Email,企业邮箱
-DocType: GL Entry,Debit Amount in Account Currency,在账户币种借记金额
+DocType: GL Entry,Debit Amount in Account Currency,科目币别借方金额
 DocType: Supplier Scorecard,Scoring Standings,得分排名
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,订单价值
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,订单价值
 DocType: Certified Consultant,Certified Consultant,认证顾问
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,针对往来单位或内部转帐的银行/现金交易
 DocType: Shipping Rule,Valid for Countries,有效的国家
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
+apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,此物料为模板物料，不可在业务中直接使用。模板物料的属性会被复制到变式（变体）物料，可以设置“不允许复制”
 DocType: Grant Application,Grant Application,授予申请
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货
 DocType: Certification Application,Not Certified,未认证
 DocType: Asset Value Adjustment,New Asset Value,新资产价值
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的基础货币后的单价
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,客户货币转换为客户的本币后的单价
 DocType: Course Scheduling Tool,Course Scheduling Tool,排课工具
 apps/erpnext/erpnext/controllers/accounts_controller.py +655,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
 DocType: Land Unit,LInked Analysis,LInked分析
@@ -569,23 +569,23 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +105,Application period cannot be across two allocation records,申请期限不能跨越两个分配记录
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +73,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,基于CRM的分包合同反向原材料
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +145,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +145,Purchase Invoice {0} is already submitted,采购发票{0}已经提交了
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +90,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
-DocType: Material Request Plan Item,Material Request Plan Item,材料申请计划项目
-DocType: Leave Type,Allow Encashment,允许封装
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +101,Convert to non-Group,转换为非集团
+DocType: Material Request Plan Item,Material Request Plan Item,材料申请计划物料
+DocType: Leave Type,Allow Encashment,允许折算为现金
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +101,Convert to non-Group,转换为非群组
 DocType: Project Update,Good/Steady,好/稳定
 DocType: Bank Statement Transaction Invoice Item,Invoice Date,发票日期
 DocType: GL Entry,Debit Amount,借方金额
-apps/erpnext/erpnext/accounts/party.py +260,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
+apps/erpnext/erpnext/accounts/party.py +260,There can only be 1 Account per Company in {0} {1},每个公司只能有1个科目（科目）{0} {1}
 DocType: Support Search Source,Response Result Key Path,响应结果关键路径
-DocType: Journal Entry,Inter Company Journal Entry,Inter公司日记帐分录
+DocType: Journal Entry,Inter Company Journal Entry,Inter公司手工凭证
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +496,For quantity {0} should not be grater than work order quantity {1},数量{0}不应超过工单数量{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +500,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
 DocType: Volunteer,Weekends,周末
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,信用额度
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Credit Note Amount,退款金额
 DocType: Setup Progress Action,Action Document,行动文件
 DocType: Chapter Member,Website URL,网站网址
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Group,供应商&gt;供应商组
@@ -596,12 +596,12 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +45,{0} - {1} is not enrolled in the Course {2},{0}  -  {1}未加入课程{2}
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +225,Student Name: ,学生姓名：
 DocType: POS Closing Voucher Details,Difference,区别
-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/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",服务器的GoCardless配置似乎存在问题。别担心，如果失败，这笔款项将退还给您的帐户。
+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/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +97,"There seems to be an issue with the server's GoCardless configuration. Don't worry, in case of failure, the amount will get refunded to your account.",服务器的GoCardless配置似乎存在问题。别担心，如果失败，这笔款项将退还给您的科目。
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext演示
 apps/erpnext/erpnext/public/js/utils/item_selector.js +20,Add Items,添加项目
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,项目质量检验参数
-DocType: Leave Application,Leave Approver Name,假期审批人姓名
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,物料质量检验参数
+DocType: Leave Application,Leave Approver Name,休假审批人姓名
 DocType: Depreciation Schedule,Schedule Date,计划任务日期
 DocType: Packed Item,Packed Item,盒装产品
 DocType: Job Offer Term,Job Offer Term,招聘条件
@@ -611,15 +611,15 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +15,Mandatory field - Get Students From,强制性领域 - 获得学生
 DocType: Program Enrollment,Enrolled courses,入学课程
 DocType: Program Enrollment,Enrolled courses,入学课程
-DocType: Currency Exchange,Currency Exchange,货币兑换
-DocType: Opening Invoice Creation Tool Item,Item Name,项目名称
+DocType: Currency Exchange,Currency Exchange,外币汇率
+DocType: Opening Invoice Creation Tool Item,Item Name,物料名称
 DocType: Authorization Rule,Approving User  (above authorized value),批准的用户（上述授权值）
 DocType: Email Digest,Credit Balance,贷方余额
 DocType: Employee,Widowed,丧偶
 DocType: Request for Quotation,Request for Quotation,询价
 DocType: Healthcare Settings,Require Lab Test Approval,需要实验室测试批准
 DocType: Salary Slip Timesheet,Working Hours,工作时间
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,总计杰出
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +72,Total Outstanding,总未付
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
 DocType: Dosage Strength,Strength,强度
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1545,Create a new Customer,创建一个新的客户
@@ -634,8 +634,8 @@
 DocType: Purchase Receipt,Vehicle Date,车日期
 DocType: Student Log,Medical,医药
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +184,Reason for losing,原因丢失
-apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,更新帐号
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,铅所有者不能等同于铅
+apps/erpnext/erpnext/accounts/doctype/account/account.js +46,Update Account Number,更新科目编号
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Lead Owner cannot be same as the Lead,线索负责人不能是线索本身
 apps/erpnext/erpnext/accounts/utils.py +358,Allocated amount can not greater than unadjusted amount,已核销金额不能超过未调整金额
 DocType: Announcement,Receiver,接收器
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
@@ -658,16 +658,16 @@
 DocType: Travel Itinerary,Non-Vegetarian,非素食主义者
 DocType: Purchase Invoice,Supplier Name,供应商名称
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,阅读ERPNext手册
-DocType: HR Settings,Show Leaves Of All Department Members In Calendar,在日历中显示所有部门成员的叶子
+DocType: HR Settings,Show Leaves Of All Department Members In Calendar,在日历中显示所有部门成员的休假
 DocType: Purchase Invoice,01-Sales Return,01-销售退货
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Temporarily on Hold,暂时搁置
-DocType: Account,Is Group,是集团
+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/public/js/utils/customer_quick_entry.js +34,Primary Address Details,主要地址详情
+apps/erpnext/erpnext/public/js/utils/customer_quick_entry.js +34,Primary Address Details,主要地址信息
 DocType: Vehicle Service,Oil Change,换油
-DocType: Leave Encashment,Leave Balance,保持平衡
+DocType: Leave Encashment,Leave Balance,休假余额
 DocType: Asset Maintenance Log,Asset Maintenance Log,资产维护日志
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','结束箱号'不能小于'开始箱号'
 DocType: Certification Application,Non Profit,非营利
@@ -678,58 +678,58 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +19,Mandatory field - Academic Year,必修课 - 学年
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +221,{0} {1} is not associated with {2} {3},{0} {1}与{2} {3}无关
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定义作为邮件一部分的简介文本，每个邮件的简介文本是独立的。
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Please set default payable account for the company {0},请为公司{0}设置预设应付账款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +180,Please set default payable account for the company {0},请为公司{0}设置默认应付账款科目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +570,Transaction not allowed against stopped Work Order {0},不允许对停止的工单{0}进行交易
 DocType: Setup Progress Action,Min Doc Count,最小文件计数
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
-DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
+DocType: Accounts Settings,Accounts Frozen Upto,科目被冻结截止日
 DocType: SMS Log,Sent On,发送日期
 apps/erpnext/erpnext/stock/doctype/item/item.py +736,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/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +85,Opening Invoice Item,打开发票项目
-DocType: Request for Quotation Item,Required Date,所需时间
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +85,Opening Invoice Item,待处理发票项
+DocType: Request for Quotation Item,Required Date,需求日期
 DocType: Delivery Note,Billing Address,帐单地址
-DocType: Bank Statement Settings,Statement Headers,声明标题
+DocType: Bank Statement Settings,Statement Headers,对帐单抬头
 DocType: Travel Request,Costing,成本核算
 DocType: Tax Rule,Billing County,开票县
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果选中，税金将被认为已包括于打印税率/打印总额内。
+DocType: 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/manufacturing/doctype/production_plan/production_plan.js +40,Work Order,工作指示
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +40,Work Order,工单
 DocType: Driver,DRIVER-.#####,DRIVER  -  #####
 DocType: Sales Invoice,Total Qty,总数量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,Guardian2电子邮件ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +62,Guardian2 Email ID,Guardian2电子邮件ID
-DocType: Item,Show in Website (Variant),展网站（变体）
+DocType: Item,Show in Website (Variant),在网站上展示（变体）
 DocType: Employee,Health Concerns,健康问题
-DocType: Payroll Entry,Select Payroll Period,选择工资期
+DocType: Payroll Entry,Select Payroll Period,选择工资期间
 DocType: Purchase Invoice,Unpaid,未付
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,保留出售
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,预留待售
 DocType: Packing Slip,From Package No.,起始包号
 DocType: Item Attribute,To Range,为了范围
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Securities and Deposits,证券及存款
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改变估值方法，因为有一些项目没有自己的估值方法的交易
-DocType: Student Report Generation Tool,Attended by Parents,由父母出席
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +47,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改变估值方法，因为已有业务单据使用了没有估值方法的物料
+DocType: Student Report Generation Tool,Attended by Parents,父母代出席
 apps/erpnext/erpnext/hr/doctype/shift_assignment/shift_assignment.py +39,Employee {0} has already applied for {1} on {2} : ,员工{0}已在{2}上申请{1}：
 DocType: Patient,AB Positive,AB积极
 DocType: Job Opening,Description of a Job Opening,空缺职位的说明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +112,Pending activities for today,今天待定活动
-DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基于时间表工资。
+DocType: Salary Structure,Salary Component for timesheet based payroll.,薪资构成用于按工时单支付工资。
 DocType: Sales Order Item,Used for Production Plan,用于生产计划
 DocType: Loan,Total Payment,总付款
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +100,Cannot cancel transaction for Completed Work Order.,无法取消已完成工单的交易。
 DocType: Manufacturing Settings,Time Between Operations (in mins),时间操作之间（以分钟）
 DocType: Clinical Procedure,Consumables,耗材
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,{0} {1} is cancelled so the action cannot be completed,{0} {1}被取消，因此无法完成操作
-DocType: Customer,Buyer of Goods and Services.,产品和服务购买者。
+DocType: Customer,Buyer of Goods and Services.,产品和服务采购者。
 DocType: Journal Entry,Accounts Payable,应付帐款
 DocType: Patient,Allergies,过敏
-apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +36,The selected BOMs are not for the same item,所选的材料清单并不同样项目
+apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +36,The selected BOMs are not for the same item,所选物料清单不能用于同一个物料
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +32,Change Item Code,更改物料代码
 DocType: Supplier Scorecard Standing,Notify Other,通知其他
 DocType: Vital Signs,Blood Pressure (systolic),血压（收缩期）
 DocType: Pricing Rule,Valid Upto,有效期至
-DocType: Training Event,Workshop,作坊
+DocType: Training Event,Workshop,研讨会
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告采购订单
 apps/erpnext/erpnext/utilities/user_progress.py +67,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
 DocType: Employee Tax Exemption Proof Submission,Rented From Date,从日期租用
@@ -756,39 +756,39 @@
 DocType: Lab Test Template,Lab Routine,实验室常规
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +20,Cosmetics,化妆品
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +18,Please select Completion Date for Completed Asset Maintenance Log,请选择已完成资产维护日志的完成日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +568,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +568,"To merge, following properties must be same for both items",若要合并，两个物料的以下属性必须相同
 DocType: Supplier,Block Supplier,块供应商
 DocType: Shipping Rule,Net Weight,净重
 DocType: Job Opening,Planned number of Positions,计划的职位数量
 DocType: Employee,Emergency Phone,紧急电话
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +82,{0} {1} does not exist.,{0} {1}不存在。
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,购买
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,采购
 ,Serial No Warranty Expiry,序列号/保修到期
 DocType: Sales Invoice,Offline POS Name,离线POS名称
 apps/erpnext/erpnext/utilities/user_progress.py +180,Student Application,学生申请
 DocType: Bank Statement Transaction Payment Item,Payment Reference,付款凭据
-DocType: Supplier,Hold Type,保持类型
+DocType: Supplier,Hold Type,暂缓处理类型
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,请定义等级为阈值0％
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,请定义等级为阈值0％
 DocType: Bank Statement Transaction Payment Item,Bank Statement Transaction Payment Item,银行对账单交易付款项目
-DocType: Sales Order,To Deliver,为了提供
+DocType: Sales Order,To Deliver,待出货
 DocType: Purchase Invoice Item,Item,物料
 apps/erpnext/erpnext/healthcare/setup.py +257,High Sensitivity,高灵敏度
 apps/erpnext/erpnext/config/non_profit.py +48,Volunteer Type information.,志愿者类型信息。
 DocType: Cash Flow Mapping Template,Cash Flow Mapping Template,现金流量映射模板
-DocType: Travel Request,Costing Details,成本计算详情
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2563,Serial no item cannot be a fraction,序号项目不能是一个分数
-DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
+DocType: Travel Request,Costing Details,成本计算信息
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2563,Serial no item cannot be a fraction,序号不能是一个分数
+DocType: Journal Entry,Difference (Dr - Cr),差异(借方-贷方)
 DocType: Bank Guarantee,Providing,提供
-DocType: Account,Profit and Loss,损益
+DocType: Account,Profit and Loss,损益表
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +104,"Not permitted, configure Lab Test Template as required",不允许，根据需要配置实验室测试模板
 DocType: Patient,Risk Factors,风险因素
 DocType: Patient,Occupational Hazards and Environmental Factors,职业危害与环境因素
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +283,Stock Entries already created for Work Order ,已为工单创建的库存条目
 DocType: Vital Signs,Respiratory rate,呼吸频率
-apps/erpnext/erpnext/config/stock.py +338,Managing Subcontracting,管理转包
+apps/erpnext/erpnext/config/stock.py +338,Managing Subcontracting,管理外包
 DocType: Vital Signs,Body Temperature,体温
-DocType: Project,Project will be accessible on the website to these users,项目将在网站向这些用户上访问
+DocType: Project,Project will be accessible on the website to these users,这些用户可在网站上访问该项目
 DocType: Detected Disease,Disease,疾病
 apps/erpnext/erpnext/config/projects.py +29,Define Project type.,定义项目类型。
 DocType: Supplier Scorecard,Weighting Function,加权函数
@@ -796,21 +796,21 @@
 apps/erpnext/erpnext/utilities/user_progress.py +28,Setup your ,设置你的
 DocType: Student Report Generation Tool,Show Marks,显示标记
 DocType: Support Settings,Get Latest Query,获取最新查询
-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 +74,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +56,Abbreviation already used for another company,缩写已用于另一家公司
 DocType: Selling Settings,Default Customer Group,默认客户群组
 DocType: Asset Repair,ARLOG-,ARLOG-
 DocType: Employee,IFSC Code,IFSC代码
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“元整后金额”字段将不在任何交易中显示
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“圆整后金额”字段将不在任何交易中显示
 DocType: BOM,Operating Cost,营业成本
-DocType: Crop,Produced Items,生产物品
+DocType: Crop,Produced Items,生产物料
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,将交易与发票匹配
 DocType: Sales Order Item,Gross Profit,毛利
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +841,Unblock Invoice,取消屏蔽发票
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能为0
-DocType: Company,Delete Company Transactions,删除公司事务
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +366,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
+DocType: Company,Delete Company Transactions,删除正式上线前的测试数据
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +366,Reference No and Reference Date is mandatory for Bank transaction,银行交易中参考编号和参考日期必填
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Payment Entry Reference,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
@@ -818,26 +818,26 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +160,"Cannot delete Serial No {0}, as it is used in stock transactions",无法删除序列号{0}，因为它采用的是现货交易
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +256,Closing (Cr),结算(信用)
 apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +1,Hello,你好
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,移动项目
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +118,Move Item,移动物料
 DocType: Employee Incentive,Incentive Amount,激励金额
 DocType: Serial No,Warranty Period (Days),保修期限（天数）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Total Credit/ Debit Amount should be same as linked Journal Entry,总信用/借方金额应与链接的日记帐分录相同
-DocType: Installation Note Item,Installation Note Item,安装单项目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Total Credit/ Debit Amount should be same as linked Journal Entry,总信用/借方金额应与链接的手工凭证相同
+DocType: Installation Note Item,Installation Note Item,安装单项
 DocType: Production Plan Item,Pending Qty,待定数量
 DocType: Budget,Ignore,忽略
 apps/erpnext/erpnext/accounts/party.py +408,{0} {1} is not active,{0} {1} 未激活
-DocType: Woocommerce Settings,Freight and Forwarding Account,货运和转运帐户
+DocType: Woocommerce Settings,Freight and Forwarding Account,货运和转运科目
 apps/erpnext/erpnext/config/accounts.py +278,Setup cheque dimensions for printing,设置检查尺寸打印
-DocType: Salary Slip,Salary Slip Timesheet,工资单时间表
-apps/erpnext/erpnext/controllers/buying_controller.py +171,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
+DocType: Salary Slip,Salary Slip Timesheet,工资单工时单
+apps/erpnext/erpnext/controllers/buying_controller.py +171,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收货单必须指定供应商仓库
 DocType: Pricing Rule,Valid From,有效期自
 DocType: Sales Invoice,Total Commission,总佣金
-DocType: Tax Withholding Account,Tax Withholding Account,扣缴税款账户
+DocType: Tax Withholding Account,Tax Withholding Account,代扣税款科目
 DocType: Pricing Rule,Sales Partner,销售合作伙伴
 apps/erpnext/erpnext/config/buying.py +150,All Supplier scorecards.,所有供应商记分卡。
-DocType: Buying Settings,Purchase Receipt Required,外购入库单要求
+DocType: Buying Settings,Purchase Receipt Required,需要采购收货
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +229,Target warehouse in row {0} must be same as Work Order,行{0}中的目标仓库必须与工单相同
-apps/erpnext/erpnext/stock/doctype/item/item.py +170,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的，如果打开股票进入
+apps/erpnext/erpnext/stock/doctype/item/item.py +170,Valuation Rate is mandatory if Opening Stock entered,库存开帐凭证中评估价字段必填
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +143,No records found in the Invoice table,没有在发票表中找到记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +36,Please select Company and Party Type first,请先选择公司和往来单位类型
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +31,"Already set default in pos profile {0} for user {1}, kindly disabled default",已经在用户{1}的pos配置文件{0}中设置了默认值，请禁用默认值
@@ -845,7 +845,7 @@
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累积值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +164,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
 DocType: Shopify Settings,Customer Group will set to selected group while syncing customers from Shopify,客户组将在同步Shopify客户的同时设置为选定的组
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profile中需要领域
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +72,Territory is Required in POS Profile,POS Profile中需要地域
 DocType: Supplier,Prevent RFQs,防止RFQ
 apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Order,创建销售订单
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +180,Salary Slip submitted for period from {0} to {1},从{0}到{1}
@@ -856,24 +856,24 @@
 DocType: Assessment Plan,Course,课程
 DocType: Timesheet,Payslip,工资单
 apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +18,Half day date should be in between from date and to date,半天的日期应该在从日期到日期之间
-apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,项目车
+apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,物料车
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,财年开始日期应不大于结束日期
 DocType: Issue,Resolution,决议
-DocType: Employee,Personal Bio,个人生物
+DocType: Employee,Personal Bio,个人履历
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py +15,Membership ID,会员ID
 apps/erpnext/erpnext/templates/pages/order.html +76,Delivered: {0},交货：{0}
-DocType: Bank Statement Transaction Entry,Payable Account,应付帐款
+DocType: Bank Statement Transaction Entry,Payable Account,应付科目
 DocType: Payment Entry,Type of Payment,付款类型
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +18,Half Day Date is mandatory,半天日期是强制性的
+apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +18,Half Day Date is mandatory,半天日期必填
 DocType: Sales Order,Billing and Delivery Status,结算和交货状态
-DocType: Job Applicant,Resume Attachment,简历附
+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,调配
+DocType: Leave Control Panel,Allocate,分配
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +108,Create Variant,创建变体
 DocType: Sales Invoice,Shipping Bill Date,运费单日期
 DocType: Production Plan,Production Plan,生产计划
-DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,打开发票创建工具
+DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,发票创建工具
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +882,Sales Return,销售退货
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +110,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：总分配叶{0}应不低于已核定叶{1}期间
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,根据序列号输入设置交易数量
@@ -888,22 +888,22 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客户数据库。
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),开幕（CR ）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +228,Opening (Cr),期初（贷方 ）
 apps/erpnext/erpnext/stock/doctype/item/item.py +908,Default Unit of Measure for Item {0} cannot be changed directly because 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 +356,Allocated amount can not be negative,调配数量不能为负
+apps/erpnext/erpnext/accounts/utils.py +356,Allocated amount can not be negative,分配数量不能为负
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +11,Please set the Company,请设定公司
 DocType: Share Balance,Share Balance,份额平衡
 DocType: Employee Tax Exemption Declaration,Monthly House Rent,每月房租
 DocType: Purchase Order Item,Billed Amt,已开票金额
-DocType: Training Result Employee,Training Result Employee,训练结果员工
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
+DocType: Training Result Employee,Training Result Employee,员工
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建手工库存移动所依赖的逻辑仓库。
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +134,Principal Amount,本金
 DocType: Loan Application,Total Payable Interest,合计应付利息
-apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},总计：{0}
-DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,销售发票时间表
+apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +57,Total Outstanding: {0},总未付：{0}
+DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,销售发票工时单
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +150,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
-DocType: Payroll Entry,Select Payment Account to make Bank Entry,选择付款账户，使银行进入
+DocType: Payroll Entry,Select Payment Account to make Bank Entry,选择付款科目生成银行凭证
 DocType: Hotel Settings,Default Invoice Naming Series,默认发票命名系列
 apps/erpnext/erpnext/utilities/activation.py +136,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶，报销和工资
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +679,An error occurred during the update process,更新过程中发生错误
@@ -915,56 +915,56 @@
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +43,Notify Customers via Email,通过电子邮件通知客户
 DocType: Item,Batch Number Series,批号系列
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外销售人员{0}存在具有相同员工ID
-DocType: Employee Advance,Claimed Amount,声明金额
+DocType: Employee Advance,Claimed Amount,申报金额
 DocType: Travel Itinerary,Departure Datetime,离开日期时间
-DocType: Travel Request Costing,Travel Request Costing,旅行请求成本计算
+DocType: Travel Request Costing,Travel Request Costing,出差申请成本计算
 apps/erpnext/erpnext/config/education.py +180,Masters,主数据
 DocType: Employee Onboarding,Employee Onboarding Template,员工入职模板
 DocType: Assessment Plan,Maximum Assessment Score,最大考核评分
 apps/erpnext/erpnext/config/accounts.py +144,Update Bank Transaction Dates,更新银行交易日期
 apps/erpnext/erpnext/config/projects.py +41,Time Tracking,时间跟踪
 DocType: Purchase Invoice,DUPLICATE FOR TRANSPORTER,输送机重复
-apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +57,Row {0}# Paid Amount cannot be greater than requested advance amount,行{0}＃付费金额不能大于请求的提前金额
-DocType: Fiscal Year Company,Fiscal Year Company,公司财政年度
-DocType: Packing Slip Item,DN Detail,送货单详情
+apps/erpnext/erpnext/hr/doctype/employee_advance/employee_advance.py +57,Row {0}# Paid Amount cannot be greater than requested advance amount,第{0}行的付款金额不能大于预付申请金额
+DocType: Fiscal Year Company,Fiscal Year Company,公司财务年度
+DocType: Packing Slip Item,DN Detail,销售出货单信息
 DocType: Training Event,Conference,会议
-DocType: Employee Grade,Default Salary Structure,默认工资结构
+DocType: Employee Grade,Default Salary Structure,默认薪资结构
 apps/erpnext/erpnext/hr/report/daily_work_summary_replies/daily_work_summary_replies.py +23,Replies,回复
 DocType: Timesheet,Billed,已开票
 DocType: Batch,Batch Description,批次说明
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,创建学生组
-apps/erpnext/erpnext/accounts/utils.py +741,"Payment Gateway Account not created, please create one manually.",支付网关帐户没有创建，请手动创建一个。
+apps/erpnext/erpnext/accounts/utils.py +741,"Payment Gateway Account not created, please create one manually.",支付网关科目没有创建，请手动创建一个。
 DocType: Supplier Scorecard,Per Year,每年
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +51,Not eligible for the admission in this program as per DOB,按照DOB的规定，没有资格参加本计划
 DocType: Sales Invoice,Sales Taxes and Charges,销售税费
 DocType: Vital Signs,Height (In Meter),身高（米）
-DocType: Student,Sibling Details,兄弟姐妹详情
+DocType: Student,Sibling Details,兄弟姐妹信息
 DocType: Vehicle Service,Vehicle Service,汽车服务
 apps/erpnext/erpnext/config/setup.py +95,Automatically triggers the feedback request based on conditions.,自动触发基于条件的反馈请求。
-DocType: Employee,Reason for Resignation,原因辞职
-DocType: Tax Withholding Category,Book on Invoice,在发票上预订
-DocType: Sales Invoice,Credit Note Issued,信用票据发行
+DocType: Employee,Reason for Resignation,离职原因
+DocType: Tax Withholding Category,Book on Invoice,记帐在发票上
+DocType: Sales Invoice,Credit Note Issued,退款单已发出
 DocType: Project Task,Weight,重量
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,发票/日记帐分录详细信息
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,发票/手工凭证详细信息
 apps/erpnext/erpnext/accounts/utils.py +84,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不属于{2}财年
 DocType: Buying Settings,Settings for Buying Module,采购模块的设置
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +22,Asset {0} does not belong to company {1},资产{0}不属于公司{1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,请第一次进入购买收据
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,请先输入采购收货单号
 DocType: Buying Settings,Supplier Naming By,供应商命名方式
 DocType: Activity Type,Default Costing Rate,默认成本核算率
 DocType: Maintenance Schedule,Maintenance Schedule,维护计划
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +151,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户，客户组，地区，供应商，供应商类型，活动，销售合作伙伴等条件过滤。
-DocType: Employee Promotion,Employee Promotion Details,员工促销详情
+DocType: Employee Promotion,Employee Promotion Details,员工升职信息
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +83,Net Change in Inventory,在库存净变动
 DocType: Employee,Passport Number,护照号码
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Relation with Guardian2,与关系Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +112,Manager,经理
 DocType: Payment Entry,Payment From / To,支付自/至
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +179,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于该客户未付总额。信用额度至少应该是 {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +430,Please set account in Warehouse {0},请在仓库{0}中设置帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +430,Please set account in Warehouse {0},请在仓库{0}中设置科目
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,“根据”和“分组依据”不能相同
 DocType: Sales Person,Sales Person Targets,销售人员目标
-DocType: Installation Note,IN-,在-
+DocType: Installation Note,IN-,IN-
 DocType: Work Order Operation,In minutes,以分钟为单位
 DocType: Issue,Resolution Date,决议日期
 DocType: Lab Test Template,Compound,复合
@@ -972,47 +972,47 @@
 DocType: Student Batch Name,Batch Name,批名
 DocType: Fee Validity,Max number of visit,最大访问次数
 ,Hotel Room Occupancy,酒店客房入住率
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +392,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1166,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +392,Timesheet created:,创建工时单：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1166,Please set default Cash or Bank account in Mode of Payment {0},请为付款方式{0}设置默认的现金或银行科目
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +24,Enroll,注册
 DocType: GST Settings,GST Settings,GST设置
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},货币应与价目表货币相同：{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +81,Currency should be same as Price List Currency: {0},货币应与价格清单货币相同：{0}
 DocType: Selling Settings,Customer Naming By,客户命名方式
-DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,将显示学生每月学生出勤记录报告为存在
+DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,将在每月学生考勤表显示学生出勤状态为出勤
 DocType: Depreciation Schedule,Depreciation Amount,折旧额
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +105,Convert to Group,转换为组
 DocType: Delivery Trip,TOUR-.#####,游览-。＃＃＃＃＃
 DocType: Activity Cost,Activity Type,活动类型
-DocType: Request for Quotation,For individual supplier,对于个别供应商
+DocType: Request for Quotation,For individual supplier,单个供应商
 DocType: BOM Operation,Base Hour Rate(Company Currency),基数小时率（公司货币）
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Delivered Amount,已交付金额
 DocType: Loyalty Point Entry Redemption,Redemption Date,赎回日期
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +14,Lab Tests,实验室测试
-DocType: Quotation Item,Item Balance,项目平衡
+DocType: Quotation Item,Item Balance,物料余额
 DocType: Sales Invoice,Packing List,包装清单
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,购买给供应商的订单。
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,采购给供应商的订单。
 DocType: Contract,Contract Template,合同模板
 DocType: Clinical Procedure Item,Transfer Qty,转移数量
 DocType: Purchase Invoice Item,Asset Location,资产位置
 DocType: Tax Rule,Shipping Zipcode,运输邮编
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +43,Publishing,出版
-DocType: Accounts Settings,Report Settings,报告设置
+DocType: Accounts Settings,Report Settings,报表设置
 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 +158,{0}: {1} not found in Invoice Details table,{0}：{1}在发票明细表中无法找到
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +158,{0}: {1} not found in Invoice Details table,{0}：{1}在发票信息表中无法找到
 DocType: Asset,Asset Owner Company,资产所有者公司
 DocType: Company,Round Off Cost Center,四舍五入成本中心
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +249,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护访问{0}
 DocType: Asset Maintenance Log,AML-,AML-
-DocType: Item,Material Transfer,物料转移
+DocType: Item,Material Transfer,移库
 DocType: Cost Center,Cost Center Number,成本中心编号
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +24,Could not find path for ,找不到路径
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),开幕（博士）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Opening (Dr),期初（借方）
 DocType: Compensatory Leave Request,Work End Date,工作结束日期
 DocType: Loan,Applicant,申请人
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +37,Posting timestamp must be after {0},发布时间标记必须经过{0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +37,Posting timestamp must be after {0},记帐时间必须晚于{0}
 apps/erpnext/erpnext/config/accounts.py +39,To make recurring documents,复制文件
-,GST Itemised Purchase Register,GST物料明细台帐
+,GST Itemised Purchase Register,GST物料采购台帐
 DocType: Course Scheduling Tool,Reschedule,改期
 DocType: Loan,Total Interest Payable,合计应付利息
 DocType: Leave Period,Filter By,过滤
@@ -1022,22 +1022,22 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +355,Finish,完
 DocType: Salary Structure Assignment,Base,基础
 DocType: Timesheet,Total Billed Hours,帐单总时间
-DocType: Travel Itinerary,Travel To,前往
+DocType: Travel Itinerary,Travel To,目的地
 apps/erpnext/erpnext/controllers/buying_controller.py +743,is not,不是
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1658,Write Off Amount,核销金额
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1658,Write Off Amount,销帐金额
 DocType: Leave Block List Allow,Allow User,允许用户
 DocType: Journal Entry,Bill No,账单编号
-DocType: Company,Gain/Loss Account on Asset Disposal,在资产处置收益/损失帐户
+DocType: Company,Gain/Loss Account on Asset Disposal,资产处置收益/损失科目
 DocType: Vehicle Log,Service Details,服务细节
 DocType: Vehicle Log,Service Details,服务细节
 DocType: Lab Test Template,Grouped,分组
-DocType: Selling Settings,Delivery Note Required,送货单是必须项
+DocType: Selling Settings,Delivery Note Required,销售出货单是必须项
 DocType: Bank Guarantee,Bank Guarantee Number,银行担保编号
 DocType: Bank Guarantee,Bank Guarantee Number,银行担保编号
 DocType: Assessment Criteria,Assessment Criteria,评估标准
-DocType: BOM Item,Basic Rate (Company Currency),基础利率（公司货币）
+DocType: BOM Item,Basic Rate (Company Currency),库存评估价（公司货币）
 DocType: Student Attendance,Student Attendance,学生出勤
-DocType: Sales Invoice Timesheet,Time Sheet,时间表
+DocType: Sales Invoice Timesheet,Time Sheet,工时单
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,基于..进行原物料倒扣账
 DocType: Sales Invoice,Port Code,港口代码
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +981,Reserve Warehouse,储备仓库
@@ -1054,33 +1054,33 @@
 apps/erpnext/erpnext/config/buying.py +160,Templates of supplier scorecard criteria.,供应商计分卡标准模板。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +316,Marketing,市场营销
 DocType: Sales Invoice,Redeem Loyalty Points,兑换忠诚度积分
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +312,Payment Entry is already created,付款记录已创建
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +312,Payment Entry is already created,付款凭证已创建
 DocType: Request for Quotation,Get Suppliers,获取供应商
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
 apps/erpnext/erpnext/controllers/accounts_controller.py +642,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +398,Preview Salary Slip,预览工资单
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +56,Account {0} has been entered multiple times,帐户{0}已多次输入
-DocType: Account,Expenses Included In Valuation,开支计入估值
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +56,Account {0} has been entered multiple times,科目{0}已多次输入
+DocType: Account,Expenses Included In Valuation,计入库存评估价的费用科目
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py +37,You can only renew if your membership expires within 30 days,如果您的会员资格在30天内到期，您只能续订
-DocType: Shopping Cart Settings,Show Stock Availability,显示股票可用性
+DocType: Shopping Cart Settings,Show Stock Availability,显示库存可用性
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +510,Set {0} in asset category {1} or company {2},在资产类别{1}或公司{2}中设置{0}
 DocType: Land Unit,Longitude,经度
-,Absent Student Report,缺席学生报告
+,Absent Student Report,缺勤学生报表
 DocType: Crop,Crop Spacing UOM,裁剪间隔UOM
 DocType: Loyalty Program,Single Tier Program,单层计划
 DocType: Accounts Settings,Only select if you have setup Cash Flow Mapper documents,只有在设置了“现金流量映射器”文档时才能选择
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
 apps/erpnext/erpnext/controllers/buying_controller.py +740,"Following item {items} {verb} marked as {message} item.\
-			You can enable them as {message} item from its Item master",以下项{item} {verb}标记为{message}项。\您可以从其项目主文件中将其作为{message}项启用
+			You can enable them as {message} item from its Item master",以下物料{item} {verb}被标记为{message}项。\您可以从其物料主数据中将其作为{message}项启用
 DocType: Supplier Scorecard,Per Week,每个星期
-apps/erpnext/erpnext/stock/doctype/item/item.py +683,Item has variants.,项目有变体。
+apps/erpnext/erpnext/stock/doctype/item/item.py +683,Item has variants.,物料有变体。
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +154,Total Student,学生总数
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,项目{0}未找到
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,物料{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +42,{0} has fee validity till {1},{0}有效期至{1}
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +54,Tree Type,树类型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,每单位消耗数量
-DocType: GST Account,IGST Account,IGST帐户
+DocType: GST Account,IGST Account,IGST科目
 DocType: Serial No,Warranty Expiry Date,保修到期日
 DocType: Material Request Item,Quantity and Warehouse,数量和仓库
 DocType: Hub Settings,Unregister,注销
@@ -1088,77 +1088,77 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +24,Please select Program,请选择程序
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +24,Please select Program,请选择程序
 DocType: Project,Estimated Cost,估计成本
-DocType: Purchase Order,Link to material requests,链接到材料请求
+DocType: Purchase Order,Link to material requests,链接到物料申请
 DocType: Hub Settings,Publish,发布
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +7,Aerospace,航天
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
 DocType: Journal Entry,Credit Card Entry,信用卡分录
-apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,公司与账户
+apps/erpnext/erpnext/config/accounts.py +57,Company and Accounts,公司与科目
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +72,In Value,金额
 DocType: Asset Settings,Depreciation Options,折旧选项
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +28,Either location or employee must be required,必须要求地点或员工
-apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,发布时间无效
+apps/erpnext/erpnext/utilities/transaction_base.py +29,Invalid Posting Time,记帐时间无效
 DocType: Salary Component,Condition and Formula,条件和公式
 DocType: Lead,Campaign Name,活动名称
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +61,There is no leave period in between {0} and {1},{0}和{1}之间没有休假期限
 DocType: Hotel Room,Capacity,容量
 DocType: Travel Request Costing,Expense Type,费用类型
-DocType: Selling Settings,Close Opportunity After Days,关闭机会后日
+DocType: Selling Settings,Close Opportunity After Days,几天后关闭机会
 ,Reserved,保留的
-DocType: Driver,License Details,许可证详情
+DocType: Driver,License Details,许可证信息
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +86,The field From Shareholder cannot be blank,来自股东的字段不能为空
 DocType: Leave Allocation,Allocation,分配
-DocType: Purchase Order,Supply Raw Materials,供应原料
+DocType: Purchase Order,Supply Raw Materials,供应原材料
 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 +134,{0} is not a stock Item,{0}不是一个库存品目
-apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',请通过点击“培训反馈”，然后点击“新建”
-DocType: Mode of Payment Account,Default Account,默认帐户
-apps/erpnext/erpnext/stock/doctype/item/item.py +289,Please select Sample Retention Warehouse in Stock Settings first,请先在库存设置中选择样品保留仓库
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +134,{0} is not a stock Item,{0}不是一个库存物料
+apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html +6,Please share your feedback to the training by clicking on 'Training Feedback' and then 'New',请点击“培训反馈”，再点击“新建”来分享你的培训反馈
+DocType: Mode of Payment Account,Default Account,默认科目
+apps/erpnext/erpnext/stock/doctype/item/item.py +289,Please select Sample Retention Warehouse in Stock Settings first,请先在库存设置中选择留存样品仓库
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +62,Please select the Multiple Tier Program type for more than one collection rules.,请为多个收集规则选择多层程序类型。
 DocType: Payment Entry,Received Amount (Company Currency),收到的款项（公司币种）
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +192,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +136,Payment Cancelled. Please check your GoCardless Account for more details,付款已取消。请检查您的GoCardless帐户以了解更多详情
+apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +136,Payment Cancelled. Please check your GoCardless Account for more details,付款已取消。请检查您的GoCardless科目以了解更多信息
 DocType: Contract,N/A,N / A
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +30,Please select weekly off day,请选择每周休息日
 DocType: Patient,O Negative,O负面
 DocType: Work Order Operation,Planned End Time,计划结束时间
-,Sales Person Target Variance Item Group-Wise,品目组特定的销售人员目标差异
+,Sales Person Target Variance Item Group-Wise,物料组的销售人员目标差异
 apps/erpnext/erpnext/accounts/doctype/account/account.py +95,Account with existing transaction cannot be converted to ledger,有交易的科目不能被转换为分类账
 apps/erpnext/erpnext/config/non_profit.py +33,Memebership Type Details,Memebership类型详细信息
 DocType: Delivery Note,Customer's Purchase Order No,客户的采购订单号
 DocType: Clinical Procedure,Consume Stock,消费股票
 DocType: Budget,Budget Against,预算对象
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +517,There's no employee for the given criteria. Check that Salary Slips have not already been created.,给定的标准没有雇员。检查工资单还没有被创建。
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +517,There's no employee for the given criteria. Check that Salary Slips have not already been created.,给定的标准没有员工。检查工资单还没有被创建。
 apps/erpnext/erpnext/stock/reorder_item.py +194,Auto Material Requests Generated,已自动生成材料需求
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丧失
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,输
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +184,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
 DocType: Employee Benefit Application Detail,Max Benefit Amount,最大福利金额
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,预留制造
 DocType: Soil Texture,Sand,砂
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +25,Energy,能源
-DocType: Opportunity,Opportunity From,从机会
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +939,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,行{0}：{1}项目{2}所需的序列号。你已经提供{3}。
+DocType: Opportunity,Opportunity From,机会来源
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +939,Row {0}: {1} Serial numbers required for Item {2}. You have provided {3}.,{1}请为第{0}行的物料{2}指定序列号。你已经提供{3}。
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +79,Please select a table,请选择一张桌子
 DocType: BOM,Website Specifications,网站规格
 DocType: Special Test Items,Particulars,细节
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
+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 +370,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
+apps/erpnext/erpnext/controllers/buying_controller.py +370,Row {0}: Conversion Factor is mandatory,行{0}：转换系数必填
 DocType: Student,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +343,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海报价格规则，同样的标准存在，请分配优先级解决冲突。价格规则：{0}
-DocType: Exchange Rate Revaluation,Exchange Rate Revaluation Account,汇率重估账户
+DocType: Exchange Rate Revaluation,Exchange Rate Revaluation Account,汇率重估科目
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +519,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js +106,Please select Company and Posting Date to getting entries,请选择公司和发布日期以获取条目
 DocType: Asset,Maintenance,维护
 DocType: Subscriber,Subscriber,订户
-DocType: Item Attribute Value,Item Attribute Value,项目属性值
+DocType: Item Attribute Value,Item Attribute Value,物料属性值
 apps/erpnext/erpnext/projects/doctype/project/project.py +441,Please Update your Project Status,请更新您的项目状态
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +26,Currency Exchange must be applicable for Buying or for Selling.,货币兑换必须适用于买入或卖出。
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +26,Currency Exchange must be applicable for Buying or for Selling.,外币汇率必须适用于买入或卖出。
 DocType: Item,Maximum sample quantity that can be retained,可以保留的最大样品数量
 DocType: Project Update,How is the Project Progressing Right Now?,项目现在进展如何？
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +467,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},对于采购订单{3}，行{0}＃项目{1}不能超过{2}
-apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,销售活动。
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +117,Make Timesheet,制作时间表
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,促销活动。
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +117,Make Timesheet,创建工时单
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -1189,32 +1189,32 @@
 6. 金额：税项金额
 7. 总计：到这里为止的累计
 8. 输入行： 如果选择了“基于前一行的总计/金额”，你可以选择此税项基于的行数(默认为前一行)。
-9. 价内税？：勾选此项则意味着此税项不会再单独出现在销售订单物料明细清单下方，此税费率会体现再物料售价中。如果您需要向客户提供打包价而不是明细价格(即包含所有税费)，此选项就会很有用。"
+9. 价内税？：勾选此项则意味着此税项不会再单独出现在销售订单物料项清单下方，此税费率会体现再物料售价中。如果您需要向客户提供打包价而不是详细价格(即包含所有税费)，此选项就会很有用。"
 DocType: Employee,Bank A/C No.,银行账号
-DocType: Quality Inspection Reading,Reading 7,阅读7
+DocType: Quality Inspection Reading,Reading 7,检验结果7
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,偏序
 DocType: Lab Test,Lab Test,实验室测试
-DocType: Student Report Generation Tool,Student Report Generation Tool,学生报告生成工具
+DocType: Student Report Generation Tool,Student Report Generation Tool,学生报表生成工具
 DocType: Expense Claim Detail,Expense Claim Type,报销类型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,购物车的默认设置
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +27,Add Timeslots,添加时代
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +140,Asset scrapped via Journal Entry {0},通过资产日记帐分录报废{0}
-DocType: Loan,Interest Income Account,利息收入账户
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +140,Asset scrapped via Journal Entry {0},通过资产手工凭证报废{0}
+DocType: Loan,Interest Income Account,利息收入科目
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +42,Max benefits should be greater than zero to dispense benefits,最大的好处应该大于零来分配好处
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.py +58,Review Invitation Sent,审核邀请已发送
-DocType: Shift Assignment,Shift Assignment,班次分配
-DocType: Employee Transfer Property,Employee Transfer Property,员工转移财产
+DocType: Shift Assignment,Shift Assignment,班别分配
+DocType: Employee Transfer Property,Employee Transfer Property,员工变动属性
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +13,Biotechnology,生物技术
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Office Maintenance Expenses,办公维护费用
 apps/erpnext/erpnext/utilities/user_progress.py +54,Go to ,去
-DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,将Shopify更新到ERPNext价目表
-apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,设置电子邮件帐户
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
+DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,将Shopify更新到ERPNext价格清单
+apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,设置电子邮件科目
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js +21,Please enter Item first,请先输入物料
 DocType: Asset Repair,Downtime,停机
 DocType: Account,Liability,负债
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +227,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +227,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,核准金额不能大于申报额行{0}。
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +11,Academic Term: ,学术期限：
-DocType: Salary Component,Do not include in total,不包括在内
+DocType: Salary Component,Do not include in total,不包括在总金额内
 DocType: Company,Default Cost of Goods Sold Account,默认销货成本科目
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1207,Sample quantity {0} cannot be more than received quantity {1},采样数量{0}不能超过接收数量{1}
 apps/erpnext/erpnext/stock/get_item_details.py +395,Price List not selected,价格列表没有选择
@@ -1226,23 +1226,23 @@
 DocType: Contract Fulfilment Checklist,Contract Fulfilment Checklist,合同履行清单
 apps/erpnext/erpnext/public/js/hub/hub_form.js +351,Quote Requested,引用要求
 DocType: Vital Signs,Heart Rate / Pulse,心率/脉搏
-DocType: Company,Default Bank Account,默认银行账户
+DocType: Company,Default Bank Account,默认银行科目
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +67,"To filter based on Party, select Party Type first",如果基于往来单位过滤，请先选择往来单位类型
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +46,'Update Stock' can not be checked because items are not delivered via {0},“库存更新'校验不通过，因为{0}中的退货条目未交付
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +46,'Update Stock' can not be checked because items are not delivered via {0},因为物料还未通过{0）交付，“库存更新'不能被勾选
 DocType: Vehicle,Acquisition Date,采集日期
 apps/erpnext/erpnext/utilities/user_progress.py +146,Nos,Nos
-DocType: Item,Items with higher weightage will be shown higher,具有较高权重的项目将显示更高的可
+DocType: Item,Items with higher weightage will be shown higher,具有较高权重的物料会优先显示在清单最上面
 apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +14,Lab Tests and Vital Signs,实验室测试和重要标志
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐明细
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,银行对帐信息
 apps/erpnext/erpnext/controllers/accounts_controller.py +646,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +49,No employee found,未找到任何雇员
-DocType: Item,If subcontracted to a vendor,如果分包给供应商
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +49,No employee found,未找到任何员工
+DocType: Item,If subcontracted to a vendor,针对外包给供应商的情况
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,学生组已经更新。
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +113,Student Group is already updated.,学生组已经更新。
 apps/erpnext/erpnext/config/projects.py +18,Project Update.,项目更新。
 DocType: SMS Center,All Customer Contact,所有的客户联系人
 DocType: Land Unit,Tree Details,树详细信息
-DocType: Training Event,Event Status,事件状态
+DocType: Training Event,Event Status,状态
 DocType: Volunteer,Availability Timeslot,可用时间段
 ,Support Analytics,客户支持分析
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +374,"If you have any questions, please get back to us.",如果您有任何疑问，请再次与我们联系。
@@ -1251,9 +1251,9 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不属于公司{3}
 apps/erpnext/erpnext/utilities/user_progress.py +92,Upload your letter head (Keep it web friendly as 900px by 100px),上传你的信头（保持网页友好，900px乘100px）
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帐户{2}不能是一个组
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}科目{2}不能是一个组
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +63,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +322,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +322,Timesheet {0} is already completed or cancelled,工时单{0}已完成或取消
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
 DocType: Item Variant Settings,Copy Fields to Variant,将字段复制到变式
 DocType: Asset,Opening Accumulated Depreciation,打开累计折旧
@@ -1264,41 +1264,41 @@
 apps/erpnext/erpnext/config/selling.py +322,Customer and Supplier,客户和供应商
 DocType: Email Digest,Email Digest Settings,邮件摘要设置
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +376,Thank you for your business!,感谢您的业务！
-apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,来自客户的支持记录。
-DocType: Employee Property History,Employee Property History,员工财产历史
+apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,回应客户咨询。
+DocType: Employee Property History,Employee Property History,员工属性历史
 DocType: Setup Progress Action,Action Doctype,行动Doctype
 DocType: HR Settings,Retirement Age,退休年龄
 DocType: Bin,Moving Average Rate,移动平均价格
-DocType: Production Plan,Select Items,选择品目
+DocType: Production Plan,Select Items,选择物料
 DocType: Share Transfer,To Shareholder,给股东
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +404,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Institution,设置机构
 DocType: Program Enrollment,Vehicle/Bus Number,车辆/巴士号码
 apps/erpnext/erpnext/education/doctype/course/course.js +17,Course Schedule,课程表
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +546,"You have to Deduct Tax for Unsubmitted Tax Exemption Proof and Unclaimed \
-					Employee Benefits in the last Salary Slip of Payroll Period",您必须在工资核算期的最后一个工资单上扣除未提交的免税证明和无人认领的\员工福利税
+					Employee Benefits in the last Salary Slip of Payroll Period",您必须在工资核算期最后一个工资单上扣除未提交免税证明和尚未申报员工福利对应的应纳税款
 DocType: Request for Quotation Supplier,Quote Status,报价状态
 DocType: GoCardless Settings,Webhooks Secret,Webhooks的秘密
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: Daily Work Summary Group,Select Users,选择用户
 DocType: Hotel Room Pricing Item,Hotel Room Pricing Item,酒店房间定价项目
 DocType: Loyalty Program Collection,Tier Name,等级名称
-DocType: HR Settings,Enter retirement age in years,在年内进入退休年龄
+DocType: HR Settings,Enter retirement age in years,输入退休年龄
 DocType: Crop,Target Warehouse,目标仓库
 DocType: Payroll Employee Detail,Payroll Employee Detail,薪资员工详细信息
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +135,Please select a warehouse,请选择一个仓库
 DocType: Cheque Print Template,Starting location from left edge,从左边起始位置
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
-DocType: Stock Entry,STE-,甜菊
+DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,导入考勤记录
-apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,所有品目群组
-DocType: Work Order,Item To Manufacture,要生产的项目
+apps/erpnext/erpnext/public/js/pos/pos.html +124,All Item Groups,所有物料群组
+DocType: Work Order,Item To Manufacture,待生产物料
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1}的状态为{2}
 DocType: Water Analysis,Collection Temperature ,收集温度
 DocType: Employee,Provide Email Address registered in company,提供公司注册邮箱地址
 DocType: Shopping Cart Settings,Enable Checkout,启用结帐
-apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,采购订单到付款
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,预计数量
+apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,从采购订单到付款
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,预期可用数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
 DocType: Drug Prescription,Interval UOM,间隔UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save",重新选择，如果所选地址在保存后被编辑
@@ -1307,87 +1307,87 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +135,'Opening',“打开”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Issue,Via Customer Portal,通过客户门户
-DocType: Notification Control,Delivery Note Message,送货单留言
+DocType: Notification Control,Delivery Note Message,销售出货单消息
 DocType: Lab Test Template,Result Format,结果格式
-DocType: Expense Claim,Expenses,开支
+DocType: Expense Claim,Expenses,费用
 DocType: Item Variant Attribute,Item Variant Attribute,产品规格属性
-,Purchase Receipt Trends,购买收据趋势
+,Purchase Receipt Trends,采购收货趋势
 DocType: Payroll Entry,Bimonthly,半月刊
 DocType: Vehicle Service,Brake Pad,刹车片
 DocType: Fertilizer,Fertilizer Contents,肥料含量
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +326,Research & Development,研究与发展
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,待开票金额
-DocType: Company,Registration Details,报名详情
+DocType: Company,Registration Details,工商注册信息
 DocType: Timesheet,Total Billed Amount,总开单金额
-DocType: Item Reorder,Re-Order Qty,再次订货数量
+DocType: Item Reorder,Re-Order Qty,再订货数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +94,BOM #{0}: Raw material cannot be same as main Item,物料清单＃{0}：原材料不能是BOM产出物料
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外购入库单项目表总的相关费用必须是相同的总税费
-DocType: Sales Team,Incentives,奖励
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +92,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,基于采购收货单信息计算的总税费必须与采购单（单头）的总税费一致
+DocType: Sales Team,Incentives,提成
 DocType: SMS Log,Requested Numbers,请求号码
 DocType: Volunteer,Evening,晚间
-DocType: Customer,Bypass credit limit check at Sales Order,在销售订单旁边绕过信贷限额检查
+DocType: Customer,Bypass credit limit check at Sales Order,不在销售订单做信用额度检查
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +106,"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 +448,"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 +448,"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 +332,Point-of-Sale,销售点
 DocType: Fee Schedule,Fee Creation Status,费用创建状态
 DocType: Vehicle Log,Odometer Reading,里程表读数
-apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",账户余额已设置为'贷方'，不能设置为'借方'
-DocType: Account,Balance must be,余额必须是
+apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",科目余额已设置为'贷方'，不能设置为'借方'
+DocType: Account,Balance must be,余额借贷方向属性
 DocType: Hub Settings,Publish Pricing,发布定价
-DocType: Notification Control,Expense Claim Rejected Message,报销拒绝消息
+DocType: Notification Control,Expense Claim Rejected Message,报销被拒原因
 ,Available Qty,可用数量
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,默认仓库到创建销售订单和交货单
 DocType: Purchase Taxes and Charges,On Previous Row Total,基于前一行的总计
-DocType: Purchase Invoice Item,Rejected Qty,被拒绝的数量
-DocType: Setup Progress Action,Action Field,行动领域
+DocType: Purchase Invoice Item,Rejected Qty,拒收数量
+DocType: Setup Progress Action,Action Field,操作字段
 DocType: Healthcare Settings,Manage Customer,管理客户
-DocType: Delivery Trip,Delivery Stops,交货停止
+DocType: Delivery Trip,Delivery Stops,交货站点
 DocType: Salary Slip,Working Days,工作日
-DocType: Serial No,Incoming Rate,入库价格
+DocType: Serial No,Incoming Rate,入库库存评估价
 DocType: Packing Slip,Gross Weight,毛重
-DocType: Leave Type,Encashment Threshold Days,封存阈值天数
+DocType: Leave Type,Encashment Threshold Days,最大允许折现天数
 ,Final Assessment Grades,最终评估等级
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +59,Enable Hub,启用集线器
 apps/erpnext/erpnext/public/js/setup_wizard.js +110,The name of your company for which you are setting up this system.,贵公司的名称
 DocType: HR Settings,Include holidays in Total no. of Working Days,将假期包含在工作日内
 apps/erpnext/erpnext/setup/setup_wizard/operations/sample_data.py +108,Setup your Institute in ERPNext,在ERPNext中设置您的研究所
 DocType: Agriculture Analysis Criteria,Plant Analysis,植物分析
-DocType: Job Applicant,Hold,持有
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +101,Alternate Item,替代项目
+DocType: Job Applicant,Hold,暂缓处理
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +101,Alternate Item,替代物料
 DocType: Project Update,Progress Details,进度细节
 DocType: Shopify Log,Request Data,请求数据
 DocType: Employee,Date of Joining,入职日期
 DocType: Naming Series,Update Series,更新系列
 DocType: Supplier Quotation,Is Subcontracted,是否外包
 DocType: Restaurant Table,Minimum Seating,最小的座位
-DocType: Item Attribute,Item Attribute Values,项目属性值
+DocType: Item Attribute,Item Attribute Values,物料属性值
 DocType: Examination Result,Examination Result,考试成绩
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +891,Purchase Receipt,外购入库单
-,Received Items To Be Billed,要支付的已收项目
-apps/erpnext/erpnext/config/accounts.py +309,Currency exchange rate master.,货币汇率大师
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +891,Purchase Receipt,采购收货单
+,Received Items To Be Billed,待开票已收货物料
+apps/erpnext/erpnext/config/accounts.py +309,Currency exchange rate master.,货币汇率主数据
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +210,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
 apps/erpnext/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js +46,Filter Total Zero Qty,过滤器总计零数量
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +375,Unable to find Time Slot in the next {0} days for Operation {1},在未来{0}天操作{1}无可用时间（档期）
 DocType: Work 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 +604,BOM {0} must be active,BOM{0}必须处于激活状态
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +423,No Items available for transfer,没有可用于传输的项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +423,No Items available for transfer,无可移转物料
 DocType: Employee Boarding Activity,Activity Name,活动名称
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +836,Change Release Date,更改发布日期
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +238,Closing (Opening + Total),闭幕（开幕+总计）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +836,Change Release Date,更改审批日期
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +238,Closing (Opening + Total),期末（期初+总计）
 DocType: Journal Entry,Depreciation Entry,折旧分录
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Please select the document type first,请选择文档类型第一
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Please select the document type first,请先选择文档类型
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
 DocType: Pricing Rule,Rate or Discount,价格或折扣
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Serial No {0} does not belong to Item {1},序列号{0}不属于品目{1}
-DocType: Purchase Receipt Item Supplied,Required Qty,所需数量
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Serial No {0} does not belong to Item {1},序列号{0}不属于物料{1}
+DocType: Purchase Receipt Item Supplied,Required Qty,需求数量
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +58,Favourites,最爱
 DocType: Hub Settings,Custom Data,自定义数据
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Warehouses with existing transaction can not be converted to ledger.,与现有的交易仓库不能转换到总帐。
-apps/erpnext/erpnext/controllers/buying_controller.py +553,Serial no is mandatory for the item {0},序列号对于项目{0}是强制性的
+apps/erpnext/erpnext/controllers/buying_controller.py +553,Serial no is mandatory for the item {0},物料{0}的序列号必填
 DocType: Bank Reconciliation,Total Amount,总金额
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +32,Internet Publishing,互联网出版
 DocType: Prescription Duration,Number,数
@@ -1395,31 +1395,31 @@
 DocType: Medical Code,Medical Code Standard,医疗代码标准
 DocType: Soil Texture,Clay Composition (%),粘土成分（％）
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +102,Please save before assigning task.,在分配任务之前请保存。
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,余额值
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +76,Balance Value,结余金额
 DocType: Lab Test,Lab Technician,实验室技术员
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,销售价格表
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Sales Price List,销售价格清单
 DocType: Healthcare Settings,"If checked, a customer will be created, mapped to Patient.
 Patient Invoices will be created against this Customer. You can also select existing Customer while creating Patient.",如果选中，将创建一个客户，映射到患者。将针对该客户创建病人发票。您也可以在创建患者时选择现有客户。
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +39,Customer isn't enrolled in any Loyalty Program,客户未加入任何忠诚度计划
-DocType: Bank Reconciliation,Account Currency,账户币种
+DocType: Bank Reconciliation,Account Currency,科目币种
 DocType: Lab Test,Sample ID,样品编号
 apps/erpnext/erpnext/accounts/general_ledger.py +167,Please mention Round Off Account in Company,请注明舍入账户的公司
 DocType: Purchase Receipt,Range,范围
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +52,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +52,Employee {0} is not active or does not exist,员工{0}未激活或不存在
 DocType: Fee Structure,Components,组件
 DocType: Support Search Source,Search Term Param Name,搜索字词Param Name
-DocType: Item Barcode,Item Barcode,品目条码
+DocType: Item Barcode,Item Barcode,物料条码
 DocType: Woocommerce Settings,Endpoints,端点
-apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item Variants {0} updated,项目变体{0}已更新
-DocType: Quality Inspection Reading,Reading 6,阅读6
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item Variants {0} updated,物料变体{0}已更新
+DocType: Quality Inspection Reading,Reading 6,检验结果6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,Cannot {0} {1} {2} without any negative outstanding invoice,没有未付发票（负数），无法{0} {1} {2}
 DocType: Share Transfer,From Folio No,来自Folio No
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,采购发票
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +231,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
-apps/erpnext/erpnext/config/accounts.py +252,Define budget for a financial year.,定义预算财政年度。
-DocType: Shopify Tax Account,ERPNext Account,ERPNext帐户
-DocType: Lead,LEAD-,铅-
+apps/erpnext/erpnext/config/accounts.py +252,Define budget for a financial year.,定义预算财务年度。
+DocType: Shopify Tax Account,ERPNext Account,ERPNext科目
+DocType: Lead,LEAD-,线索-
 apps/erpnext/erpnext/controllers/accounts_controller.py +54,{0} is blocked so this transaction cannot proceed,{0}被阻止，所以此事务无法继续
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded on MR,如果累计每月预算超过MR，则采取行动
 DocType: Employee,Permanent Address Is,永久地址
@@ -1428,65 +1428,65 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,The Brand,你的品牌
 DocType: Employee Tax Exemption Proof Submission,Rented To Date,迄今已售出
 DocType: Manufacturing Settings,Allow Multiple Material Consumption,允许多种材料消耗
-DocType: Employee,Exit Interview Details,退出面试细节
+DocType: Employee,Exit Interview Details,离职访谈信息
 DocType: Item,Is Purchase Item,可采购？
 DocType: Bank Statement Transaction Invoice Item,Purchase Invoice,采购发票
 DocType: Manufacturing Settings,Allow multiple Material Consumption against a Work Order,针对工作单允许多种材料消耗
-DocType: GL Entry,Voucher Detail No,凭证详情编号
+DocType: GL Entry,Voucher Detail No,凭证信息编号
 apps/erpnext/erpnext/accounts/page/pos/pos.js +800,New Sales Invoice,新的销售发票
 DocType: Stock Entry,Total Outgoing Value,总待付款价值
 DocType: Physician,Appointments,约会
-apps/erpnext/erpnext/public/js/account_tree_grid.js +223,Opening Date and Closing Date should be within same Fiscal Year,开幕日期和截止日期应在同一会计年度
+apps/erpnext/erpnext/public/js/account_tree_grid.js +223,Opening Date and Closing Date should be within same Fiscal Year,开帐日期和结帐日期应在同一会计年度
 DocType: Lead,Request for Information,索取资料
 ,LeaderBoard,排行榜
 DocType: Sales Invoice Item,Rate With Margin (Company Currency),利率保证金（公司货币）
 apps/erpnext/erpnext/accounts/page/pos/pos.js +813,Sync Offline Invoices,同步离线发票
-DocType: Payment Request,Paid,付费
+DocType: Payment Request,Paid,已付款
 DocType: Program Fee,Program Fee,课程费用
 DocType: BOM Update Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM.
 It also updates latest price in all the BOMs.",替换使用所有其他BOM的特定BOM。它将替换旧的BOM链接，更新成本，并按照新的BOM重新生成“BOM爆炸项目”表。它还更新了所有BOM中的最新价格。
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,The following Work Orders were created:,以下工作订单已创建：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +449,The following Work Orders were created:,以下工单已创建：
 DocType: Salary Slip,Total in words,总金额（文字）
 DocType: Material Request Item,Lead Time Date,交货时间日期
-,Employee Advance Summary,员工提前总结
+,Employee Advance Summary,员工预支汇总
 DocType: Asset,Available-for-use Date,可供使用的日期
 DocType: Guardian,Guardian Name,监护人姓名
 DocType: Cheque Print Template,Has Print Format,有打印格式
 DocType: Support Settings,Get Started Sections,入门部分
-DocType: Loan,Sanctioned,制裁
-apps/erpnext/erpnext/accounts/page/pos/pos.js +78, is mandatory. Maybe Currency Exchange record is not created for ,是强制性的。也许外币兑换记录没有创建
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请注明序号为项目{1}
+DocType: Loan,Sanctioned,核准
+apps/erpnext/erpnext/accounts/page/pos/pos.js +78, is mandatory. Maybe Currency Exchange record is not created for ,必填。也许外币汇率记录没有创建
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请为物料{1}指定序号
 DocType: Crop Cycle,Crop Cycle,作物周期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +648,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing 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: Student Admission,Publish on website,发布在网站上
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +720,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
 DocType: Subscription,Cancelation Date,取消日期
-DocType: Purchase Invoice Item,Purchase Order Item,采购订单项目
+DocType: Purchase Invoice Item,Purchase Order Item,采购订单项
 DocType: Agriculture Task,Agriculture Task,农业任务
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +139,Indirect Income,间接收益
 DocType: Student Attendance Tool,Student Attendance Tool,学生考勤工具
-DocType: Restaurant Menu,Price List (Auto created),价目表（自动创建）
+DocType: Restaurant Menu,Price List (Auto created),价格清单（自动创建）
 DocType: Cheque Print Template,Date Settings,日期设定
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +58,Variance,方差
-DocType: Employee Promotion,Employee Promotion Detail,员工促销细节
+DocType: Employee Promotion,Employee Promotion Detail,员工升职信息
 ,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-DocType: Share Balance,Purchased,购买
-DocType: Item Variant Settings,Rename Attribute Value in Item Attribute.,在项目属性中重命名属性值。
+DocType: Share Balance,Purchased,采购
+DocType: Item Variant Settings,Rename Attribute Value in Item Attribute.,在物料属性中重命名属性值。
 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: Agriculture Analysis Criteria,Soil Texture,土壤纹理
-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: Bank Reconciliation,Select account head of the bank where cheque was deposited.,请选择支票存入的银行户头。
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,允许用户编辑交易中的价格清单价格。
 DocType: Pricing Rule,Max Qty,最大数量
-apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js +25,Print Report Card,打印报告卡
+apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js +25,Print Report Card,打印报表卡
 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 +164,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +164,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：针对销售/采购订单收付款均须标记为预收/付
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +16,Chemical,化学品
-DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默认银行/现金帐户时，会选择此模式可以自动在工资日记条目更新。
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Total leaves allocated is mandatory for Leave Type {0},为假期类型{0}分配的总分配数是强制性的
-DocType: BOM,Raw Material Cost(Company Currency),原料成本（公司货币）
+DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默认银行/现金科目时，会选择此模式可以自动在工资日记条目更新。
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Total leaves allocated is mandatory for Leave Type {0},请填写休假类型{0}的总已分配休假天数
+DocType: BOM,Raw Material Cost(Company Currency),原材料成本（公司货币）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大于{1} {2}中使用的速率
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大于{1} {2}中使用的速率
 apps/erpnext/erpnext/utilities/user_progress.py +147,Meter,仪表
@@ -1522,23 +1522,23 @@
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的购物车
 apps/erpnext/erpnext/controllers/selling_controller.py +131,Order Type must be one of {0},订单类型必须是一个{0}
 DocType: Lead,Next Contact Date,下次联络日期
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,开放数量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Opening Qty,期初数量
 DocType: Healthcare Settings,Appointment Reminder,预约提醒
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +505,Please enter Account for Change Amount,对于涨跌额请输入帐号
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +505,Please enter Account for Change Amount,请输入零钱科目
 DocType: Program Enrollment Tool Student,Student Batch Name,学生批名
 DocType: Consultation,Doctor,医生
 DocType: Holiday List,Holiday List Name,假期列表名称
 DocType: Repayment Schedule,Balance Loan Amount,平衡贷款额
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +132,Added to details,添加到细节
-apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,课程时间表
-DocType: Budget,Applicable on Material Request,适用于材料请求
+apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,课程工时单
+DocType: Budget,Applicable on Material Request,适用于物料申请
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +217,Stock Options,库存选项
 DocType: Buying Settings,Disable Fetching Last Purchase Details in Purchase Order,取消采购订单中的上次采购详细信息
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +627,No Items added to cart,没有项目已添加到购物车
-DocType: Journal Entry Account,Expense Claim,报销
+DocType: Journal Entry Account,Expense Claim,费用报销
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +323,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产？
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +419,Qty for {0},{0}数量
-DocType: Leave Application,Leave Application,假期申请
+DocType: Leave Application,Leave Application,休假申请
 DocType: Patient,Patient Relation,患者关系
 DocType: Item,Hub Category to Publish,集线器类别发布
 DocType: Leave Block List,Leave Block List Dates,禁离日列表日期
@@ -1546,19 +1546,19 @@
 DocType: Employee Tax Exemption Proof Submission,Total Eligible HRA Exemption,合格的HRA豁免总数
 DocType: Assessment Plan,Evaluate,评估
 DocType: Workstation,Net Hour Rate,净小时价格
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本采购收据
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,到岸成本采购收货单
 DocType: Company,Default Terms,默认条款
 DocType: Supplier Scorecard Period,Criteria,标准
-DocType: Packing Slip Item,Packing Slip Item,装箱单项目
-DocType: Purchase Invoice,Cash/Bank Account,现金/银行账户
+DocType: Packing Slip Item,Packing Slip Item,装箱单项
+DocType: Purchase Invoice,Cash/Bank Account,现金/银行科目
 DocType: Travel Itinerary,Train,培养
 apps/erpnext/erpnext/public/js/queries.js +96,Please specify a {0},请指定{0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
 apps/erpnext/erpnext/stock/doctype/item/item.js +446,Variant creation has been queued.,变体创建已经排队。
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +100,Work Summary for {0},{0}的工作摘要
-DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一个请假批准者将被设置为默认的批准批准者。
-apps/erpnext/erpnext/stock/doctype/item/item.py +732,Attribute table is mandatory,属性表是强制性的
+DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,列表中的第一个将被设置为默认的休假审批人。
+apps/erpnext/erpnext/stock/doctype/item/item.py +732,Attribute table is mandatory,属性表中的信息必填
 DocType: Production Plan,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +69,{0} can not be negative,{0}不能为负
 DocType: Training Event,Self-Study,自习
@@ -1580,24 +1580,24 @@
 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/templates/pages/order.js +31,Pay Remaining,支付剩余
 DocType: Item,Manufacturer,制造商
-DocType: Landed Cost Item,Purchase Receipt Item,采购入库项目
-DocType: Leave Allocation,Total Leaves Encashed,总叶子被掩饰
+DocType: Landed Cost Item,Purchase Receipt Item,采购入库项
+DocType: Leave Allocation,Total Leaves Encashed,总折现天数
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
 DocType: POS Profile,Sales Invoice Payment,销售发票付款
 DocType: Quality Inspection Template,Quality Inspection Template Name,质量检验模板名称
-DocType: Project,First Email,第一邮件
+DocType: Project,First Email,第一封邮件
 DocType: Company,Exception Budget Approver Role,例外预算审批人角色
 DocType: Purchase Invoice,"Once set, this invoice will be on hold till the set date",一旦设置，该发票将被保留至设定的日期
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,销售金额
 DocType: Repayment Schedule,Interest Amount,利息总额
 DocType: Sales Invoice,Loyalty Amount,忠诚金额
-DocType: Employee Transfer,Employee Transfer Detail,员工转移详情
+DocType: Employee Transfer,Employee Transfer Detail,员工变动信息
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Share Transfer,Issue,问题
 apps/erpnext/erpnext/healthcare/doctype/consultation/consultation_dashboard.py +11,Records,记录
 DocType: Asset,Scrapped,报废
-DocType: Item,Item Defaults,项目默认值
+DocType: Item,Item Defaults,物料默认值
 DocType: Purchase Invoice,Returns,退货
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +42,WIP Warehouse,在制品仓库
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
@@ -1606,9 +1606,9 @@
 DocType: Support Settings,Show Latest Forum Posts,显示最新的论坛帖子
 DocType: Additional Salary,ASC-,ASC-
 DocType: Tax Rule,Shipping State,运输状态
-,Projected Quantity as Source,预计库存量的来源
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收据获取品目”添加
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +887,Delivery Trip,送货之旅
+,Projected Quantity as Source,基于预期可用库存
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收货单获取物料”添加
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +887,Delivery Trip,销售出货配送路线安排
 DocType: Student,A-,A-
 DocType: Share Transfer,Transfer Type,转移类型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +124,Sales Expenses,销售费用
@@ -1617,16 +1617,16 @@
 DocType: Attendance Request,Explanation,说明
 DocType: GL Entry,Against,针对
 DocType: Item Default,Sales Defaults,销售默认值
-DocType: Sales Order Item,Work Order Qty,工作订单数量
+DocType: Sales Order Item,Work Order Qty,工单数量
 DocType: Item Default,Default Selling Cost Center,默认销售成本中心
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +593,Disc,圆盘
 DocType: Buying Settings,Material Transferred for Subcontract,转包材料转让
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1635,ZIP Code,邮编
 apps/erpnext/erpnext/controllers/selling_controller.py +253,Sales Order {0} is {1},销售订单{0} {1}
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +303,Select interest income account in loan {0},选择贷款{0}中的利息收入帐户
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +303,Select interest income account in loan {0},选择贷款{0}中的利息收入科目
 DocType: Opportunity,Contact Info,联系方式
-apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,制作Stock条目
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,无法提升状态为Left的员工
+apps/erpnext/erpnext/config/stock.py +323,Making Stock Entries,创建手工库存移动
+apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py +15,Cannot promote Employee with status Left,状态为已离职的员工不能晋升
 DocType: Packing Slip,Net Weight UOM,净重计量单位
 DocType: Item Default,Default Supplier,默认供应商
 DocType: Loan,Repayment Schedule,还款计划
@@ -1641,20 +1641,20 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +27,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +13,This is a root supplier group and cannot be edited.,这是一个根源供应商组，无法编辑。
 DocType: Delivery Trip,Driver Name,司机姓名
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Average Age,平均年龄
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Average Age,平均库龄
 DocType: Education Settings,Attendance Freeze Date,出勤冻结日期
 DocType: Education Settings,Attendance Freeze Date,出勤冻结日期
 apps/erpnext/erpnext/utilities/user_progress.py +110,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/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低铅年龄（天）
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低铅年龄（天）
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,所有的材料明细表
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低线索时长（天）
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低线索时长 天）
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +60,All BOMs,全部物料清单
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py +35,Hotel Rooms of type {0} are unavailable on {1},{0}类型的酒店客房不适用于{1}
 DocType: Patient,Default Currency,默认货币
 DocType: Asset Movement,From Employee,来自员工
 DocType: Driver,Cellphone Number,手机号码
-DocType: Project,Monitor Progress,监视进度
-apps/erpnext/erpnext/controllers/accounts_controller.py +508,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
+DocType: Project,Monitor Progress,监控进度
+apps/erpnext/erpnext/controllers/accounts_controller.py +508,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物料{0}为零，系统将不会检查超额
 DocType: Journal Entry,Make Difference Entry,创建差异分录
 DocType: Supplier Quotation,Auto Repeat Section,自动重复部分
 DocType: Upload Attendance,Attendance From Date,考勤起始日期
@@ -1667,65 +1667,65 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +42,Maximum amount eligible for the component {0} exceeds {1},符合组件{0}的最高金额超过{1}
 DocType: Department Approver,Department Approver,部门批准人
 DocType: SMS Center,Total Characters,总字符
-DocType: Employee Advance,Claimed,声称
+DocType: Employee Advance,Claimed,已申报
 DocType: Crop,Row Spacing,行间距
-apps/erpnext/erpnext/controllers/buying_controller.py +175,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +22,There isn't any item variant for the selected item,所选项目没有任何项目变体
+apps/erpnext/erpnext/controllers/buying_controller.py +175,Please select BOM in BOM field for Item {0},请为物料{0}在主数据中设置BOM（字段）
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +22,There isn't any item variant for the selected item,所选物料无相关变体物料
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-形式发票详细信息
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款发票对账
 DocType: Clinical Procedure,Procedure Template,程序模板
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +39,Contribution %,贡献％
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根据购买设置，如果需要采购订单==&#39;是&#39;，那么为了创建采购发票，用户需要首先为项目{0}创建采购订单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +231,"As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}",根据采购设置，如果需要采购订单==&#39;是&#39;，那么为了创建采购发票，用户需要首先为项目{0}创建采购订单
 ,HSN-wise-summary of outward supplies,HSN明智的向外供应摘要
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,公司注册号码，供大家参考。税务号码等
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +145,Distributor,经销商
-DocType: Asset Finance Book,Asset Finance Book,资产融资书
+DocType: Asset Finance Book,Asset Finance Book,账簿
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
-apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',请设置“额外折扣基于”
 DocType: Party Tax Withholding Config,Applicable Percent,适用百分比
-,Ordered Items To Be Billed,订购物品被标榜
+,Ordered Items To Be Billed,待开票已订货物料
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,从范围必须小于要范围
 DocType: Global Defaults,Global Defaults,全局默认值
 apps/erpnext/erpnext/projects/doctype/project/project.py +270,Project Collaboration Invitation,项目合作邀请
-DocType: Salary Slip,Deductions,扣款列表
+DocType: Salary Slip,Deductions,扣除列表
 DocType: Leave Allocation,LAL/,LAL /
 DocType: Setup Progress Action,Action Name,动作名称
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +17,Start Year,开始年份
 apps/erpnext/erpnext/regional/india/utils.py +28,First 2 digits of GSTIN should match with State number {0},GSTIN的前2位数字应与状态号{0}匹配
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,PDC / LC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +81,PDC/LC,部分支付
 DocType: Purchase Invoice,Start date of current invoice's period,当前发票周期的起始日期
-DocType: Salary Slip,Leave Without Pay,无薪假期
+DocType: Salary Slip,Leave Without Pay,无薪休假
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +419,Capacity Planning Error,容量规划错误
 ,Trial Balance for Party,往来单位试算平衡表
 DocType: Lead,Consultant,顾问
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +356,Parents Teacher Meeting Attendance,家长老师见面会
-DocType: Salary Slip,Earnings,盈余
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +500,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
-apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,打开会计平衡
-,GST Sales Register,消费税销售登记册
+DocType: Salary Slip,Earnings,收入
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +500,Finished Item {0} must be entered for Manufacture type entry,生产制造类库存移动，请输入生产入库物料{0}
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,初始科目余额
+,GST Sales Register,销售台账（GST)
 DocType: Sales Invoice Advance,Sales Invoice Advance,销售发票预付款
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +552,Nothing to request,没有申请内容
 apps/erpnext/erpnext/public/js/setup_wizard.js +18,Select your Domains,选择您的域名
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py +228,Shopify Supplier,Shopify供应商
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +36,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一个预算记录“{0}”已存在对{1}“{2}”为年度{3}
-DocType: Bank Statement Transaction Entry,Payment Invoice Items,付款发票项目
-DocType: Travel Request,Employee Details,雇员详细信息
+DocType: Bank Statement Transaction Entry,Payment Invoice Items,付款发票项
+DocType: Travel Request,Employee Details,员工详细信息
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,字段将仅在创建时复制。
 DocType: Setup Progress Action,Domains,域
 apps/erpnext/erpnext/projects/doctype/task/task.py +41,'Actual Start Date' can not be greater than 'Actual End Date',“实际开始日期”不能大于“实际结束日期'
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +324,Management,管理人员
 DocType: Cheque Print Template,Payer Settings,付款人设置
 apps/erpnext/erpnext/public/js/utils/party.js +192,Select company first,首先选择公司
-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: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到物料变式。例如，如果你的英文缩写为“SM”，而该物料代码是“T-SHIRT”，该变式的物料代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
-DocType: Delivery Note,Is Return,再来
+DocType: Delivery Note,Is Return,退货？
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +93,Caution,警告
 apps/erpnext/erpnext/agriculture/doctype/disease/disease.py +17,Start day is greater than end day in task '{0}',开始日期大于任务“{0}”的结束日期
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +862,Return / Debit Note,退货/借记单
-DocType: Price List Country,Price List Country,价目表国家
+DocType: Price List Country,Price List Country,价格清单国家
 DocType: Item,UOMs,计量单位
-apps/erpnext/erpnext/stock/utils.py +238,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +59,Item Code cannot be changed for Serial No.,项目编号不能因序列号改变
+apps/erpnext/erpnext/stock/utils.py +238,{0} valid serial nos for Item {1},物料{1}有{0}个有效序列号
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +59,Item Code cannot be changed for Serial No.,物料代码不能因序列号改变
 DocType: Purchase Invoice Item,UOM Conversion Factor,计量单位换算系数
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +9,Please enter Item Code to get Batch Number,请输入产品代码来获得批号
 DocType: Loyalty Point Entry,Loyalty Point Entry,忠诚度积分
@@ -1735,56 +1735,55 @@
 DocType: Contract Template,Contract Terms and Conditions,合同条款和条件
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +423,You cannot restart a Subscription that is not cancelled.,您无法重新启动未取消的订阅。
 DocType: Account,Balance Sheet,资产负债表
-DocType: Leave Type,Is Earned Leave,获得休假
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +784,Cost Center For Item with Item Code ',成本中心：品目代码‘
+DocType: Leave Type,Is Earned Leave,是年假？有薪假
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +784,Cost Center For Item with Item Code ',成本中心：物料代码‘
 DocType: Fee Validity,Valid Till,有效期至
 DocType: Student Report Generation Tool,Total Parents Teacher Meeting,总计家长教师会议
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2524,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查付款方式或POS机配置中有设置账户。
-apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一项目不能输入多次。
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2524,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查付款方式或POS配置中是否设置了科目。
+apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一物料不能输入多次。
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +30,"Further accounts can be made under Groups, but entries can be made against non-Groups",更多的科目可以归属到一个群组类的科目下，但会计凭证中只能使用非群组类的科目
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
 DocType: Course,Course Intro,课程介绍
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +105,Stock Entry {0} created,库存输入{0}创建
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +105,Stock Entry {0} created,手工库存移动{0}已创建
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +106,You don't have enought Loyalty Points to redeem,您没有获得忠诚度积分兑换
-apps/erpnext/erpnext/controllers/buying_controller.py +376,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
+apps/erpnext/erpnext/controllers/buying_controller.py +376,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒收数量不能包含在采购退货数量中
 apps/erpnext/erpnext/stock/doctype/item/item.js +197,Changing Customer Group for the selected Customer is not allowed.,不允许更改所选客户的客户组。
-,Purchase Order Items To Be Billed,待开票采购订单明细
+,Purchase Order Items To Be Billed,待开票采购订单项
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +71,Updating estimated arrival times.,更新预计到达时间。
-DocType: Program Enrollment Tool,Enrollment Details,注册详情
-DocType: Purchase Invoice Item,Net Rate,净费率
+DocType: Program Enrollment Tool,Enrollment Details,注册信息
+DocType: Purchase Invoice Item,Net Rate,净单价
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +194,Please select a customer,请选择一个客户
-DocType: Purchase Invoice Item,Purchase Invoice Item,采购发票项目
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,采购收据不能在存库分类帐分录和日记账分录下重复提交
+DocType: Purchase Invoice Item,Purchase Invoice Item,采购发票项
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,为所选采购收货单重新产生了库存和会计总帐凭证
 DocType: Student Report Generation Tool,Assessment Terms,评估条款
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,项目1
 DocType: Holiday,Holiday,假期
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,离开类型是疯狂的
+apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +25,Leave Type is madatory,休假类型必填
 DocType: Support Settings,Close Issue After Days,关闭问题天后
-DocType: Leave Control Panel,Leave blank if considered for all branches,如果针对所有分支请留空
-DocType: Job Opening,Staffing Plan,人员配备计划
-DocType: Bank Guarantee,Validity in Days,天数有效
-DocType: Bank Guarantee,Validity in Days,天数有效
+DocType: Leave Control Panel,Leave blank if considered for all branches,如果针对所有分支机构请留空
+DocType: Job Opening,Staffing Plan,人力需求计划
+DocType: Bank Guarantee,Validity in Days,有效天数
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-形式不适用发票：{0}
 DocType: Certified Consultant,Name of Consultant,顾问的名字
-DocType: Payment Reconciliation,Unreconciled Payment Details,未核销付款详情
+DocType: Payment Reconciliation,Unreconciled Payment Details,未核销付款信息
 apps/erpnext/erpnext/non_profit/doctype/member/member_dashboard.py +6,Member Activity,会员活动
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,订单数量
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,订单数量
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Purchase Invoice,Group same items,合并相同物料
-DocType: Purchase Invoice,Disable Rounded Total,禁用元整后金额
-DocType: Department,Parent Department,家长部门
+DocType: Purchase Invoice,Disable Rounded Total,禁用圆整后金额
+DocType: Department,Parent Department,上级部门
 DocType: Loan Application,Repayment Info,还款信息
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +481,'Entries' cannot be empty,“分录”不能为空
 DocType: Maintenance Team Member,Maintenance Role,维护角色
 apps/erpnext/erpnext/utilities/transaction_base.py +86,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算平衡表
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +510,Fiscal Year {0} not found,会计年度{0}未找到
-apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,建立职工
-DocType: Sales Order,SO-,所以-
+apps/erpnext/erpnext/config/hr.py +394,Setting up Employees,建立员工
+DocType: Sales Order,SO-,SO-
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店预订用户
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,请选择前缀第一
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +158,Please select prefix first,请先选择前缀
 DocType: Contract,Fulfilment Deadline,履行截止日期
 DocType: Student,O-,O-
 DocType: Subscription Settings,Subscription Settings,订阅设置
@@ -1800,84 +1799,84 @@
 DocType: Grading Scale,Intervals,间隔
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,协调的事务
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +42,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +542,"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 +542,"An Item Group exists with same name, please change the item name or rename the item group",同名物料群组已存在，请修改物料名或群组名
 DocType: Crop Cycle,Less than a year,不到一年
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py +52,Student Mobile No.,学生手机号码
 apps/erpnext/erpnext/setup/setup_wizard/operations/defaults_setup.py +102,Rest Of The World,世界其他地区
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物料{0}不能有批次
 DocType: Crop,Yield UOM,产量UOM
-,Budget Variance Report,预算差异报告
+,Budget Variance Report,预算差异报表
 DocType: Salary Slip,Gross Pay,工资总额
 DocType: Item,Is Item from Hub,是来自Hub的Item
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Activity Type is mandatory.,行{0}：活动类型是强制性的。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Dividends Paid,股利支付
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +39,Accounting Ledger,会计总帐
 DocType: Asset Value Adjustment,Difference Amount,差额
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +109,Dr {0} on Leave on {1},在{1}上留下博士{0}
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +109,Dr {0} on Leave on {1},医生{0}在{1}休假
 DocType: Purchase Invoice,Reverse Charge,反向充电
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +182,Retained Earnings,留存收益
 DocType: Purchase Invoice,05-Change in POS,05-更改POS
 DocType: Vehicle Log,Service Detail,服务细节
-DocType: BOM,Item Description,项目说明
+DocType: BOM,Item Description,物料描述
 DocType: Student Sibling,Student Sibling,学生兄弟
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py +20,Payment Mode,付款方式
-DocType: Purchase Invoice,Supplied Items,供应的品目
+DocType: Purchase Invoice,Supplied Items,供应的物料
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +85,Please set an active menu for Restaurant {0},请设置餐馆{0}的有效菜单
 DocType: Student,STUD.,螺柱。
 DocType: Work Order,Qty To Manufacture,生产数量
 DocType: Email Digest,New Income,新的收入
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整个采购周期使用同一价格
-DocType: Opportunity Item,Opportunity Item,项目的机会
+DocType: Opportunity Item,Opportunity Item,机会项（行）
 ,Student and Guardian Contact Details,学生和监护人联系方式
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +53,Row {0}: For supplier {0} Email Address is required to send email,行{0}：对于供应商{0}的电邮地址发送电子邮件
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +76,Temporary Opening,临时开通
-,Employee Leave Balance,雇员假期余量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +76,Temporary Opening,临时开账
+,Employee Leave Balance,员工休假余额（天数）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},科目{0}的余额必须是{1}
 DocType: Patient Appointment,More Info,更多信息
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +181,Valuation Rate required for Item in row {0},请为第{0}行的物料维护评估价
 DocType: Supplier Scorecard,Scorecard Actions,记分卡操作
 apps/erpnext/erpnext/utilities/user_progress.py +169,Example: Masters in Computer Science,举例：硕士计算机科学
-DocType: Purchase Invoice,Rejected Warehouse,拒绝仓库
-DocType: GL Entry,Against Voucher,对凭证
+DocType: Purchase Invoice,Rejected Warehouse,拒收仓库
+DocType: GL Entry,Against Voucher,凭证
 DocType: Item Default,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 +79, to ,至
-DocType: Supplier Quotation Item,Lead Time in days,在天交货期
+DocType: Supplier Quotation Item,Lead Time in days,交期（天）
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +76,Accounts Payable Summary,应付帐款摘要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},无权修改冻结科目{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未付发票
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +92,Sales Order {0} is not valid,销售订单{0}无效
 DocType: Supplier Scorecard,Warn for new Request for Quotations,警告新的报价请求
-apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
+apps/erpnext/erpnext/utilities/activation.py +91,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的采购
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +151,Lab Test Prescriptions,实验室测试处方
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +168,"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/operations/install_fixtures.py +172,Small,小
 DocType: Shopify Settings,"If Shopify not contains a customer in Order, then while syncing Orders, the system will consider default customer for order",如果Shopify不包含订单中的客户，则在同步订单时，系统会考虑默认客户订单
-DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,打开发票创建工具项目
-DocType: Education Settings,Employee Number,雇员编号
+DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,发票创建工具项
+DocType: Education Settings,Employee Number,员工编号
 DocType: Subscription Settings,Cancel Invoice After Grace Period,在宽限期后取消发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +67,Case No(s) already in use. Try from Case No {0},箱号已被使用，请尝试从{0}开始
 DocType: Project,% Completed,% 已完成
-,Invoiced Amount (Exculsive Tax),已开票金额（未含税）
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,项目2
+,Invoiced Amount (Exculsive Tax),发票金额（未含税）
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,物料2
 DocType: Supplier,SUPP-,SUPP-
 DocType: Travel Request,International,国际
-DocType: Training Event,Training Event,培训活动
-DocType: Item,Auto re-order,自动重新排序
+DocType: Training Event,Training Event,培训
+DocType: Item,Auto re-order,自动重订货
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,总体上实现
 DocType: Employee,Place of Issue,签发地点
 DocType: Contract,Contract,合同
 DocType: Plant Analysis,Laboratory Testing Datetime,实验室测试日期时间
 DocType: Email Digest,Add Quote,添加报价
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1166,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1166,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 +99,Indirect Expenses,间接支出
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row {0}: Qty is mandatory,行{0}：数量是强制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row {0}: Qty is mandatory,第{0}行的数量字段必填
 DocType: Agriculture Analysis Criteria,Agriculture,农业
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +15,Create Sales Order,创建销售订单
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +493,Accounting Entry for Asset,资产会计分录
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +847,Block Invoice,阻止发票
-apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js +16,Quantity to Make,数量
+apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.js +16,Quantity to Make,待生产数量
 apps/erpnext/erpnext/accounts/page/pos/pos.js +805,Sync Master Data,同步主数据
 DocType: Asset Repair,Repair Cost,修理费用
 apps/erpnext/erpnext/utilities/user_progress.py +138,Your Products or Services,您的产品或服务
@@ -1892,41 +1891,41 @@
 DocType: Journal Entry Account,Purchase Order,采购订单
 DocType: Vehicle,Fuel UOM,燃油计量单位
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
-DocType: Payment Entry,Write Off Difference Amount,核销金额差异
+DocType: Payment Entry,Write Off Difference Amount,销帐差异金额
 DocType: Volunteer,Volunteer Name,志愿者姓名
-DocType: Leave Period,Carry Forward Leaves,继续离开
+DocType: Leave Period,Carry Forward Leaves,休假天数结转
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +511,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +56,No Salary Structure assigned for Employee {0} on given date {1},给定日期{1}的员工{0}没有分配薪金结构
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +85,Shipping rule not applicable for country {0},运费规则不适用于国家/地区{0}
 DocType: Item,Foreign Trade Details,外贸详细
 ,Assessment Plan Status,评估计划状态
 DocType: Email Digest,Annual Income,年收入
-DocType: Serial No,Serial No Details,序列号详情
-DocType: Purchase Invoice Item,Item Tax Rate,项目税率
+DocType: Serial No,Serial No Details,序列号信息
+DocType: Purchase Invoice Item,Item Tax Rate,物料税率
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +104,Please select Physician and Date,请选择医师和日期
 DocType: Student Group Student,Group Roll Number,组卷编号
 DocType: Student Group Student,Group Roll Number,组卷编号
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +177,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +177,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方科目
 apps/erpnext/erpnext/projects/doctype/project/project.py +85,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +615,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +615,Delivery Note {0} is not submitted,销售出货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +158,Item {0} must be a Sub-contracted Item,项目{0}必须是外包项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Capital Equipments,资本设备
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +264,Please set the Item Code first,请先设定商品代码
-DocType: Item,ITEM-,项目-
+DocType: Item,ITEM-,物料-
 apps/erpnext/erpnext/controllers/selling_controller.py +124,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
 DocType: Subscription Plan,Billing Interval Count,计费间隔计数
-apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +135,Value missing,价值缺失
-DocType: Employee,Department and Grade,部门和年级
+apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +135,Value missing,栏位值缺失
+DocType: Employee,Department and Grade,部门和职级
 DocType: Sales Invoice Item,Edit Description,编辑说明
 DocType: Antibiotic,Antibiotic,抗生素
 ,Team Updates,团队更新
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +936,For Supplier,对供应商
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,设置帐户类型有助于在交易中选择该帐户。
+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/education/doctype/fee_schedule/fee_schedule_list.js +5,Fee Created,创建费用
-apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},没有找到所谓的任何项目{0}
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},没有找到名字为{0}的物料
 DocType: Supplier Scorecard Criteria,Criteria Formula,标准配方
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,总待付款
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +39,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",“至值”为0或为空的运输规则条件最多只能有一个
@@ -1934,21 +1933,21 @@
 DocType: Patient Appointment,Duration,持续时间
 apps/erpnext/erpnext/controllers/status_updater.py +160,"For an item {0}, quantity must be positive number",对于商品{0}，数量必须是正数
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +76,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：此成本中心是一个组，会计分录不能对组录入。
-apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +44,Compensatory leave request days not in valid holidays,补休请求天不在有效假期
+apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +44,Compensatory leave request days not in valid holidays,补休假申请日不是有效假期内
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +53,Child warehouse exists for this warehouse. You can not delete this warehouse.,儿童仓库存在这个仓库。您不能删除这个仓库。
-DocType: Item,Website Item Groups,网站物件组
-DocType: Purchase Invoice,Total (Company Currency),总（公司货币）
+DocType: Item,Website Item Groups,网站物料组
+DocType: Purchase Invoice,Total (Company Currency),总金额（公司货币）
 DocType: Daily Work Summary Group,Reminder,提醒
 apps/erpnext/erpnext/stock/utils.py +233,Serial number {0} entered more than once,序列号{0}已多次输入
-DocType: Bank Statement Transaction Invoice Item,Journal Entry,日记帐分录
-DocType: Expense Claim Advance,Unclaimed amount,无人认领的金额
+DocType: Bank Statement Transaction Invoice Item,Journal Entry,手工凭证
+DocType: Expense Claim Advance,Unclaimed amount,未申报金额
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +165,{0} items in progress,{0}处理项
 DocType: Workstation,Workstation Name,工作站名称
 DocType: Grading Scale Interval,Grade Code,等级代码
-DocType: POS Item Group,POS Item Group,POS项目组
+DocType: POS Item Group,POS Item Group,POS物料组
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,替代项目不能与项目代码相同
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +620,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +23,Alternative item must not be same as item code,替代物料不能与物料代码相同
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +620,BOM {0} does not belong to Item {1},BOM{0}不属于物料{1}
 DocType: Sales Partner,Target Distribution,目标分布
 DocType: Purchase Invoice,06-Finalization of Provisional assessment,06-定期评估
 DocType: Salary Slip,Bank Account No.,银行账号
@@ -1959,10 +1958,9 @@
 ",可以使用记分卡变量，以及：{total_score}（该期间的总分数），{period_number}（到当前时间段的数量）
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Collapse All,全部收缩
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +27,Create Purchase Order,创建采购订单
-DocType: Quality Inspection Reading,Reading 8,阅读8
+DocType: Quality Inspection Reading,Reading 8,检验结果8
 DocType: Purchase Invoice,Taxes and Charges Calculation,税费计算
-DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自动存入资产折旧条目
-DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自动存入资产折旧条目
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自动生成固定资产折旧凭证
 DocType: BOM Operation,Workstation,工作站
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,询价供应商
 DocType: Healthcare Settings,Registration Message,注册信息
@@ -1977,15 +1975,15 @@
 DocType: Payment Entry,Writeoff,注销
 DocType: Stock Settings,Naming Series Prefix,命名系列前缀
 DocType: Appraisal Template Goal,Appraisal Template Goal,评估目标模板
-DocType: Salary Component,Earning,盈余
+DocType: Salary Component,Earning,收入
 DocType: Supplier Scorecard,Scoring Criteria,评分标准
 DocType: Purchase Invoice,Party Account Currency,往来单位科目币种
 ,BOM Browser,BOM浏览器
-apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,请更新此培训活动的状态
+apps/erpnext/erpnext/templates/emails/training_event.html +13,Please update your status for this training event,请更新此培训的状态
 DocType: Item Barcode,EAN,EAN
 DocType: Purchase Taxes and Charges,Add or Deduct,添加或扣除
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +148,Overlapping conditions found between:,之间存在重叠的条件：
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,手工凭证{0}已经被其他凭证调整
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,总订单价值
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +63,Ageing Range 3,账龄范围3
@@ -1994,11 +1992,11 @@
 DocType: Maintenance Schedule Item,No of Visits,访问数量
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},针对{1}存在维护计划{0}
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +36,Enrolling student,招生学生
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭帐户的货币必须是{0}
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭科目的货币必须是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},对所有目标点的总和应该是100。{0}
 DocType: Project,Start and End Dates,开始和结束日期
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,合同模板履行条款
-,Delivered Items To Be Billed,无开账单的已交付品目
+,Delivered Items To Be Billed,待开票已出货物料
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},开放BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +62,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
 DocType: Authorization Rule,Average Discount,平均折扣
@@ -2008,13 +2006,13 @@
 DocType: Rename Tool,Utilities,公用事业
 DocType: POS Profile,Accounting,会计
 DocType: Employee,EMP/,EMP /
-DocType: Asset,Purchase Receipt Amount,采购收据金额
-DocType: Employee Separation,Exit Interview Summary,退出面试摘要
+DocType: Asset,Purchase Receipt Amount,采购收货单金额
+DocType: Employee Separation,Exit Interview Summary,离职访谈摘要
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +140,Please select batches for batched item ,请为批量选择批次
 DocType: Asset,Depreciation Schedules,折旧计划
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +37,"Support for public app is deprecated. Please setup private app, for more details refer user manual",对公共应用程序的支持已被弃用。请设置私人应用程序，更多详细信息请参阅用户手册
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +196,Following accounts might be selected in GST Settings:,以下帐户可能在GST设置中选择：
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +102,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +196,Following accounts might be selected in GST Settings:,以下科目可能在GST设置中选择：
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +102,Application period cannot be outside leave allocation period,申请期间须在休假分配周期内
 DocType: Activity Cost,Projects,项目
 DocType: Payment Request,Transaction Currency,交易货币
 apps/erpnext/erpnext/controllers/buying_controller.py +33,From {0} | {1} {2},来自{0} | {1} {2}
@@ -2023,7 +2021,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,财年保存后便不能更改财年开始日期和结束日期
 DocType: Quotation,Shopping Cart,购物车
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均每日出货
-DocType: POS Profile,Campaign,活动
+DocType: POS Profile,Campaign,促销活动
 DocType: Supplier,Name and Type,名称和类型
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +64,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
 DocType: Physician,Contacts and Address,联系人和地址
@@ -2033,24 +2031,24 @@
 DocType: Course Scheduling Tool,Course End Date,课程结束日期
 DocType: Holiday List,Holidays,假期
 DocType: Sales Order Item,Planned Quantity,计划数量
-DocType: Purchase Invoice Item,Item Tax Amount,项目税额
+DocType: Purchase Invoice Item,Item Tax Amount,物料税额
 DocType: Water Analysis,Water Analysis Criteria,水分析标准
-DocType: Item,Maintain Stock,库存维护
+DocType: Item,Maintain Stock,管理库存
 DocType: Employee,Prefered Email,首选电子邮件
 DocType: Student Admission,Eligibility and Details,资格和细节
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +92,Net Change in Fixed Asset,在固定资产净变动
 apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +38,Reqd Qty,需要数量
 DocType: Leave Control Panel,Leave blank if considered for all designations,如果针对所有 职位请留空
-apps/erpnext/erpnext/controllers/accounts_controller.py +841,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
+apps/erpnext/erpnext/controllers/accounts_controller.py +841,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“物料税率”
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +420,Max: {0},最大值：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,起始时间日期
-DocType: Shopify Settings,For Company,对公司
+DocType: Shopify Settings,For Company,公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +195,"Request for Quotation is disabled to access from portal, for more check portal settings.",询价被禁止访问门脉，为更多的检查门户设置。
 DocType: Supplier Scorecard Scoring Variable,Supplier Scorecard Scoring Variable,供应商记分卡评分变量
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,采购数量
 DocType: POS Closing Voucher,Modes of Payment,付款方式
-DocType: Sales Invoice,Shipping Address Name,送货地址姓名
+DocType: Sales Invoice,Shipping Address Name,销售出货地址
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +18,There were errors creating Course Schedule,创建课程表时出现错误
 DocType: Department,The first Expense Approver in the list will be set as the default Expense Approver.,列表中的第一个费用审批人将被设置为默认的费用审批人。
@@ -2058,47 +2056,47 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +788,Item {0} is not a stock Item,物料{0}不是库存物料
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
-DocType: Salary Component,Depends on Leave Without Pay,依赖于无薪休假
+DocType: Salary Component,Depends on Leave Without Pay,基于无薪休假
 DocType: Pricing Rule,"Higher the number, higher the priority",数字越大，优先级越高
-,Purchase Invoice Trends,购买发票趋势
+,Purchase Invoice Trends,采购发票趋势
 DocType: Employee,Better Prospects,更好的前景
 DocType: Travel Itinerary,Gluten Free,不含麸质
 DocType: Loyalty Program Collection,Minimum Total Spent,最低总支出
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +222,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}数量。请选择具有{3}数量的其他批次，或将该行拆分成多个行，以便从多个批次中传递/发布
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +222,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}数量。请选择具有{3}数量的其他批次，或将该行拆分成多行，以便从多个批次出货/发料
 DocType: Loyalty Program,Expiry Duration (in days),到期时间（天）
 DocType: Vehicle,License Plate,牌照
 apps/erpnext/erpnext/hr/doctype/department/department_tree.js +18,New Department,新部门
-DocType: Compensatory Leave Request,Worked On Holiday,在度假工作
-DocType: Appraisal,Goals,目标
+DocType: Compensatory Leave Request,Worked On Holiday,假期内加班
+DocType: Appraisal,Goals,绩效指标
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +399,Select POS Profile,选择POS配置文件
 DocType: Warranty Claim,Warranty / AMC Status,保修/ 年度保养合同状态
 ,Accounts Browser,科目列表
 DocType: Payment Entry Reference,Payment Entry Reference,付款参考
 DocType: GL Entry,GL Entry,总账分录
 DocType: Support Search Source,Response Options,响应选项
-DocType: HR Settings,Employee Settings,雇员设置
+DocType: HR Settings,Employee Settings,员工设置
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.html +13,Loading Payment System,加载支付系统
-,Batch-Wise Balance History,批次余额历史
+,Batch-Wise Balance History,物料批号结余数量历史记录
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印设置在相应的打印格式更新
 DocType: Package Code,Package Code,封装代码
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +108,Apprentice,学徒
 DocType: Purchase Invoice,Company GSTIN,公司GSTIN
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,负数量是不允许的
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
-Used for Taxes and Charges",从物件大师取得税项详细信息表，嵌入在此字段内。用作税金和费用。
+Used for Taxes and Charges",从物料主数据中取得税项详细信息表并转换为字符串存入此字段内。用作税金和费用。
 DocType: Supplier Scorecard Period,SSC-,SSC-
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +164,Employee cannot report to himself.,雇员不能向自己报告。
-DocType: Leave Type,Max Leaves Allowed,允许最大叶子
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +164,Employee cannot report to himself.,员工不能向自己报表。
+DocType: Leave Type,Max Leaves Allowed,允许最大休假
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果科目被冻结，则只有特定用户才能创建分录。
 DocType: Email Digest,Bank Balance,银行存款余额
 apps/erpnext/erpnext/accounts/party.py +252,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
-DocType: HR Settings,Leave Approver Mandatory In Leave Application,在离职申请中允许Approver为强制性
+DocType: HR Settings,Leave Approver Mandatory In Leave Application,在离职申请中休假审批人字段必填
 DocType: Job Opening,"Job profile, qualifications required etc.",工作概况，要求的学历等。
-DocType: Journal Entry Account,Account Balance,账户余额
+DocType: Journal Entry Account,Account Balance,科目余额
 apps/erpnext/erpnext/config/accounts.py +189,Tax Rule for transactions.,税收规则进行的交易。
 DocType: Rename Tool,Type of document to rename.,需重命名的文件类型。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客户支付的应收账款{2}
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),总税费和费用（公司货币）
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),总税/费（公司货币）
 DocType: Weather,Weather Parameter,天气参数
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,显示未关闭的会计年度的盈亏平衡
 DocType: Item,Asset Naming Series,资产命名系列
@@ -2107,12 +2105,12 @@
 DocType: Clinical Procedure Template,Collection Details,收集细节
 DocType: POS Profile,Allow Print Before Pay,付款前允许打印
 DocType: Land Unit,Linked Soil Texture,连接的土壤纹理
-DocType: Shipping Rule,Shipping Account,送货账户
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: 帐户{2}无效
-apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,制作销售订单，以帮助你计划你的工作和按时交付
+DocType: Shipping Rule,Shipping Account,销售出货账户
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: 科目{2}无效
+apps/erpnext/erpnext/utilities/activation.py +82,Make Sales Orders to help you plan your work and deliver on-time,创建销售订单，以帮助你计划你的工作和按时交付
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;地区
 DocType: Bank Statement Transaction Entry,Bank Transaction Entries,银行交易分录
-DocType: Quality Inspection,Readings,阅读
+DocType: Quality Inspection,Readings,检验结果
 DocType: Stock Entry,Total Additional Costs,总额外费用
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),废料成本（公司货币）
@@ -2139,32 +2137,32 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +20,{0} is not in a valid Payroll Period,{0}不在有效的工资核算期间
 DocType: Employee Benefit Application,Max Benefits (Yearly),最大收益（每年）
 DocType: Item,Inventory,库存
-DocType: Item,Sales Details,销售详情
+DocType: Item,Sales Details,销售信息
 DocType: Quality Inspection,QI-,QI-
-DocType: Opportunity,With Items,随着项目
+DocType: Opportunity,With Items,物料
 DocType: Asset Maintenance,Maintenance Team,维修队
-DocType: Salary Component,Is Additional Component,是附加组件
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,在数量
+DocType: Salary Component,Is Additional Component,是额外薪资？
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,In Qty,数量
 DocType: Education Settings,Validate Enrolled Course for Students in Student Group,验证学生组学生入学课程
-DocType: Notification Control,Expense Claim Rejected,报销拒绝
-DocType: Item,Item Attribute,项目属性
+DocType: Notification Control,Expense Claim Rejected,报销被拒
+DocType: Item,Item Attribute,物料属性
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +135,Government,政府
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,报销{0}已经存在车辆日志
 DocType: Asset Movement,Source Location,来源地点
 apps/erpnext/erpnext/public/js/setup_wizard.js +64,Institute Name,机构名称
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +127,Please enter repayment Amount,请输入还款金额
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +18,There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier.,根据总花费可以有多个分层收集因子。但兑换的兑换系数对于所有等级总是相同的。
-apps/erpnext/erpnext/config/stock.py +313,Item Variants,项目变体
+apps/erpnext/erpnext/config/stock.py +313,Item Variants,物料变体
 apps/erpnext/erpnext/public/js/setup_wizard.js +29,Services,服务
 DocType: HR Settings,Email Salary Slip to Employee,通过电子邮件发送工资单给员工
 DocType: Cost Center,Parent Cost Center,父成本中心
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1065,Select Possible Supplier,选择潜在供应商
-DocType: Sales Invoice,Source,源
+DocType: Sales Invoice,Source,订单来源
 DocType: Customer,"Select, to make the customer searchable with these fields",选择，使客户可以使用这些字段进行搜索
 DocType: Shopify Settings,Import Delivery Notes from Shopify on Shipment,在发货时从Shopify导入交货单
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +277,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +277,Asset Category is mandatory for Fixed Asset item,固定资产类的物料其资产类别字段是必填的
 DocType: Fee Validity,Fee Validity,费用有效期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +146,No records found in the Payment table,没有在支付表中找到记录
 apps/erpnext/erpnext/education/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}冲突{1}在{2} {3}
@@ -2177,12 +2175,12 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +90,Cash Flow from Investing,投资现金流
 DocType: Program Course,Program Course,课程计划
 DocType: Healthcare Service Unit,Allow Appointments,允许约会
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Freight and Forwarding Charges,货运及转运费
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +106,Freight and Forwarding Charges,货运及转运费用
 DocType: Homepage,Company Tagline for website homepage,公司标语的网站主页
-DocType: Item Group,Item Group Name,项目群组名称
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过
+DocType: Item Group,Item Group Name,物料群组名称
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已使用
 DocType: Student,Date of Leaving,离开日期
-DocType: Pricing Rule,For Price List,对价格表
+DocType: Pricing Rule,For Price List,价格清单
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +27,Executive Search,猎头
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +55,Setting defaults,设置默认值
 DocType: Loyalty Program,Auto Opt In (For all customers),自动选择（适用于所有客户）
@@ -2191,10 +2189,10 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +514,POS Profile is required to use Point-of-Sale,POS配置文件需要使用销售点
 DocType: Purchase Invoice Item,Net Amount,净额
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +143,{0} {1} has not been submitted so the action cannot be completed,{0} {1}尚未提交，因此无法完成此操作
-DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
+DocType: Purchase Order Item Supplied,BOM Detail No,BOM信息编号
 DocType: Landed Cost Voucher,Additional Charges,附加费用
 DocType: Support Search Source,Result Route Field,结果路由字段
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外的优惠金额（公司货币）
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),额外折扣金额（公司货币）
 DocType: Supplier Scorecard,Supplier Scorecard,供应商记分卡
 DocType: Plant Analysis,Result Datetime,结果日期时间
 ,Support Hour Distribution,支持小时分配
@@ -2203,26 +2201,26 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +60,"Appointment cancelled, Please review and cancel the invoice {0}",预约已取消，请查看并取消发票{0}
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次数量在仓库
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,更新打印格式
-apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +59,Leave Type {0} is not encashable,离开类型{0}不可放置
+apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +59,Leave Type {0} is not encashable,休假类型{0}不可折现
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本帮助
-DocType: Purchase Invoice,Select Shipping Address,选择送货地址
+DocType: Purchase Invoice,Select Shipping Address,选择销售出货地址
 DocType: Timesheet Detail,Expected Hrs,预计的小时数
 apps/erpnext/erpnext/config/non_profit.py +28,Memebership Details,Memebership细节
-DocType: Leave Block List,Block Holidays on important days.,禁止重要日子的假期。
+DocType: Leave Block List,Block Holidays on important days.,禁止将重要日期设为假期。
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +220,Please input all required Result Value(s),请输入所有必需的结果值（s）
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +119,Accounts Receivable Summary,应收账款汇总
 DocType: POS Closing Voucher,Linked Invoices,链接的发票
 DocType: Loan,Monthly Repayment Amount,每月还款额
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,打开发票
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +9,Opening Invoices,待创建发票
 DocType: Contract,Contract Details,合同细节
-DocType: Employee,Leave Details,留下细节
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
+DocType: Employee,Leave Details,休假信息
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Please set User ID field in an Employee record to set Employee Role,请在员工主数据里设置用户ID字段来分派员工角色
 DocType: UOM,UOM Name,计量单位名称
 DocType: GST HSN Code,HSN Code,HSN代码
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +40,Contribution Amount,贡献金额
-DocType: Purchase Invoice,Shipping Address,送货地址
+DocType: Purchase Invoice,Shipping Address,销售出货地址
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,此工具可帮助您更新或修复系统中的库存数量和价值。它通常被用于同步系统值和实际存在于您的仓库。
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,大写金额将在送货单保存后显示。
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,大写金额将在销售出货单保存后显示。
 DocType: Expense Claim,EXP,EXP
 apps/erpnext/erpnext/erpnext_integrations/utils.py +22,Unverified Webhook Data,未经验证的Webhook数据
 DocType: Water Analysis,Container,容器
@@ -2233,11 +2231,11 @@
 DocType: Production Plan,Ignore Existing Ordered Quantity,忽略现有的订购数量
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +66,Please set the series to be used.,请设置要使用的系列。
 DocType: Patient,Tobacco Past Use,烟草过去使用
-DocType: Travel Itinerary,Mode of Travel,旅行模式
+DocType: Travel Itinerary,Mode of Travel,出差方式
 DocType: Sales Invoice Item,Brand Name,品牌名称
-DocType: Purchase Receipt,Transporter Details,转运详细
+DocType: Purchase Receipt,Transporter Details,运输信息
 apps/erpnext/erpnext/healthcare/doctype/physician/physician.py +55,User {0} is already assigned to Physician {1},用户{0}已分配给医师{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2708,Default warehouse is required for selected item,默认仓库需要选中的项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2708,Default warehouse is required for selected item,没有为选中的物料定义默认仓库
 apps/erpnext/erpnext/utilities/user_progress.py +146,Box,箱
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1062,Possible Supplier,可能的供应商
 DocType: Journal Entry,JV-RET-,JV-RET-
@@ -2250,36 +2248,36 @@
 DocType: Pricing Rule,Pricing Rule,定价规则
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},学生{0}的重复卷号
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +58,Duplicate roll number for student {0},学生{0}的重复卷号
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求采购订单
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,从物料需求到采购订单
 DocType: Shopping Cart Settings,Payment Success URL,付款成功URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +79,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的项目{1}不存在{2} {3}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +79,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,银行对帐表
+,Bank Reconciliation Statement,银行对帐单
 DocType: Consultation,Medical Coding,医学编码
 DocType: Healthcare Settings,Reminder Message,提醒信息
 ,Lead Name,线索姓名
 ,POS,POS
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +318,Opening Stock Balance,期初存货余额
-DocType: Asset Category Account,Capital Work In Progress Account,资本工作进行中的帐户
+DocType: Asset Category Account,Capital Work In Progress Account,在途资本科目
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +84,Asset Value Adjustment,资产价值调整
 DocType: Employee Incentive,Payroll Date,工资日期
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{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 +42,No Items to pack,未选择品目
+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 +42,No Items to pack,未选择需打包物料
 DocType: Shipping Rule Condition,From Value,起始值
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +673,Manufacturing Quantity is mandatory,生产数量为必须项
 DocType: Loan,Repayment Method,还款方式
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果选中，主页将是网站的默认项目组
-DocType: Quality Inspection Reading,Reading 4,阅读4
+DocType: Quality Inspection Reading,Reading 4,检验结果4
 apps/erpnext/erpnext/utilities/activation.py +118,"Students are at the heart of the system, add all your students",学生在系统的心脏，添加所有的学生
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py +16,Member ID,会员ID
 DocType: Employee Tax Exemption Proof Submission,Monthly Eligible Amount,每月合格金额
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}无法支票日期前{2}
 DocType: Asset Maintenance Task,Certificate Required,证书要求
 DocType: Company,Default Holiday List,默认假期列表
-DocType: Pricing Rule,Supplier Group,供应商集团
+DocType: Pricing Rule,Supplier Group,供应商群组
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{0} Digest,{0}摘要
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +196,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 +152,Stock Liabilities,库存负债
@@ -2288,30 +2286,30 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +53,Select Company,选择公司
 ,Material Requests for which Supplier Quotations are not created,无供应商报价的物料申请
 DocType: Student Report Generation Tool,Print Section,打印部分
-DocType: Staffing Plan Detail,Estimated Cost Per Position,估计的每位成本
+DocType: Staffing Plan Detail,Estimated Cost Per Position,预估单人成本
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +34,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,用户{0}没有任何默认的POS配置文件。检查此用户的行{1}处的默认值。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +189,Employee Referral,员工推荐
 DocType: Student Group,Set 0 for no limit,为不限制设为0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +198,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,您申请的休假日期是节假日，无需申请休假。
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +64,Row {idx}: {field} is required to create the Opening {invoice_type} Invoices,需要行{idx}：{field}才能创建开票{invoice_type}发票
-DocType: Customer,Primary Address and Contact Detail,主要地址和联系人详情
+DocType: Customer,Primary Address and Contact Detail,主要地址和联系人信息
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任务
 DocType: Clinical Procedure,Appointment,约定
-apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,请报价
-apps/erpnext/erpnext/config/education.py +230,Other Reports,其他报告
+apps/erpnext/erpnext/utilities/activation.py +74,Make Quotation,创建报价
+apps/erpnext/erpnext/config/education.py +230,Other Reports,其他报表
 apps/erpnext/erpnext/public/js/setup_wizard.js +39,Please select at least one domain.,请选择至少一个域名。
 DocType: Dependent Task,Dependent Task,相关任务
-DocType: Shopify Settings,Shopify Tax Account,Shopify税收帐户
+DocType: Shopify Settings,Shopify Tax Account,Shopify税收科目
 apps/erpnext/erpnext/stock/doctype/item/item.py +460,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 +265,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试计划将操作提前X天。
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +90,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",已为{3}的子公司计划{2}的{0}空缺和{1}预算。 \根据母公司{3}的员工计划{6}，您只能计划最多{4}个职位空缺和预算{5}。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +250,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +250,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪资科目{0}
 DocType: SMS Center,Receiver List,接收人列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1105,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1105,Search Item,搜索物料
 DocType: Payment Schedule,Payment Amount,付款金额
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +20,Half Day Date should be in between Work From Date and Work End Date,半天日期应在工作日期和工作结束日期之间
 DocType: Patient Appointment,Referring Physician,参考医师
@@ -2325,23 +2323,23 @@
 				pro-rata component",请将剩余的权益{0}作为\ pro-rata组件添加到应用程序中
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +64,Import Successful!,导入成功！
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +29,Payment Request already exists {0},付款申请已经存在{0}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料物料成本
 DocType: Physician,Hospital,医院
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +423,Quantity must not be more than {0},数量不能超过{0}
 DocType: Travel Request Costing,Funded Amount,资助金额
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +118,Previous Financial Year is not closed,上一财政年度未关闭
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +118,Previous Financial Year is not closed,上一财务年度未关闭
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +69,Age (Days),时间（天）
-DocType: Additional Salary,Additional Salary,额外的薪水
-DocType: Quotation Item,Quotation Item,报价品目
+DocType: Additional Salary,Additional Salary,额外薪水
+DocType: Quotation Item,Quotation Item,报价物料
 DocType: Customer,Customer POS Id,客户POS ID
-DocType: Account,Account Name,帐户名称
+DocType: Account,Account Name,科目名称
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +486,From Date cannot be greater than To Date,起始日期不能大于结束日期
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Serial No {0} quantity {1} cannot be a fraction,序列号{0}的数量{1}不能是分数
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +96,Please enter Woocommerce Server URL,请输入Woocommerce服务器网址
 DocType: Purchase Order Item,Supplier Part Number,供应商零件编号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +124,Conversion rate cannot be 0 or 1,汇率不能为0或1
 DocType: Share Balance,To No,至No
-apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +27,All the mandatory Task for employee creation hasn't been done yet.,所有员工创建的强制性任务尚未完成。
+apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +27,All the mandatory Task for employee creation hasn't been done yet.,尚未全部完成创建新员工时必要任务。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +231,{0} {1} is cancelled or stopped,{0} {1}被取消或停止
 DocType: Accounts Settings,Credit Controller,信用控制人
 DocType: Loan,Applicant Type,申请人类型
@@ -2349,64 +2347,63 @@
 DocType: Delivery Note,Vehicle Dispatch Date,车辆调度日期
 DocType: Healthcare Settings,Default Medical Code Standard,默认医疗代码标准
 DocType: Purchase Invoice Item,HSN/SAC,HSN / SAC
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +253,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/accounts/doctype/purchase_invoice/purchase_invoice.py +253,Purchase Receipt {0} is not submitted,采购收货单{0}未提交
+DocType: Company,Default Payable Account,默认应付科目
+apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",网上购物车，如配送规则，价格清单等的设置
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +113,{0}% Billed,{0}％帐单
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,保留数量
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,预留数量
 DocType: Party Account,Party Account,往来单位科目
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +142,Please select Company and Designation,请选择公司和指定
 apps/erpnext/erpnext/config/setup.py +116,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +17,Reject,拒绝
 DocType: Journal Entry Account,Debit in Company Currency,借记卡在公司货币
-DocType: BOM Item,BOM Item,BOM品目
-DocType: Appraisal,For Employee,对员工
+DocType: BOM Item,BOM Item,BOM物料
+DocType: Appraisal,For Employee,员工
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +69,Make Disbursement Entry,请输入支付
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Advance against Supplier must be debit,行{0}：提前对供应商必须扣除
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +170,Row {0}: Advance against Supplier must be debit,行{0}：对供应商预付应为借方
 DocType: Company,Default Values,默认值
 DocType: Certification Application,INR,INR
 DocType: Expense Claim,Total Amount Reimbursed,报销金额合计
-apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,这是基于对本车辆的日志。详情请参阅以下时间表
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,基于车辆日志。信息请参阅表单下方的时间线记录
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +46,"Job Openings for designation {0} already open \
 					or hiring completed as per Staffing Plan {1}",指定{0}的职位空缺已根据人员配置计划{1}已打开或正在招聘
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
-DocType: Customer,Default Price List,默认价格表
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,资产运动记录{0}创建
+DocType: Customer,Default Price List,默认价格清单
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +483,Asset Movement record {0} created,资产移动记录{0}创建
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js +175,No items found.,未找到任何项目。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}被设置为默认的全局设置
-DocType: Share Transfer,Equity/Liability Account,股票/负债账户
+DocType: Share Transfer,Equity/Liability Account,权益/负债科目
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,A customer with the same name already exists,已存在同名客户
 DocType: Contract,Inactive,待用
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +210,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,这将提交工资单，并创建权责发生制日记账分录。你想继续吗？
 DocType: Purchase Invoice,Total Net Weight,总净重
 DocType: Purchase Order,Order Confirmation No,订单确认号
 DocType: Purchase Invoice,Eligibility For ITC,适用于ITC的资格
-DocType: Journal Entry,Entry Type,条目类型
+DocType: Journal Entry,Entry Type,凭证类型
 ,Customer Credit Balance,客户贷方余额
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +82,Net Change in Accounts Payable,应付账款净额变化
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +233,Credit limit has been crossed for customer {0} ({1}/{2}),客户{0}（{1} / {2}）的信用额度已超过
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',”客户折扣“需要指定客户
 apps/erpnext/erpnext/config/accounts.py +146,Update bank payment dates with journals.,用日记账更新银行付款时间
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,价钱
-DocType: Quotation,Term Details,条款详情
+DocType: Quotation,Term Details,条款信息
 DocType: Employee Incentive,Employee Incentive,员工激励
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,不能注册超过{0}学生该学生群体更多。
 apps/erpnext/erpnext/templates/print_formats/includes/total.html +4,Total (Without Tax),总计（不含税）
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,铅计数
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,铅计数
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,现货供应
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,线索数量
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +36,Stock Available,可用库存
 DocType: Manufacturing Settings,Capacity Planning For (Days),容量规划的期限（天）
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,采购
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,强制性领域 - 计划
-apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,强制性领域 - 计划
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,强制性字段 - 计划
+apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory field - Program,强制性字段 - 计划
 DocType: Special Test Template,Result Component,结果组件
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,保修申请
-,Lead Details,线索详情
+,Lead Details,线索信息
 DocType: Volunteer,Availability and Skills,可用性和技能
 DocType: Salary Slip,Loan repayment,偿还借款
-DocType: Share Transfer,Asset Account,资产账户
+DocType: Share Transfer,Asset Account,资产科目
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
 DocType: Pricing Rule,Applicable For,适用于
 DocType: Lab Test,Technician Name,技术员姓名
@@ -2421,7 +2418,7 @@
 apps/erpnext/erpnext/healthcare/setup.py +258,Moderate Sensitivity,中等敏感度
 DocType: Leave Type,Include holidays within leaves as leaves,包括休假期间的节假日
 DocType: Loyalty Program,Redemption,赎回
-DocType: Sales Invoice,Packed Items,盒装项目
+DocType: Sales Invoice,Packed Items,已打包物料
 DocType: Contract,Contract Period,合同期
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,针对序列号提出的保修申请
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +215,'Total',&#39;总&#39;
@@ -2431,41 +2428,41 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推动打击{0} {1}不能大于付出\超过总计{2}
 DocType: Consultation,Medication,药物治疗
-DocType: Production Plan,Include Non Stock Items,包含非库存项目
+DocType: Production Plan,Include Non Stock Items,包含非库存物料
 DocType: Project Update,Challenging/Slow,具有挑战性/慢
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,请选择商品代码
 DocType: Student Sibling,Studying in Same Institute,就读于同一研究所
-DocType: Leave Type,Earned Leave,获得休假
-DocType: Employee,Salary Details,薪资明细
+DocType: Leave Type,Earned Leave,年假
+DocType: Employee,Salary Details,薪资信息
 DocType: Territory,Territory Manager,区域经理
 DocType: Packed Item,To Warehouse (Optional),仓库（可选）
-DocType: GST Settings,GST Accounts,GST账户
+DocType: GST Settings,GST Accounts,GST科目
 DocType: Payment Entry,Paid Amount (Company Currency),支付的金额（公司货币）
-DocType: Purchase Invoice,Additional Discount,更多优惠
+DocType: Purchase Invoice,Additional Discount,额外折扣
 DocType: Selling Settings,Selling Settings,销售设置
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +109,Confirm Action,确认操作
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +39,Online Auctions,网上拍卖
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,请注明无论是数量或估价率或两者
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +18,Fulfillment,订单履行
 apps/erpnext/erpnext/templates/generators/item.html +82,View in Cart,查看你的购物车
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Marketing Expenses,市场营销开支
-,Item Shortage Report,项目短缺报告
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Marketing Expenses,市场营销费用
+,Item Shortage Report,缺料报表
 apps/erpnext/erpnext/education/doctype/assessment_criteria/assessment_criteria.py +15,Can't create standard criteria. Please rename the criteria,无法创建标准条件。请重命名标准
 apps/erpnext/erpnext/stock/doctype/item/item.js +342,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此手工库存移动的物料申请
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,为每个批次分离基于课程的组
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,为每个批次分离基于课程的组
-apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,此品目的一件。
+apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,此物料的一件。
 DocType: Fee Category,Fee Category,收费类别
 DocType: Agriculture Task,Next Business Day,下一个营业日
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +3,Allocated Leaves,分配的叶子
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +3,Allocated Leaves,已分配休假天数
 DocType: Drug Prescription,Dosage by time interval,剂量按时间间隔
 DocType: Cash Flow Mapper,Section Header,章节标题
 ,Student Fee Collection,学生费征收
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +24,Appointment Duration (mins),预约时间（分钟）
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
-DocType: Leave Allocation,Total Leaves Allocated,总已核销休假
-apps/erpnext/erpnext/public/js/setup_wizard.js +146,Please enter valid Financial Year Start and End Dates,请输入有效的财政年度开始和结束日期
+DocType: Leave Allocation,Total Leaves Allocated,总已分配休假
+apps/erpnext/erpnext/public/js/setup_wizard.js +146,Please enter valid Financial Year Start and End Dates,请输入有效的财务年度开始和结束日期
 DocType: Employee,Date Of Retirement,退休日期
 DocType: Upload Attendance,Get Template,获取模板
 DocType: Additional Salary Component,Additional Salary Component,额外的薪资组件
@@ -2477,7 +2474,7 @@
 DocType: Course Assessment Criteria,Weightage,权重
 DocType: Purchase Invoice,Tax Breakup,税收分解
 DocType: Packing Slip,PS-,PS-
-DocType: Employee,Joining Details,加入详情
+DocType: Employee,Joining Details,入职信息
 DocType: Member,Non Profit Member,非盈利会员
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：成本中心对于损益类科目来说是必须的{2}。请为公司设置一个默认的成本中心。
 DocType: Payment Schedule,Payment Term,付款期限
@@ -2486,24 +2483,24 @@
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,New Contact,新建联系人
 DocType: Territory,Parent Territory,家长领地
 DocType: Purchase Invoice,Place of Supply,供货地点
-DocType: Quality Inspection Reading,Reading 2,阅读2
+DocType: Quality Inspection Reading,Reading 2,检验结果2
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +98,Employee {0} already submited an apllication {1} for the payroll period {2},员工{0}已经在工资期间{2}提交了申请{1}
-DocType: Stock Entry,Material Receipt,物料收据
-DocType: Bank Statement Transaction Entry,Submit/Reconcile Payments,提交/协调付款
+DocType: Stock Entry,Material Receipt,入库
+DocType: Bank Statement Transaction Entry,Submit/Reconcile Payments,提交/核销付款
 DocType: Homepage,Products,产品展示
 DocType: Announcement,Instructor,讲师
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +95,Select Item (optional),选择项目（可选）
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +99,The Loyalty Program isn't valid for the selected company,忠诚度计划对所选公司无效
 DocType: Fee Schedule Student Group,Fee Schedule Student Group,费用计划学生组
 DocType: Student,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,下次联络人
-DocType: Compensatory Leave Request,Compensatory Leave Request,补偿请假
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +325,Quantity required for Item {0} in row {1},行{1}中的品目{0}必须指定数量
+DocType: Compensatory Leave Request,Compensatory Leave Request,补休（假）申请
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +325,Quantity required for Item {0} in row {1},行{1}中的物料{0}必须指定数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +45,Warehouse {0} can not be deleted as quantity exists for Item {1},仓库{0}无法删除，因为产品{1}有库存量
 DocType: Blanket Order,Order Type,订单类型
-,Item-wise Sales Register,逐项销售登记
-DocType: Asset,Gross Purchase Amount,总购买金额
+,Item-wise Sales Register,物料销售台帐
+DocType: Asset,Gross Purchase Amount,总采购金额
 apps/erpnext/erpnext/utilities/user_progress.py +39,Opening Balances,期初余额
 DocType: Asset,Depreciation Method,折旧方法
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
@@ -2511,11 +2508,11 @@
 DocType: Soil Texture,Sand Composition (%),沙成分（％）
 DocType: Job Applicant,Applicant for a Job,求职申请
 DocType: Production Plan Material Request,Production Plan Material Request,生产计划申请材料
-DocType: Purchase Invoice,Release Date,发布日期
+DocType: Purchase Invoice,Release Date,审批日期
 DocType: Stock Reconciliation,Reconciliation JSON,基于JSON格式对账
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。导出报表，并使用电子表格应用程序进行打印。
 DocType: Purchase Invoice Item,Batch No,批号
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,员工发展
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +27,Employee Advances,员工预支
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
 DocType: Student Group Instructor,Student Group Instructor,学生组教练
 DocType: Grant Application,Assessment  Mark (Out of 10),评估标记（满分10分）
@@ -2525,9 +2522,9 @@
 apps/erpnext/erpnext/controllers/status_updater.py +163,"For an item {0}, quantity must be negative number",对于商品{0}，数量必须是负数
 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 +474,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,从机会是必选项
+apps/erpnext/erpnext/stock/doctype/item/item.py +474,Default BOM ({0}) must be active for this item or its template,该物料或其模板物料的默认物料清单状态必须是激活的
+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 +1196,Make Purchase Order,创建采购订单
@@ -2535,7 +2532,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +209,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: Sales Invoice Item,Customer's Item Code,客户的物料代码
 DocType: Stock Reconciliation,Stock Reconciliation,库存盘点
 DocType: Territory,Territory Name,区域名称
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +217,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
@@ -2548,33 +2545,33 @@
 DocType: Item,Serial Nos and Batches,序列号和批号
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +262,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +262,Against Journal Entry {0} does not have any unmatched {1} entry,手工凭证{0}没有不符合的{1}分录
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +113,"Subsidiary companies have already planned for {1} vacancies at a budget of {2}. \
-				Staffing Plan for {0} should allocate more vacancies and budget for {3} than planned for its subsidiary companies",子公司已经计划{2}的预算{1}空缺。 \ {0}的人员配备计划应为其子公司分配更多空缺和预算{3}
+				Staffing Plan for {0} should allocate more vacancies and budget for {3} than planned for its subsidiary companies",子公司已经计划{2}的预算{1}空缺。 \ {0}的人员需求计划应为其子公司分配更多空缺和预算{3}
 apps/erpnext/erpnext/config/hr.py +166,Appraisals,绩效评估
-apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,培训活动
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +208,Duplicate Serial No entered for Item {0},品目{0}的序列号重复
-apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,通过铅源追踪潜在客户。
+apps/erpnext/erpnext/hr/doctype/training_program/training_program_dashboard.py +8,Training Events,培训
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +208,Duplicate Serial No entered for Item {0},物料{0}的序列号重复
+apps/erpnext/erpnext/config/selling.py +179,Track Leads by Lead Source.,通过线索来源进行追踪。
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,发货规则的一个条件
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +175,Please enter ,请输入
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.js +64,Maintenance Log,维护日志
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +236,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物件的净重自动计算）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +43,Make Inter Company Journal Entry,使公司日记帐分录
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物料的净重自动计算）
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +43,Make Inter Company Journal Entry,创建公司间业务手工凭证
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +900,Discount amount cannot be greater than 100%,折扣金额不能大于100％
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +26,"Number of new Cost Center, it will be included in the cost center name as a prefix",新成本中心的数量，它将作为前缀包含在成本中心名称中
-DocType: Sales Order,To Deliver and Bill,为了提供与比尔
+DocType: Sales Order,To Deliver and Bill,待出货与开票
 DocType: Student Group,Instructors,教师
-DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
+DocType: GL Entry,Credit Amount in Account Currency,科目币别贷方金额
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +607,BOM {0} must be submitted,BOM{0}未提交
 apps/erpnext/erpnext/config/accounts.py +472,Share Management,股份管理
 DocType: Authorization Control,Authorization Control,授权控制
-apps/erpnext/erpnext/controllers/buying_controller.py +387,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
+apps/erpnext/erpnext/controllers/buying_controller.py +387,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},第{0}行物料{1}被拒收，其拒收仓库字段必填
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +856,Payment,付款
 apps/erpnext/erpnext/controllers/stock_controller.py +96,"Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.",仓库{0}未与任何科目关联，请在仓库或公司{1}主数据中设置默认库存科目。
 apps/erpnext/erpnext/utilities/activation.py +81,Manage your orders,管理您的订单
 DocType: Work Order Operation,Actual Time and Cost,实际时间和成本
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +56,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中品目{1}的最大物流申请量为{0}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +56,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中物料{1}的最大物流申请量为{0}
 DocType: Crop,Crop Spacing,作物间距
 DocType: Course,Course Abbreviation,当然缩写
 DocType: Budget,Action if Annual Budget Exceeded on PO,年度预算超出采购订单时采取的行动
@@ -2587,56 +2584,56 @@
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,用于销售的产品组合。
 DocType: Material Request Plan Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
-DocType: Quality Inspection Reading,Reading 10,阅读10
+DocType: Quality Inspection Reading,Reading 10,检验结果10
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +48,Serial nos {0} does not belongs to the location {1},序列号{0}不属于位置{1}
 DocType: Item,Barcodes,条形码
 DocType: Hub Category,Hub Node,Hub节点
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +117,Associate,协理
-DocType: Asset Movement,Asset Movement,资产运动
+DocType: Asset Movement,Asset Movement,资产移动
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +567,Work Order {0} must be submitted,必须提交工单{0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2222,New Cart,新的车
-DocType: Taxable Salary Slab,From Amount,从金额
+DocType: Taxable Salary Slab,From Amount,金额（起）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,物料{0}未启用序列好管理
-DocType: Leave Type,Encashment,兑现
+DocType: Leave Type,Encashment,休假折现
 apps/erpnext/erpnext/hr/doctype/leave_policy/leave_policy.py +16,Maximum leave allowed in the leave type {0} is {1},假期类型{0}允许的最大休假是{1}
 DocType: SMS Center,Create Receiver List,创建接收人列表
 DocType: Vehicle,Wheels,车轮
 DocType: Packing Slip,To Package No.,以包号
 DocType: Patient Relation,Family,家庭
-DocType: Sales Invoice Item,Deferred Revenue Account,递延收入帐户
-DocType: Production Plan,Material Requests,材料要求
+DocType: Sales Invoice Item,Deferred Revenue Account,递延收入科目
+DocType: Production Plan,Material Requests,物料需求
 DocType: Warranty Claim,Issue Date,问题日期
 DocType: Activity Cost,Activity Cost,活动费用
-DocType: Sales Invoice Timesheet,Timesheet Detail,详细时间表
+DocType: Sales Invoice Timesheet,Timesheet Detail,详细工时单
 DocType: Purchase Receipt Item Supplied,Consumed Qty,已消耗数量
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +52,Telecommunications,电信
-apps/erpnext/erpnext/accounts/party.py +275,Billing currency must be equal to either default company's currency or party account currency,帐单货币必须等于默认公司的货币或帐户币种
+apps/erpnext/erpnext/accounts/party.py +275,Billing currency must be equal to either default company's currency or party account currency,帐单货币必须等于默认公司的货币或科目币种
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示该打包是这个交付的一部分（仅草稿）
 DocType: Soil Texture,Loam,壤土
-apps/erpnext/erpnext/controllers/accounts_controller.py +740,Row {0}: Due Date cannot be before posting date,行{0}：到期日期不能在发布日期之前
+apps/erpnext/erpnext/controllers/accounts_controller.py +740,Row {0}: Due Date cannot be before posting date,行{0}：到期日不能在记帐日之前
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,创建付款分录
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},品目{0}的数量必须小于{1}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +129,Quantity for Item {0} must be less than {1},物料{0}的数量必须小于{1}
 ,Sales Invoice Trends,销售发票趋势
-DocType: Leave Application,Apply / Approve Leaves,申请/审批假期
+DocType: Leave Application,Apply / Approve Leaves,申请/批准休假
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +169,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',收取类型类型必须是“基于上一行的金额”或者“前一行的总计”才能引用组
 DocType: Sales Order Item,Delivery Warehouse,交货仓库
-DocType: Leave Type,Earned Leave Frequency,获得休假频率
+DocType: Leave Type,Earned Leave Frequency,年假频率
 apps/erpnext/erpnext/config/accounts.py +247,Tree of financial Cost Centers.,财务成本中心的树。
 DocType: Serial No,Delivery Document No,交货文档编号
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},请公司制定“关于资产处置收益/损失帐户”{0}
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,从采购收获单获取物料
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +193,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},请公司制定“关于资产处置收益/损失科目”{0}
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,从采购收货单获取物料
 DocType: Serial No,Creation Date,创建日期
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},产品{0}多次出现价格表{1}
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},产品{0}多次出现价格清单{1}
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +55,Target Location is required for the asset {0},目标位置是资产{0}所必需的
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Selling must be checked, if Applicable For is selected as {0}",如果“适用于”的值为{0}，则必须选择“销售”
 DocType: Production Plan Material Request,Material Request Date,材料申请日期
-DocType: Purchase Order Item,Supplier Quotation Item,供应商报价品目
+DocType: Purchase Order Item,Supplier Quotation Item,供应商报价物料
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +205,Material Consumption is not set in Manufacturing Settings.,材料消耗未在生产设置中设置。
 apps/erpnext/erpnext/templates/pages/help.html +46,Visit the forums,访问论坛
 DocType: Student,Student Mobile Number,学生手机号码
 DocType: Item,Has Variants,有变体
-DocType: Employee Benefit Claim,Claim Benefit For,索赔利益
+DocType: Employee Benefit Claim,Claim Benefit For,福利类型（薪资构成）
 apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{1}行中的项目{0}不能超过{2}。要允许超额结算，请在库存设置中进行设置
 apps/erpnext/erpnext/templates/emails/training_event.html +11,Update Response,更新响应
 apps/erpnext/erpnext/public/js/utils.js +398,You have already selected items from {0} {1},您已经选择从项目{0} {1}
@@ -2650,9 +2647,9 @@
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +24,Select the program first,首先选择程序
 DocType: Patient Appointment,Patient Age,患者年龄
 apps/erpnext/erpnext/config/learn.py +253,Managing Projects,项目管理
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial no {0} has been already returned,序列号{0}已被返回
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +227,Serial no {0} has been already returned,序列号{0}已被退回
 DocType: Supplier,Supplier of Goods or Services.,提供商品或服务的供应商。
-DocType: Budget,Fiscal Year,财政年度
+DocType: Budget,Fiscal Year,财务年度
 DocType: Asset Maintenance Log,Planned,计划
 apps/erpnext/erpnext/hr/utils.py +198,A {0} exists between {1} and {2} (,{1}和{2}之间存在{0}（
 DocType: Healthcare Settings,Default receivable accounts to be used if not set in Patient to book Consultation charges.,如果没有在患者中设置隐性应收帐款，请咨询费用。
@@ -2660,8 +2657,8 @@
 DocType: Bank Guarantee,Margin Money,保证金
 DocType: Budget,Budget,预算
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +80,Set Open,设置打开
-apps/erpnext/erpnext/stock/doctype/item/item.py +274,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +52,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
+apps/erpnext/erpnext/stock/doctype/item/item.py +274,Fixed Asset Item must be a non-stock item.,固定资产物料必须是一个非库存物料。
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +52,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财务预算案不能对{0}指定的，因为它不是一个收入或支出科目
 apps/erpnext/erpnext/hr/utils.py +227,Max exemption amount for {0} is {1},{0}的最大免除金额为{1}
 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,申请表路线
@@ -2671,13 +2668,13 @@
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,大写金额将在销售发票保存后显示。
 DocType: Lead,Follow Up,跟进
 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 +71,Item {0} is not setup for Serial Nos. Check Item master,物料{0}没有启用序列号管理功能，请进入物料主数据中修改
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,物料群组树
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +71,Item {0} is not setup for Serial Nos. Check Item master,物料{0}没有启用序列号管理功能，请检查物料主数据
 DocType: Maintenance Visit,Maintenance Time,维护时间
-,Amount to Deliver,量交付
+,Amount to Deliver,待出货金额
 DocType: Asset,Insurance Start Date,保险开始日期
-DocType: Salary Component,Flexible Benefits,灵活的好处
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},相同的物品已被多次输入。 {0}
+DocType: Salary Component,Flexible Benefits,弹性福利
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +335,Same item has been entered multiple times. {0},相同的物料已被多次输入。 {0}
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,这个词开始日期不能超过哪个术语链接学年的开学日期较早（学年{}）。请更正日期，然后再试一次。
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +199,There were errors.,有错误发生。
 apps/erpnext/erpnext/hr/doctype/shift_request/shift_request.py +68,Employee {0} has already applied for {1} between {2} and {3} : ,员工{0}已在{2}和{3}之间申请{1}：
@@ -2686,41 +2683,41 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +309,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多个会计年度的日期{0}存在。请设置公司财年
 DocType: Education Settings,Instructor Records to be created by,导师记录由
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +229,{0} created,{0}已创建
-DocType: GST Account,GST Account,GST帐户
-DocType: Delivery Note Item,Against Sales Order,对销售订单
+DocType: GST Account,GST Account,GST科目
+DocType: Delivery Note Item,Against Sales Order,销售订单
 ,Serial No Status,序列号状态
 DocType: Payment Entry Reference,Outstanding,未付
 DocType: Supplier,Warn POs,警告PO
-,Daily Timesheet Summary,每日时间表摘要
+,Daily Timesheet Summary,每日工时单摘要
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}：设置{1}的周期性，从和到日期\
 之间差必须大于或等于{2}"
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,这是基于库存移动。见{0}详情
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,这是基于库存移动。见{0}信息
 DocType: Pricing Rule,Selling,销售
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +394,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
-DocType: Sales Person,Name and Employee ID,姓名和雇员ID
+DocType: Sales Person,Name and Employee ID,姓名和员工ID
 apps/erpnext/erpnext/accounts/party.py +320,Due Date cannot be before Posting Date,到期日不能前于过账日期
-DocType: Website Item Group,Website Item Group,网站物件组
+DocType: Website Item Group,Website Item Group,网站物料组
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +331,Added to Favourites,已添加到收藏夹
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +530,No salary slip found to submit for the above selected criteria OR salary slip already submitted,没有发现提交上述选定标准或已提交工资单的工资单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Duties and Taxes,关税与税项
 DocType: Projects Settings,Projects Settings,项目设置
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +388,Please enter Reference date,参考日期请输入
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款记录不能由{1}过滤
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物件表
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款凭证不能由{1}过滤
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,将在网站显示的物料表
 DocType: Purchase Order Item Supplied,Supplied Qty,附送数量
-DocType: Purchase Order Item,Material Request Item,物料申请品目
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,请先取消购买收据{0}
-apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,树的项目组。
+DocType: Purchase Order Item,Material Request Item,物料申请物料
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +294,Please cancel Purchase Receipt {0} first,请先取消采购收货{0}
+apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,物料群组树。
 DocType: Production Plan,Total Produced Qty,总生产数量
-DocType: Payroll Entry,Get Employee Details,获取员工细节
+DocType: Payroll Entry,Get Employee Details,获取员工信息
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +179,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
 DocType: Asset,Sold,出售
-,Item-wise Purchase History,逐项采购历史
+,Item-wise Purchase History,物料采购历史
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
-DocType: Account,Frozen,冻结的
+DocType: Account,Frozen,已冻结？
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金额（公司币种）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +952,Raw Materials,原料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +952,Raw Materials,原材料
 DocType: Payment Reconciliation Payment,Reference Row,引用行
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
@@ -2731,24 +2728,24 @@
 DocType: Issue,Resolution Details,详细解析
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,验收标准
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +159,Please enter Material Requests in the above table,请输入在上表请求材料
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,没有可用于日记帐分录的还款
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +154,No repayments available for Journal Entry,没有可用于手工凭证的还款
 DocType: Item Attribute,Attribute Name,属性名称
-DocType: BOM,Show In Website,在网站上显示
+DocType: BOM,Show In Website,在网站上展示
 DocType: Loan Application,Total Payable Amount,合计应付额
 apps/erpnext/erpnext/templates/pages/search_help.py +13,"Help Results for ""{0}""",帮助“{0}”的结果
 DocType: Task,Expected Time (in hours),预期时间（以小时计）
 DocType: Item Reorder,Check in (group),检查（组）
 DocType: Soil Texture,Silt,淤泥
-,Qty to Order,订购数量
-DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",负债或权益下的帐户头，其中利润/亏损将被黄牌警告
+,Qty to Order,待下单数量
+DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",负债或权益下的科目，其中利润/亏损将被黄牌警告
 apps/erpnext/erpnext/config/projects.py +36,Gantt chart of all tasks.,所有任务的甘特图。
-DocType: Opportunity,Mins to First Response,分钟为第一个反应
+DocType: Opportunity,Mins to First Response,首次响应（分钟）
 DocType: Pricing Rule,Margin Type,保证金类型
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0}小时
 DocType: Course,Default Grading Scale,默认等级规模
-DocType: Appraisal,For Employee Name,对员工姓名
+DocType: Appraisal,For Employee Name,员工姓名
 DocType: Holiday List,Clear Table,清除表格
-DocType: Woocommerce Settings,Tax Account,税收帐户
+DocType: Woocommerce Settings,Tax Account,税收科目
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +134,Available slots,可用插槽
 DocType: C-Form Invoice Detail,Invoice No,发票号码
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +372,Make Payment,付款
@@ -2757,11 +2754,11 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",在{0}之前，休假不能新建或取消，因为休假天数已经被结转到未来的休假分配中{1}
 DocType: Activity Cost,Costing Rate,成本率
 apps/erpnext/erpnext/config/selling.py +234,Customer Addresses And Contacts,客户的地址和联系方式
-,Campaign Efficiency,运动效率
-,Campaign Efficiency,运动效率
+,Campaign Efficiency,促销活动效率
+,Campaign Efficiency,促销活动效率
 DocType: Discussion,Discussion,讨论
 DocType: Payment Entry,Transaction ID,交易ID
-DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,扣除未提交免税证明的税额
+DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,代扣未提交免税证明的税额
 DocType: Volunteer,Anytime,任何时候
 DocType: Bank Account,Bank Account No,银行帐号
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,员工免税证明提交
@@ -2772,41 +2769,41 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +115,Not Set,未设置
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +405,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +405,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
-DocType: Task,Total Billing Amount (via Time Sheet),总开票金额（通过时间表）
+DocType: Task,Total Billing Amount (via Time Sheet),总开票金额（通过工时单）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
 DocType: Soil Texture,Silty Clay Loam,泥土粘土
-DocType: Bank Statement Settings,Mapped Items,映射项目
+DocType: Bank Statement Settings,Mapped Items,对照关系
 DocType: Chapter,Chapter,章节
 apps/erpnext/erpnext/utilities/user_progress.py +146,Pair,对
-DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,选择此模式后，默认帐户将在POS发票中自动更新。
+DocType: Mode of Payment Account,Default account will be automatically updated in POS Invoice when this mode is selected.,选择此模式后，默认科目将在POS发票中自动更新。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1017,Select BOM and Qty for Production,选择BOM和数量生产
 DocType: Asset,Depreciation Schedule,折旧计划
 apps/erpnext/erpnext/config/selling.py +124,Sales Partner Addresses And Contacts,销售合作伙伴地址和联系人
-DocType: Bank Reconciliation Detail,Against Account,针对科目
+DocType: Bank Reconciliation Detail,Against Account,科目
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Half Day Date should be between From Date and To Date,半天时间应该是从之间的日期和终止日期
 DocType: Maintenance Schedule Detail,Actual Date,实际日期
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +139,Please set the Default Cost Center in {0} company.,请在{0}公司中设置默认成本中心。
 DocType: Item,Has Batch No,有批号
-apps/erpnext/erpnext/public/js/utils.js +107,Annual Billing: {0},年度结算：{0}
+apps/erpnext/erpnext/public/js/utils.js +107,Annual Billing: {0},本年总发票金额：{0}
 DocType: Shopify Webhook Detail,Shopify Webhook Detail,Shopify Webhook详细信息
 apps/erpnext/erpnext/config/accounts.py +206,Goods and Services Tax (GST India),商品和服务税（印度消费税）
 DocType: Delivery Note,Excise Page Number,Excise页码
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +33,Get from Consultation,从咨询中获取
-DocType: Asset,Purchase Date,购买日期
+DocType: Asset,Purchase Date,采购日期
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +33,Could not generate Secret,无法生成秘密
 DocType: Volunteer,Volunteer Type,志愿者类型
-DocType: Shift Assignment,Shift Type,班次类型
+DocType: Shift Assignment,Shift Type,班别
 DocType: Student,Personal Details,个人资料
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +195,Please set 'Asset Depreciation Cost Center' in Company {0},请设置在公司的资产折旧成本中心“{0}
 ,Maintenance Schedules,维护计划
-DocType: Task,Actual End Date (via Time Sheet),实际结束日期（通过时间表）
+DocType: Task,Actual End Date (via Time Sheet),实际结束日期（通过工时单）
 DocType: Soil Texture,Soil Type,土壤类型
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +389,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
 ,Quotation Trends,报价趋势
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +166,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +166,Item Group not mentioned in item master for item {0},物料{0}的物料群组没有设置
 DocType: GoCardless Mandate,GoCardless Mandate,GoCardless任务
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +395,Debit To account must be a Receivable account,入借帐户必须是应收账科目
-DocType: Shipping Rule,Shipping Amount,发货数量
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +395,Debit To account must be a Receivable account,借记科目必须是应收账款科目
+DocType: Shipping Rule,Shipping Amount,发货金额
 DocType: Supplier Scorecard Period,Period Score,期间得分
 apps/erpnext/erpnext/utilities/user_progress.py +66,Add Customers,添加客户
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待审核金额
@@ -2814,7 +2811,7 @@
 DocType: Loyalty Program,Conversion Factor,转换系数
 DocType: Purchase Order,Delivered,已交付
 ,Vehicle Expenses,车辆费用
-DocType: Serial No,Invoice Details,发票明细
+DocType: Serial No,Invoice Details,发票信息
 DocType: Grant Application,Show on Website,在网站上显示
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +29,Start on,开始
 DocType: Hub Category,Hub Category,中心类别
@@ -2823,30 +2820,30 @@
 DocType: Loan,Loan Amount,贷款额度
 DocType: Student Report Generation Tool,Add Letterhead,添加信头
 DocType: Program Enrollment,Self-Driving Vehicle,自驾车
-DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供应商记分卡站立
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +445,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清单未找到项目{1}
+DocType: Supplier Scorecard Standing,Supplier Scorecard Standing,供应商记分卡当前评分
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +445,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清单未找到物料{1}
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +97,Leave Allocations {0} created,保留创建的分配{0}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +112,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配叶{0}不能小于已经批准叶{1}期间
 DocType: Contract Fulfilment Checklist,Requirement,需求
 DocType: Journal Entry,Accounts Receivable,应收帐款
 DocType: Travel Itinerary,Meal Preference,餐食偏好
-,Supplier-Wise Sales Analytics,供应商特定的销售分析
+,Supplier-Wise Sales Analytics,供应商直出客户的贸易业务销售分析
 DocType: Purchase Invoice,Availed ITC Central Tax,有效的ITC中央税收
 DocType: Sales Invoice,Company Address Name,公司地址名称
 DocType: Work Order,Use Multi-Level BOM,采用多级物料清单
 DocType: Bank Reconciliation,Include Reconciled Entries,包括核销分录
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家长课程（如果不是家长课程的一部分，请留空）
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家长课程（如果不是家长课程的一部分，请留空）
-DocType: Leave Control Panel,Leave blank if considered for all employee types,如果针对所有雇员类型请留空
+DocType: Leave Control Panel,Leave blank if considered for all employee types,如果针对所有员工类型请留空
 DocType: Tax Withholding Category,Percent of Tax Withheld,预扣税的百分比
 DocType: Landed Cost Voucher,Distribute Charges Based On,费用分配基于
-DocType: Projects Settings,Timesheets,时间表
+DocType: Projects Settings,Timesheets,工时单
 DocType: HR Settings,HR Settings,人力资源设置
 DocType: Salary Slip,net pay info,净工资信息
 DocType: Woocommerce Settings,Enable Sync,启用同步
-DocType: Lab Test Template,This value is updated in the Default Sales Price List.,该值在默认销售价格表中更新。
+DocType: Lab Test Template,This value is updated in the Default Sales Price List.,该值在默认销售价格清单中更新。
 DocType: Email Digest,New Expenses,新的费用
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,PDC/LC Amount,PDC / LC金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +102,PDC/LC Amount,部分支付金额
 DocType: Shareholder,Shareholder,股东
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 DocType: Cash Flow Mapper,Position,位置
@@ -2854,64 +2851,63 @@
 DocType: Patient,B Positive,B积极
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +31,"Maximum benefit of employee {0} exceeds {1} by the sum {2} of previous claimed\
 			amount",员工{0}的最大权益超过{1}，前面声明的金额\金额为{2}
-apps/erpnext/erpnext/controllers/accounts_controller.py +632,"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 +632,"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 +341,Abbr can not be blank or space,缩写不能为空或空格
 DocType: Patient Medical Record,Patient Medical Record,病人医疗记录
-apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,集团以非组
+apps/erpnext/erpnext/accounts/doctype/account/account.js +62,Group to Non-Group,群组转换为非群组
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +50,Sports,体育
 DocType: Loan Type,Loan Name,贷款名称
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +66,Total Actual,实际总
 DocType: Lab Test UOM,Test UOM,测试UOM
 DocType: Student Siblings,Student Siblings,学生兄弟姐妹
-DocType: Subscription Plan Detail,Subscription Plan Detail,订阅计划详情
+DocType: Subscription Plan Detail,Subscription Plan Detail,订阅计划信息
 apps/erpnext/erpnext/utilities/user_progress.py +146,Unit,单位
 apps/erpnext/erpnext/stock/get_item_details.py +148,Please specify Company,请注明公司
 ,Customer Acquisition and Loyalty,客户获得和忠诚度
 DocType: Asset Maintenance Task,Maintenance Task,维护任务
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +119,Please set B2C Limit in GST Settings.,请在GST设置中设置B2C限制。
-DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
-DocType: Work Order,Skip Material Transfer,跳过材料转移
-DocType: Work Order,Skip Material Transfer,跳过材料转移
+DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,拒收物料的仓库
+DocType: Work Order,Skip Material Transfer,不自动发料
 apps/erpnext/erpnext/setup/utils.py +129,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,无法为关键日期{2}查找{0}到{1}的汇率。请手动创建汇率记录
-DocType: POS Profile,Price List,价格表
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
+DocType: POS Profile,Price List,价格清单
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财务年度已经更新为{0}。请刷新您的浏览器以使更改生效。
 apps/erpnext/erpnext/projects/doctype/task/task.js +45,Expense Claims,报销
 DocType: Issue,Support,支持
 DocType: Employee Tax Exemption Declaration,Total Exemption Amount,免税总额
 ,BOM Search,BOM搜索
-DocType: Project,Total Consumed Material Cost  (via Stock Entry),总消耗材料成本（通过股票输入）
+DocType: Project,Total Consumed Material Cost  (via Stock Entry),总物料消耗成本（通过手工库存移动）
 DocType: Hub Settings,Company Registered,公司注册
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +169,To Date cannot be less than From Date,迄今不能少于起始日期
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",基于仓库中的库存，在Hub上发布“库存”或“库存”。
 DocType: Vehicle,Fuel Type,燃料类型
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,请公司指定的货币
 DocType: Workstation,Wages per hour,时薪
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},批次{0}中，仓库{3}中品目{2}的库存余额将变为{1}
-apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列资料的要求已自动根据项目的重新排序水平的提高
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},批次{0}中，仓库{3}中物料{2}的库存余额将变为{1}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,以下物料需求数量已自动根据重订货水平相应增加了
 DocType: Email Digest,Pending Sales Orders,待完成销售订单
-apps/erpnext/erpnext/controllers/accounts_controller.py +348,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
-apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在员工解除日期之后{1}
+apps/erpnext/erpnext/controllers/accounts_controller.py +348,Account {0} is invalid. Account Currency must be {1},科目{0}状态为非激活。科目货币必须是{1}
+apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py +31,From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在员工离职日期之后{1}
 DocType: Supplier,Is Internal Supplier,是内部供应商
 DocType: Employee,Create User Permission,创建用户权限
-DocType: Employee Benefit Claim,Employee Benefit Claim,员工福利索赔
+DocType: Employee Benefit Claim,Employee Benefit Claim,员工福利申报
 DocType: Healthcare Settings,Remind Before,提醒之前
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
-DocType: Loyalty Program,1 Loyalty Points = How much base currency?,1忠诚度积分=多少基础货币？
-DocType: Salary Component,Deduction,扣款
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1089,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或手工凭证
+DocType: Loyalty Program,1 Loyalty Points = How much base currency?,1忠诚度积分=多少本币？
+DocType: Salary Component,Deduction,扣除
 DocType: Item,Retain Sample,保留样品
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,行{0}：从时间和时间是强制性的。
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: From Time and To Time is mandatory.,行{0}：开始时间和结束时间必填。
 DocType: Stock Reconciliation Item,Amount Difference,金额差异
-apps/erpnext/erpnext/stock/get_item_details.py +382,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
+apps/erpnext/erpnext/stock/get_item_details.py +382,Item Price added for {0} in Price List {1},物料价格{0}自动添加到价格清单{1}中了，以备以后订单使用
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
 DocType: Territory,Classification of Customers by region,客户按区域分类
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +78,In Production,在生产中
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +66,Difference Amount must be zero,差量必须是零
 DocType: Project,Gross Margin,毛利
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +74,{0} applicable after {1} working days,在{1}个工作日后适用{0}
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +61,Please enter Production Item first,请先输入生产项目
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +61,Please enter Production Item first,请先输入待生产物料
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,计算的银行对账单余额
 DocType: Normal Test Template,Normal Test Template,正常测试模板
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
@@ -2919,38 +2915,38 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1008,Cannot set a received RFQ to No Quote,无法将收到的询价单设置为无报价
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,扣除总额
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +22,Select an account to print in account currency,选择一个账户以账户货币进行打印
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +22,Select an account to print in account currency,选择一个科目以科目币别进行打印
 ,Production Analytics,生产Analytics（分析）
-apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,这是基于对这个病人的交易。有关详情，请参阅下面的时间表
+apps/erpnext/erpnext/healthcare/doctype/patient/patient_dashboard.py +6,This is based on transactions against this Patient. See timeline below for details,这是基于对这个病人的交易。有关信息，请参阅下面的工时单
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +204,Cost Updated,成本更新
 DocType: Patient,Date of Birth,出生日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +136,Item {0} has already been returned,物料{0}已被退回
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财政年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**财年**表示财务年度。所有的会计分录和其他重大交易将根据**财年**跟踪。
 DocType: Opportunity,Customer / Lead Address,客户/潜在客户地址
 DocType: Supplier Scorecard Period,Supplier Scorecard Setup,供应商记分卡设置
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +133,Assessment Plan Name,评估计划名称
-DocType: Work Order Operation,Work Order Operation,工作订单操作
+DocType: Work Order Operation,Work Order Operation,工单操作
 apps/erpnext/erpnext/stock/doctype/item/item.py +249,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
 apps/erpnext/erpnext/utilities/activation.py +64,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
 DocType: Work Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
-DocType: Purchase Taxes and Charges,Deduct,扣款
+DocType: Purchase Taxes and Charges,Deduct,扣除
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +219,Job Description,职位描述
 DocType: Student Applicant,Applied,应用的
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Re-open,重新打开
 DocType: Sales Invoice Item,Qty as per Stock UOM,按库存计量单位数量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Name,Guardian2名称
-DocType: Attendance,Attendance Request,出席请求
+DocType: Attendance,Attendance Request,考勤申请
 DocType: Purchase Invoice,02-Post Sale Discount,02-售后折扣
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +132,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号，""-""，""#""，"".""和""/""除外"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪营销活动。追踪来自营销活动的线索，报价，销售订单等，统计投资回报率。
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追踪促销活动。追踪来自营销活动的线索，报价，销售订单等，统计投资回报率。
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +111,You can't redeem Loyalty Points having more value than the Grand Total.,您无法兑换价值超过总计的忠诚度积分。
 DocType: Department Approver,Approver,审批者
 ,SO Qty,销售订单数量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +92,The field To Shareholder cannot be blank,“股东”字段不能为空
 DocType: Guardian,Work Address,工作地址
 DocType: Appraisal,Calculate Total Score,计算总分
-DocType: Employee,Health Insurance,健康保险
+DocType: Employee,Health Insurance,医保
 DocType: Asset Repair,Manufacturing Manager,生产经理
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 DocType: Plant Analysis Criteria,Minimum Permissible Value,最小允许值
@@ -2962,23 +2958,22 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +241,Serial No {0} does not belong to any Warehouse,序列号{0}不属于任何仓库
 DocType: Grant Application,Email Notification Sent,电子邮件通知已发送
 DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1042,"Item Code, warehouse, quantity are required on row",在行上需要项目代码，仓库，数量
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1042,"Item Code, warehouse, quantity are required on row",在行上需要物料代码，仓库，数量
 DocType: Bank Guarantee,Supplier,供应商
-apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,显示付款详情
+apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js +41,Show Payment Details,显示付款信息
 DocType: Consultation,Consultation Time,咨询时间
 DocType: C-Form,Quarter,季
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Miscellaneous Expenses,杂项开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +113,Miscellaneous Expenses,杂项费用
 DocType: Global Defaults,Default Company,默认公司
 DocType: Company,Transactions Annual History,交易年历
-apps/erpnext/erpnext/controllers/stock_controller.py +231,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
+apps/erpnext/erpnext/controllers/stock_controller.py +231,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,必须为物料{0}指定费用/差异科目。
 DocType: Payment Request,PR,PR
 DocType: Bank,Bank Name,银行名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +33,-Above,-以上
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +33,-Above,-天以上
 DocType: Leave Application,Total Leave Days,总休假天数
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：邮件不会发送给已禁用用户
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
-apps/erpnext/erpnext/stock/doctype/item/item.js +107,Item Variant Settings,项目变式设置
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,接洽次数
+apps/erpnext/erpnext/stock/doctype/item/item.js +107,Item Variant Settings,物料变式设置
 apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +37,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,{0} is mandatory for Item {1},{0}是{1}的必填项
@@ -2988,11 +2983,11 @@
 DocType: Vital Signs,Weight (In Kilogram),体重（公斤）
 DocType: Chapter,"chapters/chapter_name
 leave blank automatically set after saving chapter.",保存章节后自动设置章节/章节名称。
-apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +206,Please set GST Accounts in GST Settings,请在GST设置中设置GST帐户
+apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py +206,Please set GST Accounts in GST Settings,请在GST设置中设置GST科目
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js +46,Type of Business,业务类型
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +171,"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 +143,Cost of New Purchase,新的采购成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +99,Sales Order required for Item {0},销售订单为品目{0}的必须项
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +99,Sales Order required for Item {0},销售订单为物料{0}的必须项
 DocType: Grant Application,Grant Description,授予说明
 DocType: Purchase Invoice Item,Rate (Company Currency),单价（公司货币）
 DocType: Student Guardian,Others,他人
@@ -3000,26 +2995,26 @@
 DocType: Payment Entry,Unallocated Amount,未分配金额
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +69,Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses,请启用适用于采购订单并适用于预订实际费用
 apps/erpnext/erpnext/templates/includes/product_page.js +101,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: POS Profile,Taxes and Charges,税/费
+DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",库存中已被采购，销售或保留的一个产品或服务。
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,没有更多的更新
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +173,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +6,This covers all scorecards tied to this Setup,这涵盖了与此安装程序相关的所有记分卡
 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/data/industry_type.py +12,Banking,银行业
-apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,添加时间表
+apps/erpnext/erpnext/utilities/activation.py +108,Add Timesheets,添加工时单
 DocType: Vehicle Service,Service Item,服务项目
 DocType: Bank Guarantee,Bank Guarantee,银行担保
 DocType: Bank Guarantee,Bank Guarantee,银行担保
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取时间表
-DocType: Blanket Order Item,Ordered Quantity,订购数量
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,请在“生成表”点击获取工时单
+DocType: Blanket Order Item,Ordered Quantity,已下单数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +118,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Grading Scale,Grading Scale Intervals,分级刻度间隔
-DocType: Item Default,Purchase Defaults,购买默认值
+DocType: Item Default,Purchase Defaults,采购默认值
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +39,Profit for the year,年度利润
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能用货币单位：{3}
 DocType: Fee Schedule,In Process,进行中
-DocType: Authorization Rule,Itemwise Discount,项目特定的折扣
+DocType: Authorization Rule,Itemwise Discount,物料级的折扣
 apps/erpnext/erpnext/config/accounts.py +75,Tree of financial accounts.,财务账目的树。
 DocType: Bank Guarantee,Reference Document Type,参考文档类型
 DocType: Cash Flow Mapping,Cash Flow Mapping,现金流量映射
@@ -3030,8 +3025,8 @@
 ,Department Analytics,部门分析
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +74,Email not found in default contact,在默认联系人中找不到电子邮件
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +23,Generate Secret,生成秘密
-DocType: Loan,Account Info,帐户信息
-DocType: Activity Type,Default Billing Rate,默认计费率
+DocType: Loan,Account Info,科目信息
+DocType: Activity Type,Default Billing Rate,默认开票单价
 DocType: Fees,Include Payment,包括付款
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}学生组已创建
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +77,{0} Student Groups created.,{0}学生组已创建
@@ -3043,13 +3038,13 @@
 apps/erpnext/erpnext/config/selling.py +327,Sales Order to Payment,销售订单到付款
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +111,CEO,CEO
 DocType: Purchase Invoice,With Payment of Tax,缴纳税款
-DocType: Expense Claim Detail,Expense Claim Detail,报销详情
+DocType: Expense Claim Detail,Expense Claim Detail,报销信息
 DocType: Purchase Invoice,TRIPLICATE FOR SUPPLIER,供应商提供服务
-DocType: Exchange Rate Revaluation Account,New Balance In Base Currency,基础货币的新平衡
+DocType: Exchange Rate Revaluation Account,New Balance In Base Currency,本币新余额
 DocType: Land Unit,Is Container,是容器
 DocType: Crop Cycle,This will be day 1 of the crop cycle,这将是作物周期的第一天
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +910,Please select correct account,请选择正确的帐户
-DocType: Salary Structure Assignment,Salary Structure Assignment,薪酬结构分配
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +910,Please select correct account,请选择正确的科目
+DocType: Salary Structure Assignment,Salary Structure Assignment,薪资结构分配
 DocType: Purchase Invoice Item,Weight UOM,重量计量单位
 apps/erpnext/erpnext/config/accounts.py +478,List of available Shareholders with folio numbers,包含folio号码的可用股东名单
 DocType: Salary Structure Employee,Salary Structure Employee,薪资结构员工
@@ -3063,22 +3058,22 @@
 DocType: Supplier Scorecard,Scoring Setup,得分设置
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +24,Electronics,电子
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +349,Debit ({0}),借记卡（{0}）
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,当库存达到再订购点时提出物料请求
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,当库存达到重订货点时提出物料申请
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +101,Full-time,全职
-DocType: Payroll Entry,Employees,雇员
-DocType: Employee,Contact Details,联系人详情
+DocType: Payroll Entry,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: BOM Scrap Item,Basic Amount (Company Currency),基本金额（公司币种）
 DocType: Student,Guardians,守护者
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html +13,Payment Confirmation,付款确认
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
-DocType: Stock Entry,Total Incoming Value,总传入值
+DocType: Stock Entry,Total Incoming Value,总收到金额
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +389,Debit To is required,借记是必需的
-apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,采购价格表
+apps/erpnext/erpnext/utilities/activation.py +109,"Timesheets help keep track of time, cost and billing for activites done by your team",工时单帮助追踪的时间，费用和结算由你的团队做activites
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,Purchase Price List,采购价格清单
 apps/erpnext/erpnext/config/buying.py +155,Templates of supplier scorecard variables.,供应商记分卡变数模板。
-DocType: Job Offer Term,Offer Term,录取通知条款
+DocType: Job Offer Term,Offer Term,录用通知条款
 DocType: Asset,Quality Manager,质量经理
 DocType: Job Applicant,Job Opening,职务空缺
 DocType: Payment Reconciliation,Payment Reconciliation,付款对账
@@ -3087,11 +3082,11 @@
 DocType: Hub Settings,Unregister from Hub,从Hub注销
 apps/erpnext/erpnext/public/js/utils.js +109,Total Unpaid: {0},总未付：{0}
 DocType: BOM Website Operation,BOM Website Operation,BOM网站运营
-DocType: Bank Statement Transaction Payment Item,outstanding_amount,outstanding_amount
+DocType: Bank Statement Transaction Payment Item,outstanding_amount,未付金额
 DocType: Supplier Scorecard,Supplier Score,供应商分数
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +231,Total Invoiced Amt,总开票金额
 DocType: Supplier,Warn RFQs,警告RFQs
-DocType: BOM,Conversion Rate,兑换率
+DocType: BOM,Conversion Rate,转换率
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,产品搜索
 DocType: Assessment Plan,To Time,要时间
 apps/erpnext/erpnext/hr/utils.py +201,) for {0},）为{0}
@@ -3101,36 +3096,36 @@
 DocType: Asset,Insurance End Date,保险终止日期
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +43,Please select Student Admission which is mandatory for the paid student applicant,请选择付费学生申请者必须入学的学生
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +355,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,请选择一个价目表来发布价格
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +36,Please select a Price List to publish pricing,请选择一个价格清单来发布价格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +40,Budget List,预算清单
 DocType: Work Order Operation,Completed Qty,已完成数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,价格表{0}被禁用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +180,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方科目
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,价格清单{0}被禁用
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +127,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的数量不能超过{1}操作{2}
 DocType: Manufacturing Settings,Allow Overtime,允许加班
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化项目{0}无法使用库存调节更新，请使用库存条目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +149,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化项目{0}无法使用库存调节更新，请使用库存条目
-DocType: Training Event Employee,Training Event Employee,培训活动的员工
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1219,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,可以为批次{1}和项目{2}保留最大样本数量{0}。
+DocType: Training Event Employee,Training Event Employee,员工
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1219,Maximum Samples - {0} can be retained for Batch {1} and Item {2}.,可以为批次{1}和物料{2}保留最大样本数量{0}。
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +7,Add Time Slots,添加时间插槽
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +204,{0} Serial Numbers required for Item {1}. You have provided {2}.,物料{1}需要{0}的序列号。您已提供{2}。
-DocType: Stock Reconciliation Item,Current Valuation Rate,目前的估值价格
+DocType: Stock Reconciliation Item,Current Valuation Rate,当前评估价
 DocType: Training Event,Advance,提前
 apps/erpnext/erpnext/config/erpnext_integrations.py +13,GoCardless payment gateway settings,GoCardless支付网关设置
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,兑换收益/损失
-DocType: Opportunity,Lost Reason,丧失原因
-apps/erpnext/erpnext/controllers/accounts_controller.py +300,Row #{0}: Account {1} does not belong to company {2},行＃{0}：帐户{1}不属于公司{2}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +129,Exchange Gain/Loss,汇兑损益
+DocType: Opportunity,Lost Reason,输的原因
+apps/erpnext/erpnext/controllers/accounts_controller.py +300,Row #{0}: Account {1} does not belong to company {2},行＃{0}：科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +30,Unable to find DocType {0},无法找到DocType {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html +22,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +47,Please enter Receipt Document,请输入收据凭证
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +411,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +411,All items have already been invoiced,所有物料已开具发票
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +49,Please specify a valid 'From Case No.',请指定一个有效的“从案号”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Total allocated leaves are more days than maximum allocation of {0} leave type for employee {1} in the period,在此期间，总分配的离职时间超过员工{1}的最大分配{0}离职类型的天数
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
 DocType: Vehicle Log,VLOG.,VLOG。
-DocType: Branch,Branch,分支
+DocType: Branch,Branch,分支机构（分公司）
 DocType: Soil Analysis,Ca/(K+Ca+Mg),的Ca /（K +钙+镁）
 DocType: Delivery Trip,Fulfillment User,履行用户
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
@@ -3141,7 +3136,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列号{0}未找到
 DocType: Fee Schedule Program,Fee Schedule Program,费用计划计划
 DocType: Fee Schedule Program,Student Batch,学生批
-apps/erpnext/erpnext/utilities/activation.py +119,Make Student,使学生
+apps/erpnext/erpnext/utilities/activation.py +119,Make Student,创建学生
 DocType: Supplier Scorecard Scoring Standing,Min Grade,最小成绩
 apps/erpnext/erpnext/projects/doctype/project/project.py +258,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
 DocType: Supplier Group,Parent Supplier Group,父供应商组
@@ -3149,16 +3144,16 @@
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +47,Accumulated Values in Group Company,集团公司累计价值
 DocType: Leave Block List Date,Block Date,禁离日期
 DocType: Crop,Crop,作物
-DocType: Purchase Receipt,Supplier Delivery Note,供应商交货单
+DocType: Purchase Receipt,Supplier Delivery Note,供应商送货单
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +70,Apply Now,现在申请
 DocType: Employee Tax Exemption Proof Submission Detail,Type of Proof,证明类型
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},实际数量{0} /等待数量{1}
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},实际数量{0} /等待数量{1}
 DocType: Purchase Invoice,E-commerce GSTIN,电子商务GSTIN
 DocType: Sales Order,Not Delivered,未交付
-,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: Appraisal Goal,Appraisal Goal,绩效评估指标
 apps/erpnext/erpnext/public/js/hub/hub_form.js +425,Suggest Category?,建议分类？
 DocType: Stock Reconciliation Item,Current Amount,电流量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Buildings,房屋
@@ -3167,16 +3162,16 @@
 DocType: Timesheet Detail,Costing Amount,成本核算金额
 DocType: Student Admission Program,Application Fee,报名费
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +60,Submit Salary Slip,提交工资单
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,On Hold,等候接听
-apps/erpnext/erpnext/controllers/selling_controller.py +138,Maxiumm discount for Item {0} is {1}%,品目{0}的最大折扣为 {1}%
-DocType: Account,Inter Company Account,Inter公司帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,On Hold,暂缓处理
+apps/erpnext/erpnext/controllers/selling_controller.py +138,Maxiumm discount for Item {0} is {1}%,物料{0}的最大折扣为 {1}%
+DocType: Account,Inter Company Account,关联公司间交易科目
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,进口散装
 DocType: Sales Partner,Address & Contacts,地址及联系方式
 DocType: SMS Log,Sender Name,发件人名称
 DocType: Agriculture Analysis Criteria,Agriculture Analysis Criteria,农业分析标准
-DocType: HR Settings,Leave Approval Notification Template,留下批准通知模板
+DocType: HR Settings,Leave Approval Notification Template,休假已批准通知模板
 DocType: POS Profile,[Select],[选择]
-DocType: Staffing Plan Detail,Number Of Positions,职位数
+DocType: Staffing Plan Detail,Number Of Positions,人数
 DocType: Vital Signs,Blood Pressure (diastolic),血压（舒张）
 DocType: SMS Log,Sent To,发给
 DocType: Agriculture Task,Holiday Management,度假管理
@@ -3189,18 +3184,18 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +71,Invalid {0}: {1},无效的{0}：{1}
 ,GSTR-1,GSTR-1
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
-DocType: Fee Validity,Reference Inv,参考文献
+DocType: Fee Validity,Reference Inv,参考发票
 DocType: Sales Invoice Advance,Advance Amount,预付款总额
 DocType: Manufacturing Settings,Capacity Planning,容量规划
 DocType: Supplier Quotation,Rounding Adjustment (Company Currency,四舍五入调整（公司货币）
 DocType: Asset,Policy number,保单号码
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,“起始日期”是必需的
 DocType: Journal Entry,Reference Number,参考号码
-DocType: Employee,New Workplace,新建工作地点
-DocType: Retention Bonus,Retention Bonus,保留奖金
+DocType: Employee,New Workplace,新工作地点
+DocType: Retention Bonus,Retention Bonus,持续服务奖
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +347,Material Consumption,材料消耗
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,设置为关闭
-apps/erpnext/erpnext/stock/get_item_details.py +137,No Item with Barcode {0},没有条码为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +137,No Item with Barcode {0},没有条码为{0}的物料
 DocType: Normal Test Items,Require Result Value,需要结果值
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +532,Boms,物料清单
@@ -3212,7 +3207,7 @@
 DocType: Item,End of Life,寿命结束
 apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,出差
 DocType: Student Report Generation Tool,Include All Assessment Group,包括所有评估小组
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +254,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +254,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: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,现金流量映射模板细节
@@ -3220,20 +3215,20 @@
 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 +81,Update Cost,更新成本
-DocType: Item Reorder,Item Reorder,项目重新排序
+DocType: Item Reorder,Item Reorder,物料重新排序
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,显示工资单
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +917,Transfer Material,转印材料
-DocType: Fees,Send Payment Request,发送付款请求
+DocType: Fees,Send Payment Request,发送付款申请
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
 DocType: Travel Request,Any other details,任何其他细节
 DocType: Water Analysis,Origin,起源
 apps/erpnext/erpnext/controllers/status_updater.py +207,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 +1162,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +821,Select change amount account,选择变化量账户
-DocType: Purchase Invoice,Price List Currency,价格表货币
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +821,Select change amount account,选择零钱科目
+DocType: Purchase Invoice,Price List Currency,价格清单货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
-DocType: Installation Note,Installation Note,安装注意事项
+DocType: Installation Note,Installation Note,安装通知单
 DocType: Soil Texture,Clay,粘土
 DocType: Topic,Topic,话题
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +99,Cash Flow from Financing,融资现金流
@@ -3244,7 +3239,7 @@
 DocType: Cash Flow Mapping,Is Income Tax Liability,是所得税责任
 DocType: Grading Scale Interval,Grade Description,等级说明
 DocType: Clinical Procedure,Is Invoiced,已开票
-DocType: Stock Entry,Purchase Receipt No,购买收据号码
+DocType: Stock Entry,Purchase Receipt No,采购收货号码
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +31,Earnest Money,保证金
 DocType: Sales Invoice, Shipping Bill Number,运费清单号码
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,可追溯性
@@ -3253,7 +3248,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +144,Source of Funds (Liabilities),资金来源（负债）
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +52,Source and Target Location cannot be same,源和目标位置不能相同
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +484,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
-DocType: Supplier Scorecard Scoring Standing,Employee,雇员
+DocType: Supplier Scorecard Scoring Standing,Employee,员工
 DocType: Bank Guarantee,Fixed Deposit Number,定期存款编号
 DocType: Asset Repair,Failure Date,失败日期
 DocType: Support Search Source,Result Title Field,结果标题字段
@@ -3270,35 +3265,35 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +325,Are you sure you want to cancel this appointment?,你确定要取消这个预约吗？
 DocType: Hotel Room Pricing Package,Hotel Room Pricing Package,酒店房间价格套餐
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,销售渠道
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +210,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +210,Please set default account in Salary Component {0},请薪资部分设置默认科目{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Rename Tool,File to Rename,文件重命名
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +200,Please select BOM for Item in Row {0},请为第{0}行的物料指定物料清单
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +13,Fetch Subscription Updates,获取订阅更新
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},帐户{0}与帐户模式{2}中的公司{1}不符
-apps/erpnext/erpnext/controllers/buying_controller.py +690,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account {0} does not match with Company {1} in Mode of Account: {2},科目{0}与科目模式{2}中的公司{1}不符
+apps/erpnext/erpnext/controllers/buying_controller.py +690,Specified BOM {0} does not exist for Item {1},物料{1}指定的BOM{0}不存在
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +301,Course: ,课程：
 DocType: Soil Texture,Sandy Loam,桑迪Loam
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +239,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 DocType: POS Profile,Applicable for Users,适用于用户
-DocType: Notification Control,Expense Claim Approved,报销批准
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,没有创建工作订单
+DocType: Notification Control,Expense Claim Approved,费用报销已批准
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +231,No Work Orders created,没有创建工单
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +144,Pharmaceutical,医药
-apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +24,You can only submit Leave Encashment for a valid encashment amount,您只能提交离开封存以获得有效的兑换金额
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购品目成本
-DocType: Employee Separation,Employee Separation Template,员工分离模板
+apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py +24,You can only submit Leave Encashment for a valid encashment amount,假期折现的折现金额不正确
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,采购物料成本
+DocType: Employee Separation,Employee Separation Template,员工离职模板
 DocType: Selling Settings,Sales Order Required,销售订单为必须项
 DocType: Purchase Invoice,Credit To,入贷
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,活动信息/客户
 DocType: Employee Education,Post Graduate,研究生
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,维护计划细节
 DocType: Supplier Scorecard,Warn for new Purchase Orders,警告新的采购订单
-DocType: Quality Inspection Reading,Reading 9,阅读9
+DocType: Quality Inspection Reading,Reading 9,检验结果9
 DocType: Supplier,Is Frozen,被冻结
 apps/erpnext/erpnext/stock/utils.py +250,Group node warehouse is not allowed to select for transactions,组节点仓库不允许选择用于交易
 DocType: Buying Settings,Buying Settings,采购设置
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,成品品目的BOM编号
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,成品物料的BOM编号
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
 DocType: Request for Quotation Supplier,No Quote,没有报价
 DocType: Support Search Source,Post Title Key,帖子标题密钥
@@ -3319,22 +3314,22 @@
 DocType: Room,Room Number,房间号
 apps/erpnext/erpnext/utilities/transaction_base.py +101,Invalid reference {0} {1},无效的参考{0} {1}
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
-DocType: Journal Entry Account,Payroll Entry,工资项目
+DocType: Journal Entry Account,Payroll Entry,工资计算
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js +75,View Fees Records,查看费用记录
-apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,使税收模板
+apps/erpnext/erpnext/setup/doctype/company/company.js +55,Make Tax Template,创建税收模板
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +319,Raw Materials cannot be blank.,原材料不能为空。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +525,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含由供应商交货（直接发运）项目。
 DocType: Contract,Fulfilment Status,履行状态
 DocType: Lab Test Sample,Lab Test Sample,实验室测试样品
 DocType: Item Variant Settings,Allow Rename Attribute Value,允许重命名属性值
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +552,Quick Journal Entry,快速日记帐分录
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +552,Quick Journal Entry,快速简化手工凭证
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +227,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
 DocType: Restaurant,Invoice Series Prefix,发票系列前缀
-DocType: Employee,Previous Work Experience,以前的工作经验
+DocType: Employee,Previous Work Experience,以前工作经验
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +403,Assign Salary Structure,分配薪资结构
 DocType: Support Settings,Response Key List,响应密钥列表
-DocType: Stock Entry,For Quantity,对于数量
+DocType: Stock Entry,For Quantity,数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +205,Please enter Planned Qty for Item {0} at row {1},请输入计划数量的项目{0}在行{1}
 DocType: Support Search Source,API,API
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +93,Google Maps integration is not enabled,Google地图集成未启用
@@ -3342,16 +3337,16 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +273,{0} {1} is not submitted,{0} {1}未提交
 DocType: Subscription,Trialling,试用
 DocType: Sales Invoice Item,Deferred Revenue,递延收入
-DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,现金帐户将用于创建销售发票
+DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,现金科目将用于创建销售发票
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,豁免子类别
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Group / Supplier,供应商集团/供应商
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Group / Supplier,供应商群组/供应商
 DocType: Member,Membership Expiry Date,会员到期日
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +134,{0} must be negative in return document,{0}在返回文档中必须为负
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +134,{0} must be negative in return document,{0}在退货凭证中必须为负
 DocType: Employee Tax Exemption Proof Submission,Submission Date,提交日期
-,Minutes to First Response for Issues,分钟的问题第一个反应
+,Minutes to First Response for Issues,问题首次响应（分钟）
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
 apps/erpnext/erpnext/public/js/setup_wizard.js +109,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.",会计分录冻结截止至此日期，除了以下角色禁止录入/修改。
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会计凭证冻结截止至此日期，除了以下角色外，其它用户被禁止录入/修改。
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js +45,Latest price updated in all BOMs,最新价格在所有BOM中更新
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,项目状态
@@ -3362,12 +3357,12 @@
 DocType: Delivery Note,Transporter Name,承运商名称
 DocType: Authorization Rule,Authorized Value,授权值
 DocType: BOM,Show Operations,显示操作
-,Minutes to First Response for Opportunity,分钟的机会第一个反应
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Absent,共缺席
+,Minutes to First Response for Opportunity,机会首次响应（分钟）
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Absent,共缺勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1016,Item or Warehouse for row {0} does not match Material Request,行{0}中的项目或仓库与物料申请不符合
 apps/erpnext/erpnext/config/stock.py +195,Unit of Measure,计量单位
 DocType: Fiscal Year,Year End Date,年度结束日期
-DocType: Task Depends On,Task Depends On,任务取决于
+DocType: Task Depends On,Task Depends On,前置任务
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +1050,Opportunity,机会
 DocType: Operation,Default Workstation,默认工作台
 DocType: Notification Control,Expense Claim Approved Message,报销批准消息
@@ -3379,9 +3374,9 @@
 DocType: Purchase Invoice,ineligible,不合格
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清单树
 DocType: Student,Joining Date,入职日期
-,Employees working on a holiday,员工在假期工作
+,Employees working on a holiday,员工假期加班
 DocType: Share Balance,Current State,当前状态
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,马克现在
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,标记为出勤
 DocType: Share Transfer,From Shareholder,来自股东
 DocType: Project,% Complete Method,完成百分比法
 apps/erpnext/erpnext/healthcare/setup.py +182,Drug,药物
@@ -3391,7 +3386,7 @@
 DocType: BOM,Operating Cost (Company Currency),营业成本（公司货币）
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),适用于(角色)
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +10,Pending Leaves,等待叶子
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +10,Pending Leaves,待审批的休假
 DocType: BOM Update Tool,Replace BOM,更换BOM
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +110,Code {0} already exist,代码{0}已经存在
 DocType: Consultation,Procedures,程序
@@ -3400,27 +3395,27 @@
 DocType: Company,Fixed Asset Depreciation Settings,固定资产折旧设置
 DocType: Item,Will also apply for variants unless overrridden,除非手动指定，否则会同时应用于变体
 DocType: Purchase Invoice,Advances,进展
-DocType: Work Order,Manufacture against Material Request,对制造材料要求
+DocType: Work Order,Manufacture against Material Request,为物料需求生产
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +14,Assessment Group: ,评估组：
-DocType: Item Reorder,Request for,要求
+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: Stock Entry Detail,Basic Rate (as per Stock UOM),库存评估价（按库存计量单位）
 DocType: SMS Log,No of Requested SMS,请求短信数量
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
-DocType: Campaign,Campaign-.####,活动-.####
+DocType: Campaign,Campaign-.####,促销活动-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
 DocType: Travel Request,Domestic,国内
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +820,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +19,Employee Transfer cannot be submitted before Transfer Date ,员工转移无法在转移日期前提交
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +19,Employee Transfer cannot be submitted before Transfer Date ,员工变动无法在变动日期前提交
 DocType: Certification Application,USD,美元
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +28,Make Invoice,创建发票
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +103,Remaining Balance,保持平衡
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +103,Remaining Balance,余额
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之后自动关闭商机
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +87,Purchase Orders are not allowed for {0} due to a scorecard standing of {1}.,由于{1}的记分卡，{0}不允许采购订单。
 apps/erpnext/erpnext/stock/doctype/item/item.py +514,Barcode {0} is not a valid {1} code,条形码{0}不是有效的{1}代码
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js +25,End Year,结束年份
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/线索％
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/线索％
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +134,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
 DocType: Driver,Driver,司机
 DocType: Vital Signs,Nutrition Values,营养价值观
@@ -3429,11 +3424,11 @@
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,授权销售公司产品的第三方分销商/经销商/授权代理商/分支机构/转销商
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +408,{0} against Purchase Order {1},{0}不允许采购订单{1}
 DocType: Patient,Patient Demographics,患者人口统计学
-DocType: Task,Actual Start Date (via Time Sheet),实际开始日期（通过时间表）
+DocType: Task,Actual Start Date (via Time Sheet),实际开始日期（通过工时单）
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,这是一个示例网站从ERPNext自动生成
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +49,Ageing Range 1,账龄范围1
 DocType: Shopify Settings,Enable Shopify,启用Shopify
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Total advance amount cannot be greater than total claimed amount,总预付金额不能超过索赔总额
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +219,Total advance amount cannot be greater than total claimed amount,总预付金额不能超过申报总额
 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
@@ -3454,11 +3449,11 @@
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
 9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
-10. Add or Deduct: Whether you want to add or deduct the tax.","标准税项模板可应用到所有采购交易中。此模板可以包含多个税项及其他的开支项(例如“运费”，“保险费”，“处理费”等)。
+10. Add or Deduct: Whether you want to add or deduct the tax.","标准税项模板可应用到所有采购交易中。此模板可以包含多个税项及其他的费用项(例如“运费”，“保险费”，“处理费”等)。
 ###需要注意的是，这里指定的是试用于相关单据中所有物料的标准税费率。如果某些物料的税费率与标准税费率不同，则您必须在“物料主数据”内的“物料税项”内添加。
 ####列说明
 1. 计算类型：-“净总计”(即基本总额)；-“基于前一行的总计/金额”(用于累计税费率)，选择此项则税费将基于前一行的总计/金额按百分比计算；-“实际”(按实际输入)。
-2. 账户头： 此税费对应的会计分类帐。
+2. 一级科目： 此税费对应的会计分类帐。
 3. 成本中心： 如果此税费为收益或支出，那么必须指定一个成本中心。
 4. 说明：税费项的说明，会被用于如发票/报价的打印中。
 5. 税率：税项的比率
@@ -3471,28 +3466,28 @@
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +68,Select Physician...,选择医师...
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +598,Back to Products,返回产品
 DocType: Grant Application,Grant Application Details ,授予申请细节
-DocType: Employee Separation,Employee Separation,员工分离
-DocType: BOM Item,Original Item,原始项目
+DocType: Employee Separation,Employee Separation,员工离职
+DocType: BOM Item,Original Item,原物料
 DocType: Purchase Receipt Item,Recd Quantity,记录数量
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +65,Fee Records Created - {0},费纪录创造 -  {0}
-DocType: Asset Category Account,Asset Category Account,资产类别的帐户
+DocType: Asset Category Account,Asset Category Account,资产类别的科目
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +966,Row #{0} (Payment Table): Amount must be positive,行＃{0}（付款表）：金额必须为正值
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +145,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +145,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的物料{0}
 apps/erpnext/erpnext/stock/doctype/item/item.js +422,Select Attribute Values,选择属性值
 DocType: Purchase Invoice,Reason For Issuing document,签发文件的原因
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +578,Stock Entry {0} is not submitted,库存记录{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +578,Stock Entry {0} is not submitted,手工库存移动{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,接着联系到不能相同铅邮箱地址
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +47,Next Contact By cannot be same as the Lead Email Address,下一个联络人不能与线索的邮箱地址相同
 DocType: Tax Rule,Billing City,结算城市
 DocType: Asset,Manual,手册
-DocType: Salary Component Account,Salary Component Account,薪金部分账户
+DocType: Salary Component Account,Salary Component Account,薪资构成科目
 DocType: Global Defaults,Hide Currency Symbol,隐藏货币符号
 apps/erpnext/erpnext/config/non_profit.py +58,Donor information.,捐助者信息。
 apps/erpnext/erpnext/config/accounts.py +336,"e.g. Bank, Cash, Credit Card",例如：银行，现金，信用卡
 DocType: Job Applicant,Source Name,源名称
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",成年人的正常静息血压约为收缩期120mmHg，舒张压80mmHg，缩写为“120 / 80mmHg”
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +124,"Set items shelf life in days, to set expiry based on manufacturing_date plus self life",以天为单位设置货架保质期，根据manufacturing_date加上自我生命设置到期日
-DocType: Journal Entry,Credit Note,信用票据
+DocType: Journal Entry,Credit Note,退款单
 DocType: Projects Settings,Ignore Employee Time Overlap,忽略员工时间重叠
 DocType: Warranty Claim,Service Address,服务地址
 DocType: Asset Maintenance Task,Calibration,校准
@@ -3500,18 +3495,18 @@
 apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +19,Leave Status Notification,离开状态通知
 DocType: Patient Appointment,Procedure Prescription,程序处方
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Furnitures and Fixtures,家具及固定装置
-DocType: Travel Request,Travel Type,旅行类型
+DocType: Travel Request,Travel Type,出差类型
 DocType: Item,Manufacture,生产
 apps/erpnext/erpnext/utilities/user_progress.py +27,Setup Company,安装公司
-,Lab Test Report,实验室测试报告
+,Lab Test Report,实验室测试报表
 DocType: Employee Benefit Application,Employee Benefit Application,员工福利申请
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,请送货单第一
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,请先选择销售出货单
 DocType: Student Applicant,Application Date,申请日期
-DocType: Salary Component,Amount based on formula,量基于式
-DocType: Purchase Invoice,Currency and Price List,货币和价格表
+DocType: Salary Component,Amount based on formula,金额基于公式
+DocType: Purchase Invoice,Currency and Price List,货币和价格清单
 DocType: Opportunity,Customer / Lead Name,客户/潜在客户名称
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +115,Clearance Date not mentioned,清拆日期未提及
-DocType: Payroll Period,Taxable Salary Slabs,应税薪金板块
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +115,Clearance Date not mentioned,请填写清帐日期
+DocType: Payroll Period,Taxable Salary Slabs,应税工资累进税率表
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,生产
 DocType: Guardian,Occupation,占用
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
@@ -3522,39 +3517,39 @@
 apps/erpnext/erpnext/utilities/user_progress.py +31,You added ,你加了
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +10,Training Result,培训结果
-DocType: Purchase Invoice,Is Paid,支付
-DocType: Salary Structure,Total Earning,总盈利
-DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
+DocType: Purchase Invoice,Is Paid,已付款？
+DocType: Salary Structure,Total Earning,总收入
+DocType: Purchase Receipt,Time at which materials were received,收到物料的时间
 DocType: Products Settings,Products per Page,每页产品
-DocType: Stock Ledger Entry,Outgoing Rate,传出率
+DocType: Stock Ledger Entry,Outgoing Rate,出库库存评估价
 apps/erpnext/erpnext/controllers/accounts_controller.py +349, or ,或
 DocType: Sales Order,Billing Status,账单状态
-apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报告问题
+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 +127,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 +253,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 +253,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日记条目{1}没有科目{2}或已经对另一凭证匹配
 DocType: Supplier Scorecard Criteria,Criteria Weight,标准重量
-apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,留下批准通知
-DocType: Buying Settings,Default Buying Price List,默认采购价格表
-DocType: Payroll Entry,Salary Slip Based on Timesheet,基于时间表工资单
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,购买率
-apps/erpnext/erpnext/controllers/buying_controller.py +573,Row {0}: Enter location for the asset item {1},行{0}：输入资产项目{1}的位置
+apps/erpnext/erpnext/patches/v11_0/add_default_email_template_for_leave.py +7,Leave Approval Notification,休假已批准通知
+DocType: Buying Settings,Default Buying Price List,默认采购价格清单
+DocType: Payroll Entry,Salary Slip Based on Timesheet,基于工时单
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +49,Buying Rate,采购价
+apps/erpnext/erpnext/controllers/buying_controller.py +573,Row {0}: Enter location for the asset item {1},行{0}：请为第{0}行的资产，即物料号{1}输入位置信息
 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/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",设置例如公司，货币，当前财务年度等的默认值
 DocType: Payment Entry,Payment Type,付款类型
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +245,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +245,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
 DocType: Hub Category,Parent Category,父类别
-DocType: Payroll Entry,Select Employees,选择雇员
+DocType: Payroll Entry,Select Employees,选择员工
 DocType: Shopify Settings,Sales Invoice Series,销售发票系列
 DocType: Opportunity,Potential Sales Deal,潜在的销售交易
 DocType: Complaint,Complaints,投诉
-DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,雇员免税声明
+DocType: Employee Tax Exemption Declaration,Employee Tax Exemption Declaration,员工免税声明
 DocType: Payment Entry,Cheque/Reference Date,支票/参考日期
-DocType: Purchase Invoice,Total Taxes and Charges,总营业税金及费用
+DocType: Purchase Invoice,Total Taxes and Charges,总税/费
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +89,Available-for-use Date is entered as past date,可供使用的日期是作为过去的日期输入的
 DocType: Employee,Emergency Contact,紧急联络人
-DocType: Bank Reconciliation Detail,Payment Entry,付款记录
+DocType: Bank Reconciliation Detail,Payment Entry,付款凭证
 ,sales-browser,销售浏览器
 apps/erpnext/erpnext/accounts/doctype/account/account.js +73,Ledger,分类账
 DocType: Patient Medical Record,PMR-,PMR-
@@ -3563,30 +3558,30 @@
 DocType: POS Profile,Print Format for Online,在线打印格式
 DocType: Shopping Cart Settings,Shopping Cart Settings,购物车设置
 DocType: Journal Entry,Accounting Entries,会计分录
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, 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;字段中取出。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, 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;字段中取出。
 DocType: Journal Entry,Paid Loan,付费贷款
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},重复的条目，请检查授权规则{0}
 DocType: Journal Entry Account,Reference Due Date,参考到期日
 DocType: Purchase Order,Ref SQ,参考SQ
-DocType: Leave Type,Applicable After (Working Days),适用于（工作日）
+DocType: Leave Type,Applicable After (Working Days),申请休假前最少工作天数
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +55,Receipt document must be submitted,收到文件必须提交
 DocType: Purchase Invoice Item,Received Qty,收到数量
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +347,Not Paid and Not Delivered,没有支付，未送达
-DocType: Product Bundle,Parent Item,父项目
-DocType: Account,Account Type,账户类型
+DocType: Product Bundle,Parent Item,上层物料
+DocType: Account,Account Type,科目类型
 DocType: Delivery Note,DN-RET-,DN-RET-
 DocType: Shopify Settings,Webhooks Details,Webhooks详细信息
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,没有考勤表
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless客户
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +160,Leave Type {0} cannot be carry-forwarded,休假类型{0}不能随身转发
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有物料生成，请点击“生产计划”
 ,To Produce,以生产
 DocType: Leave Encashment,Payroll,工资表
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +198,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率，行{3}也必须包括
 DocType: Healthcare Service Unit,Parent Service Unit,家长服务单位
-apps/erpnext/erpnext/utilities/activation.py +101,Make User,使用户
-DocType: Packing Slip,Identification of the package for the delivery (for print),打包品目的标志（用于打印）
+apps/erpnext/erpnext/utilities/activation.py +101,Make User,创建用户
+DocType: Packing Slip,Identification of the package for the delivery (for print),打包物料的标志（用于打印）
 DocType: Bin,Reserved Quantity,保留数量
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,请输入有效的电子邮件地址
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,请输入有效的电子邮件地址
@@ -3594,16 +3589,16 @@
 DocType: Bank Reconciliation,Include POS Transactions,包括POS交易
 DocType: Purchase Invoice,Inter Company Invoice Reference,Inter公司发票参考
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +882,Please select an item in the cart,请在购物车中选择一个项目
-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/setup/setup_wizard/operations/install_fixtures.py +77,Arrear,拖欠
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Depreciation Amount during the period,期间折旧额
-DocType: Sales Invoice,Is Return (Credit Note),是退货（信用票据）
+DocType: Sales Invoice,Is Return (Credit Note),是退货？（退款单）
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +32,Serial no is required for the asset {0},资产{0}需要序列号
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +43,Disabled template must not be default template,被禁用模板不能设为默认模板
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py +290,For row {0}: Enter planned qty,对于行{0}：输入计划的数量
 DocType: Shareholder,SH-,SH-
-DocType: Account,Income Account,收益账户
+DocType: Account,Income Account,收入科目
 DocType: Payment Request,Amount in customer's currency,量客户的货币
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +869,Delivery,交货
 DocType: Volunteer,Weekdays,平日
@@ -3611,33 +3606,33 @@
 DocType: Restaurant Menu,Restaurant Menu,餐厅菜单
 DocType: Loyalty Program,Help Section,帮助科
 apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一页
-DocType: Appraisal Goal,Key Responsibility Area,关键责任区
+DocType: Appraisal Goal,Key Responsibility Area,关键责任范围
 apps/erpnext/erpnext/utilities/activation.py +127,"Student Batches help you track attendance, assessments and fees for students",学生批帮助您跟踪学生的出勤，评估和费用
-DocType: Payment Entry,Total Allocated Amount,总拨款额
+DocType: Payment Entry,Total Allocated Amount,总已分配金额
 apps/erpnext/erpnext/setup/doctype/company/company.py +157,Set default inventory account for perpetual inventory,设置永续库存模式下的默认库存科目
 DocType: Item Reorder,Material Request Type,物料申请类型
 apps/erpnext/erpnext/non_profit/doctype/grant_application/grant_application.js +17,Send Grant Review Email,发送格兰特回顾邮件
-apps/erpnext/erpnext/accounts/page/pos/pos.js +859,"LocalStorage is full, did not save",localStorage的是满的，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +859,"LocalStorage is full, did not save",存储空间已满，未保存
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +113,Row {0}: UOM Conversion Factor is mandatory,行{0}：计量单位转换系数是必需的
-DocType: Employee Benefit Claim,Claim Date,索赔日期
+DocType: Employee Benefit Claim,Claim Date,申报日期
 apps/erpnext/erpnext/utilities/user_progress.py +235,Room Capacity,房间容量
-apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},已有记录存在项目{0}
+apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py +28,Already record exists for the item {0},物料{0}已存在
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +28,Ref,参考
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +48,You will lose records of previously generated invoices. Are you sure you want to restart this subscription?,您将失去先前生成的发票记录。您确定要重新启用此订阅吗？
 DocType: Lab Test,LP-,LP-
 DocType: Healthcare Settings,Registration Fee,注册费用
 DocType: Loyalty Program Collection,Loyalty Program Collection,忠诚度计划集
-DocType: Stock Entry Detail,Subcontracted Item,转包项目
+DocType: Stock Entry Detail,Subcontracted Item,外包物料
 DocType: Budget,Cost Center,成本中心
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +45,Voucher #,凭证 #
 DocType: Notification Control,Purchase Order Message,采购订单的消息
 DocType: Tax Rule,Shipping Country,航运国家
-DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,从销售交易隐藏客户的税号
+DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,从销售交易隐藏客户的纳税登记号
 DocType: Upload Attendance,Upload HTML,上传HTML
-DocType: Employee,Relieving Date,解除日期
-DocType: Purchase Invoice,Total Quantity,总数（量
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,仓库只能通过仓储记录/送货单/采购收据来修改
+DocType: Employee,Relieving Date,离职日期
+DocType: Purchase Invoice,Total Quantity,总数量
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格清单/定义折扣百分比，基于某些条件。
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,仓库信息只能通过手工库存移动/销售出货/采购收货来修改
 DocType: Employee Education,Class / Percentage,类/百分比
 DocType: Shopify Settings,Shopify Settings,Shopify设置
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +122,Head of Marketing and Sales,营销和销售主管
@@ -3646,25 +3641,25 @@
 apps/erpnext/erpnext/utilities/user_progress.py +101,Go to Letterheads,去信头
 DocType: Subscription,Cancel At End Of Period,在期末取消
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +114,Property already added,已添加属性
-DocType: Item Supplier,Item Supplier,项目供应商
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1263,Please enter Item Code to get batch no,请输入产品编号，以获得批号
+DocType: Item Supplier,Item Supplier,物料供应商
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1263,Please enter Item Code to get batch no,请输入物料代码，以获得批号
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +914,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +428,No Items selected for transfer,没有选择转移项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +428,No Items selected for transfer,请选择物料
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
-apps/erpnext/erpnext/accounts/doctype/account/account.py +185,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
+apps/erpnext/erpnext/accounts/doctype/account/account.py +185,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是群组，根类型，公司
 DocType: Vehicle,Electric,电动
 DocType: Task,% Progress,％进展
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Gain/Loss on Asset Disposal,在资产处置收益/损失
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +21,"Only the Student Applicant with the status ""Approved"" will be selected in the table below.",下表中将只选择状态为“已批准”的学生申请人。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +118,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,帐户{0}的帐户号码不可用。 <br>请正确设置您的会计科目表。
-DocType: Task,Depends on Tasks,取决于任务
+apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +118,Account number for account {0} is not available.<br> Please setup your Chart of Accounts correctly.,科目{0}的科目号码不可用。 <br>请正确设置您的会计科目表。
+DocType: Task,Depends on Tasks,前置任务
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客户群组
 DocType: Normal Test Items,Result Value,结果值
 DocType: Hotel Room,Hotels,酒店
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新建成本中心名称
-DocType: Leave Control Panel,Leave Control Panel,假期控制面板
+DocType: Leave Control Panel,Leave Control Panel,休假控制面板
 DocType: Project,Task Completion,任务完成
 apps/erpnext/erpnext/templates/includes/product_page.js +31,Not in Stock,断货
 DocType: Volunteer,Volunteer Skills,志愿者技能
@@ -3675,11 +3670,11 @@
 DocType: Loyalty Program,Loyalty Program Name,忠诚计划名称
 apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},状态必须是{0}中的一个
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +64,Reminder to update GSTIN Sent,提醒更新GSTIN发送
-DocType: Sales Invoice,Debit To,入借
+DocType: Sales Invoice,Debit To,科目（应收帐款）
 DocType: Restaurant Menu Item,Restaurant Menu Item,餐厅菜单项
-DocType: Delivery Note,Required only for sample item.,只对样品项目所需。
+DocType: Delivery Note,Required only for sample item.,只针对样品物料。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易过帐后实际数量
-,Pending SO Items For Purchase Request,待处理的SO项目对于采购申请
+,Pending SO Items For Purchase Request,针对采购申请的待处理销售订单行
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +35,Student Admissions,学生入学
 apps/erpnext/erpnext/accounts/party.py +400,{0} {1} is disabled,{0} {1}已禁用
 DocType: Supplier,Billing Currency,结算货币
@@ -3695,7 +3690,7 @@
 DocType: Bank Reconciliation Detail,Cheque Number,支票号码
 ,Sales Browser,销售列表
 DocType: Journal Entry,Total Credit,总贷方金额
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +581,Warning: Another {0} # {1} exists against stock entry {2},警告：针对库存记录{2}存在另一个{0}＃{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +581,Warning: Another {0} # {1} exists against stock entry {2},警告：库存凭证{2}中已存在另一个{0}＃{1}
 apps/erpnext/erpnext/utilities/user_progress_utils.py +66,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,债务人
@@ -3719,19 +3714,19 @@
 DocType: Stock Entry,Target Warehouse Name,目标仓库名称
 DocType: Work Order Operation,Planned Start Time,计划开始时间
 DocType: Course,Assessment,评定
-DocType: Payment Entry Reference,Allocated,已核销
-apps/erpnext/erpnext/config/accounts.py +273,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
+DocType: Payment Entry Reference,Allocated,已分配
+apps/erpnext/erpnext/config/accounts.py +273,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，记帐到损益表。
 DocType: Student Applicant,Application Status,应用现状
 DocType: Sensitivity Test Items,Sensitivity Test Items,灵敏度测试项目
 DocType: Project Update,Project Update,项目更新
 DocType: Fees,Fees,费用
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定货币兑换的汇率
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定外币汇率的汇率
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +161,Quotation {0} is cancelled,报价{0}已被取消
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +132,Total Outstanding Amount,总待处理金额
 DocType: Sales Partner,Targets,目标
 apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +40,Please register the SIREN number in the company information file,请在公司信息文件中注册SIREN号码
-DocType: Price List,Price List Master,价格表大师
-DocType: GST Account,CESS Account,CESS帐户
+DocType: Price List,Price List Master,价格清单主数据
+DocType: GST Account,CESS Account,CESS科目
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
 apps/erpnext/erpnext/templates/pages/help.html +35,Forum Activity,论坛活动
 ,S.O. No.,销售订单号
@@ -3741,19 +3736,19 @@
 apps/erpnext/erpnext/healthcare/page/medical_record/patient_select.html +3,Select Patient,选择患者
 DocType: Price List,Applicable for Countries,适用于国家
 DocType: Supplier Scorecard Scoring Variable,Parameter Name,参数名称
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +46,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申请“已批准”和“拒绝”，就可以提交
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +46,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,仅可以提交状态为“已批准”和“已拒绝”的休假申请
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +52,Student Group Name is mandatory in row {0},学生组名称是强制性的行{0}
 DocType: Homepage,Products to be shown on website homepage,在网站首页中显示的产品
-apps/erpnext/erpnext/hr/doctype/department/department.js +9,This is a root customer group and cannot be edited.,ERPNext是一个开源的基于Web的ERP系统通过网络注技术私人有限公司向提供集成的工具，在一个小的组织管理大多数进程。有关Web注释，或购买托管楝更多信息，请访问
+apps/erpnext/erpnext/hr/doctype/department/department.js +9,This is a root customer group and cannot be edited.,ERPNext是一个开源的基于Web的ERP系统通过网络注技术私人有限公司向提供集成的工具，在一个小的组织管理大多数进程。有关Web注释，或采购托管楝更多信息，请访问
 DocType: Student,AB-,AB-
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded on PO,采购订单上累计每月预算超出时的操作
 DocType: Exchange Rate Revaluation,Exchange Rate Revaluation,汇率重估
 DocType: POS Profile,Ignore Pricing Rule,忽略定价规则
 DocType: Employee Education,Graduate,研究生
 DocType: Leave Block List,Block Days,禁离天数
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +83,"Shipping Address does not have country, which is required for this Shipping Rule",送货地址没有国家，这是运输规则所必需的
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +83,"Shipping Address does not have country, which is required for this Shipping Rule",销售出货地址没有国家，这是运输规则所必需的
 DocType: Journal Entry,Excise Entry,Excise分录
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +67,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：销售订单{0}已经存在针对客户的采购订单{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +67,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:
@@ -3768,67 +3763,67 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.",可以添加至销售或采购的标准条款和条件。例如：1. 报价有效期。 2.付款条件(预付款，赊购，部分预付款)。3.其他，例如安全/使用警告，退货政策，配送条款，争议/赔偿/责任仲裁方式，贵公司的地址和联系方式。
 DocType: Issue,Issue Type,发行类型
-DocType: Attendance,Leave Type,假期类型
-DocType: Purchase Invoice,Supplier Invoice Details,供应商发票明细
+DocType: Attendance,Leave Type,休假类型
+DocType: Purchase Invoice,Supplier Invoice Details,供应商发票信息
 DocType: Agriculture Task,Ignore holidays,忽略假期
-apps/erpnext/erpnext/controllers/stock_controller.py +237,Expense / Difference account ({0}) must be a 'Profit or Loss' account,开支/差异帐户({0})必须是一个“益损”账户
+apps/erpnext/erpnext/controllers/stock_controller.py +237,Expense / Difference account ({0}) must be a 'Profit or Loss' account,费用/差异科目({0})必须是一个“益损”类科目
 DocType: Project,Copied From,复制自
 DocType: Project,Copied From,复制自
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +340,Invoice already created for all billing hours,发票已在所有结算时间创建
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,Name error: {0},名称错误：{0}
 DocType: Cash Flow Mapping,Is Finance Cost,财务成本
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +19,Attendance for employee {0} is already marked,员工{0}的考勤已标记
 DocType: Packing Slip,If more than one package of the same type (for print),如果有多个同样类型的打包（用于打印）
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py +27,Please set default customer in Restaurant Settings,请在“餐厅设置”中设置默认客户
-,Salary Register,薪酬注册
-DocType: Warehouse,Parent Warehouse,家长仓库
+,Salary Register,工资台账
+DocType: Warehouse,Parent Warehouse,父仓库
 DocType: Subscription,Net Total,总净
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +607,Default BOM not found for Item {0} and Project {1},项目{0}和项目{1}找不到默认BOM
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +607,Default BOM not found for Item {0} and Project {1},物料{0}和物料{1}找不到默认BOM
 apps/erpnext/erpnext/config/non_profit.py +74,Define various loan types,定义不同的贷款类型
 DocType: Bin,FCFS Rate,FCFS率
 DocType: Bank Statement Transaction Invoice Item,Outstanding Amount,未付金额
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),时间（分钟）
 DocType: Project Task,Working,工作
 DocType: Stock Ledger Entry,Stock Queue (FIFO),库存队列(先进先出)
-apps/erpnext/erpnext/public/js/setup_wizard.js +128,Financial Year,财政年度
+apps/erpnext/erpnext/public/js/setup_wizard.js +128,Financial Year,财务年度
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,{0} does not belong to Company {1},{0}不属于公司{1}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py +66,Could not solve criteria score function for {0}. Make sure the formula is valid.,无法解决{0}的标准分数函数。确保公式有效。
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost as on,成本上
 DocType: Healthcare Settings,Out Patient Settings,出患者设置
 DocType: Account,Round Off,四舍五入
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +305,Quantity must be positive,数量必须是正数
-DocType: Material Request Plan Item,Requested Qty,请求数量
+DocType: Material Request Plan Item,Requested Qty,需求数量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +97,The fields From Shareholder and To Shareholder cannot be blank,来自股东和股东的字段不能为空
 DocType: Tax Rule,Use for Shopping Cart,使用的购物车
 apps/erpnext/erpnext/controllers/item_variant.py +101,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/public/js/utils/serial_no_batch_selector.js +81,Select Serial Numbers,选择序列号
 DocType: BOM Item,Scrap %,折旧％
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的品目数量和金额按比例分配。
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的物料数量和金额按比例分配。
 DocType: Travel Request,Require Full Funding,需要全额资助
 DocType: Maintenance Visit,Purposes,用途
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,在退货凭证中至少一个物料的数量应该是负数
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1}，分解成运行多个操作
 DocType: Membership,Membership Status,成员身份
 DocType: Travel Itinerary,Lodging Required,需要住宿
 ,Requested,要求
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,No Remarks,暂无说明
 DocType: Asset,In Maintenance,在维护中
-DocType: Purchase Invoice,Overdue,过期的
-DocType: Account,Stock Received But Not Billed,已收货未开单的库存
-apps/erpnext/erpnext/accounts/doctype/account/account.py +86,Root Account must be a group,根帐户必须是一组
+DocType: Purchase Invoice,Overdue,逾期
+DocType: Account,Stock Received But Not Billed,已收货未开票/在途物资:/GR/IR
+apps/erpnext/erpnext/accounts/doctype/account/account.py +86,Root Account must be a group,根科目必须是一组
 DocType: Drug Prescription,Drug Prescription,药物处方
 DocType: Fees,FEE.,费用。
 DocType: Loan,Repaid/Closed,偿还/关闭
 DocType: Item,Total Projected Qty,预计总数量
 DocType: Monthly Distribution,Distribution Name,分配名称
-apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",对于{1} {2}进行会计分录所需的项目{0}，找不到估值。如果该项目在{1}中作为零估值率项目进行交易，请在{1}项目表中提及。否则，请在项目记录中创建货物的进货库存交易或提交估值费率，然后尝试提交/取消此条目
+apps/erpnext/erpnext/stock/stock_ledger.py +477,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a zero valuation rate item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",对于{1} {2}进行会计分录所需的项目{0}，找不到估值。如果该项目在{1}中作为零评估价项目进行交易，请在{1}项目表中提及。否则，请在项目记录中创建货物的进货库存交易或提交估值费率，然后尝试提交/取消此条目
 DocType: Course,Course Code,课程代码
-apps/erpnext/erpnext/controllers/stock_controller.py +341,Quality Inspection required for Item {0},品目{0}要求质量检验
+apps/erpnext/erpnext/controllers/stock_controller.py +341,Quality Inspection required for Item {0},物料{0}要求质量检验
 DocType: Location,Parent Location,父位置
 DocType: POS Settings,Use POS in Offline Mode,在离线模式下使用POS
 DocType: Supplier Scorecard,Supplier Variables,供应商变量
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客户的货币转换为公司的基础货币后的单价
-DocType: Purchase Invoice Item,Net Rate (Company Currency),净利率（公司货币）
+DocType: 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: Patient Service Unit,Patient Service Unit,病人服务单位
@@ -3840,8 +3835,8 @@
 DocType: Company,Default Receivable Account,默认应收科目
 DocType: Physician Schedule,Physician Schedule,医师表
 DocType: Purchase Invoice,Deemed Export,被视为出口
-DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
+DocType: Stock Entry,Material Transfer for Manufacture,移库-生产
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价格清单。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +409,Accounting Entry for Stock,库存的会计分录
 DocType: Lab Test,LabTest Approver,LabTest审批者
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py +61,You have already assessed for the assessment criteria {}.,您已经评估了评估标准{}。
@@ -3850,7 +3845,7 @@
 DocType: Sales Invoice,Sales Team1,销售团队1
 apps/erpnext/erpnext/stock/doctype/item/item.py +563,Item {0} does not exist,物料{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
-DocType: Loan,Loan Details,贷款详情
+DocType: Loan,Loan Details,贷款信息
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +61,Failed to setup post company fixtures,未能设置公司固定装置
 DocType: Company,Default Inventory Account,默认存货科目
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +193,The folio numbers are not matching,作品集编号不匹配
@@ -3858,18 +3853,18 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +271,Payment Request for {0},付款申请{0}
 DocType: Item Barcode,Barcode Type,条码类型
 DocType: Antibiotic,Antibiotic Name,抗生素名称
-apps/erpnext/erpnext/config/buying.py +43,Supplier Group master.,供应商组主人。
-DocType: Purchase Invoice,Apply Additional Discount On,收取额外折扣
+apps/erpnext/erpnext/config/buying.py +43,Supplier Group master.,供应商组主数据。
+DocType: Purchase Invoice,Apply Additional Discount On,额外折扣基于
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +66,Select Type...,选择类型...
 DocType: Crop Cycle,A link to all the Land Units in which the Crop is growing,与作物生长的所有土地单位的链接
 apps/erpnext/erpnext/templates/pages/help.html +52,Your tickets,你的票
 DocType: Account,Root Type,根类型
-DocType: Item,FIFO,FIFO
+DocType: Item,FIFO,先进先出
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +557,Close the POS,关闭POS
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +139,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：无法返回超过{1}项{2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +139,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：无法退回超过{1}的物料{2}
 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),税额后，优惠金额（公司货币）
+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 +218,Target warehouse is mandatory for row {0},行{0}必须指定目标仓库
 DocType: Cheque Print Template,Primary Settings,主要设置
 DocType: Attendance Request,Work From Home,在家工作
@@ -3877,22 +3872,22 @@
 DocType: Purchase Invoice Item,Quality Inspection,质量检验
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +171,Extra Small,超小
 DocType: Company,Standard Template,标准模板
-DocType: Training Event,Theory,理论
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +863,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+DocType: Training Event,Theory,理论学习
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +863,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求数量低于最小起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
 DocType: Account,Account Number,帐号
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +778,Can only make payment against unbilled {0},只能针对未开票部分付款{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +778,Can only make payment against unbilled {0},只能为未开票{0}付款
 apps/erpnext/erpnext/controllers/selling_controller.py +103,Commission rate cannot be greater than 100,佣金率不能大于100
 DocType: Volunteer,Volunteer,志愿者
 DocType: Buying Settings,Subcontract,外包
-apps/erpnext/erpnext/public/js/utils/party.js +166,Please enter {0} first,请输入{0}第一
+apps/erpnext/erpnext/public/js/utils/party.js +166,Please enter {0} first,请先输入{0}
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +104,No replies from,从没有回复
 DocType: Work Order Operation,Actual End Time,实际结束时间
 DocType: Item,Manufacturer Part Number,制造商零件编号
-DocType: Taxable Salary Slab,Taxable Salary Slab,应纳税薪金平台
+DocType: Taxable Salary Slab,Taxable Salary Slab,应税工资累进税率表
 DocType: Work Order Operation,Estimated Time and Cost,预计时间和成本
 DocType: Bin,Bin,储位
 DocType: Crop,Crop Name,作物名称
@@ -3900,16 +3895,16 @@
 DocType: Antibiotic,Healthcare Administrator,医疗管理员
 apps/erpnext/erpnext/utilities/user_progress.py +47,Set a Target,设定目标
 DocType: Dosage Strength,Dosage Strength,剂量强度
-DocType: Account,Expense Account,开支帐户
+DocType: Account,Expense Account,费用科目
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +49,Software,软件
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +178,Colour,颜色
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,评估计划标准
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +123,Expiry date is mandatory for selected item,有效期限对所选项目是强制性的
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +123,Expiry date is mandatory for selected item,所选物料的有效期限必填
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,防止采购订单
 apps/erpnext/erpnext/healthcare/setup.py +259,Susceptible,易感
 DocType: Patient Appointment,Scheduled,已计划
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,询价。
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",请选择项，其中“正股项”是“否”和“是销售物料”是“是”，没有其他产品捆绑
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js +148,Select Customer,选择客户
 DocType: Student Log,Academic,学术的
 DocType: Patient,Personal and Social History,个人和社会史
@@ -3918,21 +3913,21 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +577,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.,如果要不规则的按月分配，请选择“月度分布”。
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +88,Change Code,更改代码
-DocType: Purchase Invoice Item,Valuation Rate,估值率
+DocType: Purchase Invoice Item,Valuation Rate,库存评估价
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,柴油机
-apps/erpnext/erpnext/stock/get_item_details.py +418,Price List Currency not selected,价格表货币没有选择
+apps/erpnext/erpnext/stock/get_item_details.py +418,Price List Currency not selected,价格清单货币没有选择
 DocType: Purchase Invoice,Availed ITC Cess,采用ITC Cess
 ,Student Monthly Attendance Sheet,学生每月考勤表
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +96,Shipping rule only applicable for Selling,运费规则仅适用于销售
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折旧行{0}：下一个折旧日期不能在购买日期之前
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +210,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,折旧行{0}：下一个折旧日期不能在采购日期之前
 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 +36,Until,直到
 DocType: Rename Tool,Rename Log,重命名日志
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,学生组或课程表是强制性的
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,维护发票时间和工作时间的时间表相同
-DocType: Maintenance Visit Purpose,Against Document No,对文档编号
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,维护发票时间和工作时间的工时单相同
+DocType: Maintenance Visit Purpose,Against Document No,文档编号
 DocType: BOM,Scrap,废料
 apps/erpnext/erpnext/utilities/user_progress.py +217,Go to Instructors,去教练
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,管理销售合作伙伴。
@@ -3945,8 +3940,8 @@
 apps/erpnext/erpnext/utilities/activation.py +117,Add Students,新增学生
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js +18,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
-DocType: BOM,Exploded_items,展开品目
-apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所购买或出售的产品或服务。
+DocType: BOM,Exploded_items,展开物料
+apps/erpnext/erpnext/utilities/user_progress.py +139,List your products or services that you buy or sell.,列出您所采购或出售的产品或服务。
 DocType: Water Analysis,Storage Temperature,储存温度
 DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +254,Creating Payment Entries......,创建支付条目......
@@ -3954,50 +3949,50 @@
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,计划注册学生工具
 apps/erpnext/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py +16,Start date should be less than end date for task {0},开始日期应该小于任务{0}的结束日期
 ,Consolidated Financial Statement,合并财务报表
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或电子邮件是强制性
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或电子邮件信息必填
 DocType: Member,MEM-,MEM-
 DocType: Instructor,Instructor Log,讲师日志
 DocType: Clinical Procedure,Clinical Procedure,临床程序
-DocType: Shopify Settings,Delivery Note Series,送货单系列
+DocType: Shopify Settings,Delivery Note Series,销售出货单系列
 DocType: Purchase Order Item,Returned Qty,退货数量
-DocType: Student,Exit,退出
+DocType: Student,Exit,离职
 apps/erpnext/erpnext/accounts/doctype/account/account.py +158,Root Type is mandatory,根类型是强制性的
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +29,Failed to install presets,无法安装预设
-DocType: Contract,Signee Details,签名详情
+DocType: Contract,Signee Details,签名信息
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +44,"{0} currently has a {1} Supplier Scorecard standing, and RFQs to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，并且谨慎地向该供应商发出询价。
 DocType: Certified Consultant,Non Profit Manager,非营利经理
 DocType: BOM,Total Cost(Company Currency),总成本（公司货币）
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +346,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: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",为方便客户，这些代码可以在打印格式(如发票和销售出货单)中使用
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,供应商名称
 apps/erpnext/erpnext/accounts/report/financial_statements.py +175,Could not retrieve information for {0}.,无法检索{0}的信息。
-apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +138,Opening Entry Journal,开幕词报
+apps/erpnext/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +138,Opening Entry Journal,开帐凭证
 DocType: Contract,Fulfilment Terms,履行条款
-DocType: Sales Invoice,Time Sheet List,时间表列表
+DocType: Sales Invoice,Time Sheet List,工时单列表
 DocType: Employee,You can enter any date manually,您可以手动输入日期
 DocType: Healthcare Settings,Result Printed,结果打印
-DocType: Asset Category Account,Depreciation Expense Account,折旧费用帐户
+DocType: Asset Category Account,Depreciation Expense Account,折旧费用科目
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +214,Probationary Period,试用期
-DocType: Purchase Taxes and Charges Template,Is Inter State,是国际
-apps/erpnext/erpnext/config/hr.py +269,Shift Management,班次管理
+DocType: Purchase Taxes and Charges Template,Is Inter State,跨省？
+apps/erpnext/erpnext/config/hr.py +269,Shift Management,班别管理
 DocType: Customer Group,Only leaf nodes are allowed in transaction,只有叶节点中允许交易
-DocType: Project,Total Costing Amount (via Timesheets),总成本金额（通过时间表）
-DocType: Department,Expense Approver,开支审批人
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +168,Row {0}: Advance against Customer must be credit,行{0}：提前对客户必须是信用
+DocType: Project,Total Costing Amount (via Timesheets),总成本金额（通过工时单）
+DocType: Department,Expense Approver,费用审批人
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +168,Row {0}: Advance against Customer must be credit,行{0}：预收客户款项须记在贷方
 DocType: Project,Hourly,每小时
-apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,非集团集团
+apps/erpnext/erpnext/accounts/doctype/account/account.js +83,Non-Group to Group,非群组转为群组
 DocType: Employee,ERPNext User,ERPNext用户
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},在{0}行中必须使用批处理
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +58,Batch is mandatory in row {0},在{0}行中必须使用批处理
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,采购入库项目提供
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,外包订单外发物料
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期时间
 apps/erpnext/erpnext/config/selling.py +308,Logs for maintaining sms delivery status,日志维护短信发送状态
-DocType: Accounts Settings,Make Payment via Journal Entry,通过日记帐分录进行付款
+DocType: Accounts Settings,Make Payment via Journal Entry,通过手工凭证进行付款
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +241,Printed On,印上
 DocType: Clinical Procedure Template,Clinical Procedure Template,临床步骤模板
-DocType: Item,Inspection Required before Delivery,分发前所需检查
-DocType: Item,Inspection Required before Purchase,付款前所需检查
+DocType: Item,Inspection Required before Delivery,需进行出货检验
+DocType: Item,Inspection Required before Purchase,需进行来料检验
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活动
 DocType: Patient Appointment,Reminded,提醒
 DocType: Patient,PID-,PID-
@@ -4006,27 +4001,27 @@
 DocType: Material Request Plan Item,Minimum Order Quantity,最小起订量
 apps/erpnext/erpnext/public/js/setup_wizard.js +106,Your Organization,你的组织
 DocType: Fee Component,Fees Category,费用类别
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,Please enter relieving date.,请输入解除日期。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,Please enter relieving date.,请输入离职日期。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,金额
-DocType: Travel Request,"Details of Sponsor (Name, Location)",赞助商详情（名称，地点）
+DocType: Travel Request,"Details of Sponsor (Name, Location)",赞助商信息（名称，地点）
 DocType: Supplier Scorecard,Notify Employee,通知员工
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +38,Newspaper Publishers,报纸出版商
 apps/erpnext/erpnext/hr/utils.py +154,Future dates not allowed,未来的日期不允许
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,选择财政年度
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,选择财务年度
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +117,Expected Delivery Date should be after Sales Order Date,预计交货日期应在销售订单日期之后
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
-DocType: Company,Chart Of Accounts Template,图表帐户模板
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重订货水平
+DocType: Company,Chart Of Accounts Template,科目表模板
 DocType: Attendance,Attendance Date,考勤日期
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +80,Update stock must be enable for the purchase invoice {0},必须为购买发票{0}启用更新库存
-apps/erpnext/erpnext/stock/get_item_details.py +378,Item Price updated for {0} in Price List {1},项目价格更新{0}价格表{1}
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,基于收入和扣款的工资明细。
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +80,Update stock must be enable for the purchase invoice {0},必须为采购发票{0}启用更新库存
+apps/erpnext/erpnext/stock/get_item_details.py +378,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 +130,Account with child nodes cannot be converted to ledger,科目与子节点不能转换为分类账
-DocType: Purchase Invoice Item,Accepted Warehouse,已接收的仓库
-DocType: Bank Reconciliation Detail,Posting Date,发布日期
+DocType: Purchase Invoice Item,Accepted Warehouse,仓库
+DocType: Bank Reconciliation Detail,Posting Date,记帐日期
 DocType: Item,Valuation Method,估值方法
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +30,One customer can be part of only single Loyalty Program.,一个客户只能参与一个忠诚度计划。
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,马克半天
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,半天
 DocType: Sales Invoice,Sales Team,销售团队
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,重复的条目
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +19,Enter the name of the Beneficiary before submittting.,在提交之前输入受益人的姓名。
@@ -4034,7 +4029,7 @@
 DocType: Serial No,Under Warranty,在保修期内
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +518,[Error],[错误]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,大写金额将在销售订单保存后显示。
-,Employee Birthday,雇员生日
+,Employee Birthday,员工生日
 apps/erpnext/erpnext/assets/doctype/asset_repair/asset_repair.py +14,Please select Completion Date for Completed Repair,请选择完成修复的完成日期
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,学生考勤批处理工具
 apps/erpnext/erpnext/controllers/status_updater.py +216,Limit Crossed,限制交叉
@@ -4044,7 +4039,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +55,Venture Capital,创业投资
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,这个“学年”一个学期{0}和“术语名称”{1}已经存在。请修改这些条目，然后再试一次。
 DocType: UOM,Must be Whole Number,必须是整数
-DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
+DocType: Leave Control Panel,New Leaves Allocated (In Days),新分配的假期(天数)
 DocType: Purchase Invoice,Invoice Copy,发票副本
 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),客户仓库（可选）
@@ -4053,10 +4048,10 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Reserved for sub contracting,留作分包合同
 DocType: Payment Reconciliation Invoice,Invoice Number,发票号码
 DocType: Shopping Cart Settings,Orders,订单
-DocType: Travel Request,Event Details,活动详情
-DocType: Department,Leave Approver,假期审批人
+DocType: Travel Request,Event Details,活动信息
+DocType: Department,Leave Approver,休假审批人
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +316,Please select a batch,请选择一个批次
-apps/erpnext/erpnext/config/hr.py +145,Travel and Expense Claim,旅行和费用索赔
+apps/erpnext/erpnext/config/hr.py +145,Travel and Expense Claim,出差和费用申报
 DocType: Sales Invoice,Redemption Cost Center,赎回成本中心
 DocType: Assessment Group,Assessment Group Name,评估小组名称
 DocType: Manufacturing Settings,Material Transferred for Manufacture,材料移送制造
@@ -4069,9 +4064,9 @@
 DocType: Target Detail,Target Detail,目标详细信息
 apps/erpnext/erpnext/stock/doctype/item/item.js +67,Single Variant,单一变种
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +51,All Jobs,所有职位
-DocType: Sales Order,% of materials billed against this Sales Order,此销售订单% 的材料已记账。
+DocType: Sales Order,% of materials billed against this Sales Order,此销售订单%的物料已开票。
 DocType: Program Enrollment,Mode of Transportation,运输方式
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,期末进入
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,期末结帐凭证
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +72,Select Department...,选择部门...
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +40,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +376,Amount {0} {1} {2} {3},金额{0} {1} {2} {3}
@@ -4082,16 +4077,15 @@
 DocType: Guardian Student,Guardian Student,学生监护人
 DocType: Company,Parent Comapny,父母公司
 DocType: Supplier,Credit Limit,信用额度
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Selling Price List Rate,平均。出售价目表率
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Selling Price List Rate,平均销售价格清单单价
 DocType: Loyalty Program Collection,Collection Factor (=1 LP),收集因子（= 1 LP）
-DocType: Additional Salary,Salary Component,薪金部分
-apps/erpnext/erpnext/accounts/utils.py +497,Payment Entries {0} are un-linked,付款记录{0}没有关联
+DocType: Additional Salary,Salary Component,薪资构成
+apps/erpnext/erpnext/accounts/utils.py +497,Payment Entries {0} are un-linked,付款凭证{0}没有关联
 DocType: GL Entry,Voucher No,凭证编号
-,Lead Owner Efficiency,主导效率
-,Lead Owner Efficiency,主导效率
+,Lead Owner Efficiency,线索负责人效率
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +62,"You can claim only an amount of {0}, the rest amount {1} should be in the application \
 				as pro-rata component",您只能声明一定数量的{0}，剩余数量{1}应该在应用程序中作为按比例分量
-DocType: Compensatory Leave Request,Leave Allocation,假期调配
+DocType: Compensatory Leave Request,Leave Allocation,分配休假天数
 DocType: Payment Request,Recipient Message And Payment Details,收件人邮件和付款细节
 DocType: Support Search Source,Source DocType,源DocType
 apps/erpnext/erpnext/templates/pages/help.html +60,Open a new ticket,打开一张新票
@@ -4101,16 +4095,16 @@
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,条款或合同模板。
 DocType: Bank Account,Address and Contact,地址和联系方式
 DocType: Cheque Print Template,Is Account Payable,为应付账款
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +292,Stock cannot be updated against Purchase Receipt {0},库存不能对外购入库单进行更新{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +292,Stock cannot be updated against Purchase Receipt {0},库存不能对采购收货单进行更新{0}
 DocType: Support Settings,Auto close Issue after 7 days,7天之后自动关闭问题
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +85,"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 +329,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
 apps/erpnext/erpnext/education/doctype/program/program.js +8,Student Applicant,学生申请
-DocType: Hub Tracked Item,Hub Tracked Item,Hub跟踪物品
+DocType: Hub Tracked Item,Hub Tracked Item,Hub跟踪物料
 DocType: Purchase Invoice,ORIGINAL FOR RECIPIENT,收件人原件
 DocType: Asset Category Account,Accumulated Depreciation Account,累计折旧科目
 DocType: Certified Consultant,Discuss ID,讨论ID
-DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
+DocType: Stock Settings,Freeze Stock Entries,冻结库存移动凭证
 DocType: Program Enrollment,Boarding Student,寄宿学生
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +73,Please enable Applicable on Booking Actual Expenses,请启用适用于预订实际费用
 DocType: Asset Finance Book,Expected Value After Useful Life,期望值使用寿命结束后
@@ -4119,44 +4113,44 @@
 ,Qty to Deliver,交付数量
 ,Stock Analytics,库存分析
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +523,Operations cannot be left blank,操作不能留空
-DocType: Maintenance Visit Purpose,Against Document Detail No,对文档详情编号
+DocType: Maintenance Visit Purpose,Against Document Detail No,对文档信息编号
 apps/erpnext/erpnext/regional/__init__.py +11,Deletion is not permitted for country {0},国家{0}不允许删除
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +111,Party Type is mandatory,请输入往来单位类型
-DocType: Quality Inspection,Outgoing,传出
-DocType: Material Request,Requested For,对于要求
-DocType: Quotation Item,Against Doctype,对文档类型
+DocType: Quality Inspection,Outgoing,出货检验
+DocType: Material Request,Requested For,需求目的
+DocType: Quotation Item,Against Doctype,文档类型
 apps/erpnext/erpnext/controllers/buying_controller.py +474,{0} {1} is cancelled or closed,{0} {1}被取消或关闭
 DocType: Asset,Calculate Depreciation,计算折旧
-DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送货单反对任何项目
+DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此销售出货单的项目
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +89,Net Cash from Investing,从投资净现金
 DocType: Work Order,Work-in-Progress Warehouse,在制品仓库
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +113,Asset {0} must be submitted,资产{0}必须提交
 DocType: Fee Schedule Program,Total Students,学生总数
-apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},考勤记录{0}存在针对学生{1}
+apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py +56,Attendance Record {0} exists against Student {1},学生{1}已有考勤记录{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +386,Reference #{0} dated {1},参考＃ {0}记载日期为{1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +179,Depreciation Eliminated due to disposal of assets,折旧淘汰因处置资产
 DocType: Employee Transfer,New Employee ID,新员工ID
 DocType: Loan,Member,会员
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,管理地址
-DocType: Work Order Item,Work Order Item,工作订单项目
-DocType: Pricing Rule,Item Code,项目编号
-DocType: Leave Period,Grant Leaves Based on Leave Policy,基于休假政策的助学金
-DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同详情
+DocType: Work Order Item,Work Order Item,工单项
+DocType: Pricing Rule,Item Code,物料代码
+DocType: Leave Period,Grant Leaves Based on Leave Policy,基于休假政策分配休假（天数）
+DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同信息
 apps/erpnext/erpnext/education/doctype/student_group/student_group.js +119,Select students manually for the Activity based Group,为基于活动的组手动选择学生
 DocType: Journal Entry,User Remark,用户备注
 DocType: Travel Itinerary,Non Diary,非日记
-apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,无法为左员工创建保留奖金
+apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py +14,Cannot create Retention Bonus for left Employees,无法为已离职员工创建持续服务奖
 DocType: Lead,Market Segment,市场分类
 DocType: Agriculture Analysis Criteria,Agriculture Manager,农业经理
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +968,Paid Amount cannot be greater than total negative outstanding amount {0},支付金额不能大于总未付金额{0}
 DocType: Supplier Scorecard Period,Variables,变量
-DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
+DocType: Employee Internal Work History,Employee Internal Work History,员工内部就职经历
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +249,Closing (Dr),结算(借记)
 DocType: Cheque Print Template,Cheque Size,支票大小
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +246,Serial No {0} not in stock,序列号{0}无库存
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,销售业务的税务模板。
 DocType: Sales Invoice,Write Off Outstanding Amount,注销未付金额
-apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},帐户{0}与公司{1}不符
+apps/erpnext/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +27,Account {0} does not match with Company {1},科目{0}与公司{1}不符
 DocType: Education Settings,Current Academic Year,当前学年
 DocType: Stock Settings,Default Stock UOM,默认库存计量单位
 DocType: Asset,Number of Depreciations Booked,预订折旧数
@@ -4176,35 +4170,35 @@
 DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
 DocType: Attendance,On Leave,休假
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帐户{2}不属于公司{3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}科目{2}不属于公司{3}
 apps/erpnext/erpnext/stock/doctype/item/item.js +428,Select at least one value from each of the attributes.,从每个属性中至少选择一个值。
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +167,Material Request {0} is cancelled or stopped,物料申请{0}已取消或已停止
 apps/erpnext/erpnext/config/hr.py +399,Leave Management,休假管理
-DocType: Purchase Invoice,Hold Invoice,保留发票
+DocType: Purchase Invoice,Hold Invoice,暂缓处理发票
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +37,Please select Employee,请选择员工
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,较低收益
 DocType: Restaurant Order Entry,Current Order,当前订单
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +25,Number of serial nos and quantity must be the same,序列号和数量必须相同
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +237,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
-DocType: Account,Asset Received But Not Billed,已收到但未收费的资产
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此库存盘点在期初进行
+DocType: Account,Asset Received But Not Billed,在途资产科目（已收到，未开票）
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +244,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异科目必须是资产/负债类型的科目，因为此库存盘点在期初进行
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +116,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
 apps/erpnext/erpnext/utilities/user_progress.py +176,Go to Programs,转到程序
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +212,Row {0}# Allocated amount {1} cannot be greater than unclaimed amount {2},行{0}＃分配的金额{1}不能大于无人认领的金额{2}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +91,Purchase Order number required for Item {0},所需物品的采购订单号{0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +91,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/hr/doctype/job_opening/job_opening.js +32,No Staffing Plans found for this Designation,本指定没有发现人员配备计划
-DocType: Leave Policy Detail,Annual Allocation,年度分配
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.js +32,No Staffing Plans found for this Designation,无此职位的人力需求计划
+DocType: Leave Policy Detail,Annual Allocation,年度配额
 DocType: Travel Request,Address of Organizer,主办单位地址
-DocType: Employee Boarding Activity,Applicable in the case of Employee Onboarding,适用于员工入职的情况
+DocType: Employee Boarding Activity,Applicable in the case of Employee Onboarding,适用于员工入职
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py +39,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
 DocType: Asset,Fully Depreciated,已提足折旧
 DocType: Item Barcode,UPC-A,UPC-A
-,Stock Projected Qty,预计库存量
+,Stock Projected Qty,预期可用库存
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
-apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
+apps/erpnext/erpnext/utilities/activation.py +73,"Quotations are proposals, bids you have sent to your customers",报价是你发送给客户的建议或出价
 DocType: Sales Invoice,Customer's Purchase Order,客户采购订单
 DocType: Clinical Procedure,Patient,患者
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +47,Bypass credit check at Sales Order ,在销售订单旁通过信用检查
@@ -4217,9 +4211,9 @@
 DocType: Supplier Scorecard Period,Calculations,计算
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +86,Value or Qty,价值或数量
 DocType: Payment Terms Template,Payment Terms,付款条件
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +451,Productions Orders cannot be raised for:,制作订单不能上调：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +451,Productions Orders cannot be raised for:,不能为...生成生产订单：
 apps/erpnext/erpnext/utilities/user_progress.py +147,Minute,分钟
-DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
+DocType: Purchase Invoice,Purchase Taxes and Charges,购置税/费
 DocType: Chapter,Meetup Embed HTML,Meetup嵌入HTML
 DocType: Asset,Insured value,保价值
 apps/erpnext/erpnext/utilities/user_progress.py +121,Go to Suppliers,去供应商
@@ -4234,27 +4228,27 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +59,All Warehouses,所有仓库
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1256,No {0} found for Inter Company Transactions.,Inter公司没有找到{0}。
 DocType: Travel Itinerary,Rented Car,租车
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +131,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +131,Credit To account must be a Balance Sheet account,信用科目必须是资产负债表科目
 DocType: Donor,Donor,捐赠者
 DocType: Global Defaults,Disable In Words,禁用词
-apps/erpnext/erpnext/stock/doctype/item/item.py +69,Item Code is mandatory because Item is not automatically numbered,项目编号是必须项，因为项目没有自动编号
+apps/erpnext/erpnext/stock/doctype/item/item.py +69,Item Code is mandatory because Item is not automatically numbered,物料代码是必须项，因为项目没有自动编号
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +100,Quotation {0} not of type {1},报价{0} 不属于{1}类型
-DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划物料
 DocType: Sales Order,%  Delivered,％已交付
-apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,请设置学生的电子邮件ID以发送付款请求
+apps/erpnext/erpnext/education/doctype/fees/fees.js +108,Please set the Email ID for the Student to send the Payment Request,请设置学生的电子邮件ID以发送付款申请
 DocType: Clinical Procedure,PRO-,PRO-
 DocType: Patient,Medical History,医学史
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Bank Overdraft Account,银行透支账户
 DocType: Patient,Patient ID,病人ID
 DocType: Physician Schedule,Schedule Name,计划名称
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +49,Make Salary Slip,创建工资单
-DocType: Currency Exchange,For Buying,为了购买
+DocType: Currency Exchange,For Buying,待采购
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +864,Add All Suppliers,添加所有供应商
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +95,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：已分配金额不能大于未付金额。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Secured Loans,抵押贷款
-DocType: Purchase Invoice,Edit Posting Date and Time,编辑投稿时间
-apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +103,Please set Depreciation related Accounts in Asset Category {0} or Company {1},请设置在资产类别{0}或公司折旧相关帐户{1}
+DocType: Purchase Invoice,Edit Posting Date and Time,修改记帐日期与时间
+apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +103,Please set Depreciation related Accounts in Asset Category {0} or Company {1},请设置在资产类别{0}或公司折旧相关科目{1}
 DocType: Lab Test Groups,Normal Range,普通范围
 DocType: Academic Term,Academic Year,学年
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +79,Available Selling,可用销售
@@ -4264,7 +4258,7 @@
 DocType: Purchase Invoice,N,ñ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.py +175,Remaining,剩余
 DocType: Appraisal,Appraisal,绩效评估
-DocType: Loan,Loan Account,贷款帐户
+DocType: Loan,Loan Account,贷款科目
 DocType: Purchase Invoice,GST Details,消费税细节
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +156,Email sent to supplier {0},电子邮件发送到供应商{0}
 DocType: Item,Default Sales Unit of Measure,默认销售单位
@@ -4275,7 +4269,7 @@
 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/education/doctype/fee_schedule/fee_schedule.js +64,Create Fees,创造费用
-DocType: Project,Total Purchase Cost (via Purchase Invoice),总购买成本（通过采购发票）
+DocType: Project,Total Purchase Cost (via Purchase Invoice),总采购成本（通过采购发票）
 DocType: Shift Type,Start Time,开始时间
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +438,Select Quantity,选择数量
 DocType: Loyalty Point Entry,Loyalty Points,忠诚度积分
@@ -4284,19 +4278,19 @@
 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/buying/doctype/request_for_quotation/request_for_quotation.js +854,Get Suppliers By,获得供应商
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},在{0}中找不到物品{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +173,{0} not found for Item {1},在{0}中找不到物料{1}
 apps/erpnext/erpnext/utilities/user_progress.py +197,Go to Courses,去课程
 DocType: Accounts Settings,Show Inclusive Tax In Print,在打印中显示包含税
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +17,"Bank Account, From Date and To Date are Mandatory",银行账户，从日期到日期是强制性的
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +17,"Bank Account, From Date and To Date are Mandatory",银行账户，开始日期和截止日期必填
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,消息已发送
-apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with child nodes cannot be set as ledger,帐户与子节点不能被设置为分类帐
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Account with child nodes cannot be set as ledger,科目与子节点不能被设置为分类帐
 DocType: C-Form,II,二
-DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,价目表货币转换成客户的基础货币后的单价
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,价格清单货币转换成客户的本币后的单价
 DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额（公司货币）
-DocType: Physician,Physician Schedules,医师时间表
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +222,Total advance amount cannot be greater than total sanctioned amount,总预付金额不得超过全部认可金额
+DocType: Physician,Physician Schedules,医师工时单
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +222,Total advance amount cannot be greater than total sanctioned amount,总预付金额不得超过总核准金额
 DocType: Salary Slip,Hour Rate,时薪
-DocType: Stock Settings,Item Naming By,项目命名方式
+DocType: Stock Settings,Item Naming By,物料命名字段
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},在{1}之后另一个年终结束分录{0}已经被录入
 DocType: Work Order,Material Transferred for Manufacturing,材料移送制造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Account {0} does not exists,科目{0}不存在
@@ -4304,24 +4298,24 @@
 apps/erpnext/erpnext/projects/doctype/task/task.py +153,Child Task exists for this Task. You can not delete this Task.,子任务存在这个任务。你不能删除这个任务。
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,需要指定目标数量和金额。
 apps/erpnext/erpnext/config/projects.py +56,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/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 +163,Source and target warehouse must be different,源和目标仓库必须是不同的
-apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +140,Payment Failed. Please check your GoCardless Account for more details,支付失败。请检查您的GoCardless帐户以了解更多详情
+apps/erpnext/erpnext/erpnext_integrations/doctype/gocardless_settings/gocardless_settings.py +140,Payment Failed. Please check your GoCardless Account for more details,支付失败。请检查您的GoCardless科目以了解更多信息
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
 DocType: BOM,Inspection Required,需要检验
 DocType: Purchase Invoice Item,PR Detail,PR详细
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +17,Enter the Bank Guarantee Number before submittting.,在提交之前输入银行保证号码。
 DocType: Driving License Category,Class,类
 DocType: Sales Order,Fully Billed,完全开票
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +460,Work Order cannot be raised against a Item Template,工作订单不能针对项目模板产生
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +101,Shipping rule only applicable for Buying,运费规则只适用于购买
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +460,Work Order cannot be raised against a Item Template,不能为模板物料新建工单
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +101,Shipping rule only applicable for Buying,运费规则只适用于采购
 DocType: Vital Signs,BMI,BMI
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,现款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +139,Delivery warehouse required for stock item {0},需要的库存项目交割仓库{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +139,Delivery warehouse required for stock item {0},物料{0}为库存管理物料，且在主数据中未定义默认仓库，请在销售订单行填写出货仓库信息
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包的总重量，通常是净重+包装材料的重量。 （用于打印）
 DocType: Assessment Plan,Program,程序
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结账户和创建/修改冻结账户的会计分录
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结科目，创建/修改冻结科目的会计凭证
 DocType: Serial No,Is Cancelled,是否注销
 DocType: Student Group,Group Based On,基于组
 DocType: Student Group,Group Based On,基于组
@@ -4331,14 +4325,14 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级：
 DocType: Plant Analysis Criteria,Plant Analysis Criteria,植物分析标准
 DocType: Cheque Print Template,Cheque Height,支票高度
-DocType: Supplier,Supplier Details,供应商详情
+DocType: Supplier,Supplier Details,供应商信息
 DocType: Setup Progress,Setup Progress,设置进度
 DocType: Expense Claim,Approval Status,审批状态
-DocType: Hub Settings,Publish Items to Hub,发布项目到集线器
+DocType: Hub Settings,Publish Items to Hub,发布物料到Hub 网站
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +35,From value must be less than to value in row {0},行{0}的起始值必须更小
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +158,Wire Transfer,电汇
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,全面检查
-,Issued Items Against Work Order,针对工单发布物品
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +92,Check all,全选
+,Issued Items Against Work Order,发料到工单
 ,BOM Stock Calculated,BOM库存计算
 DocType: Vehicle Log,Invoice Ref,发票编号
 DocType: Company,Default Income Account,默认收入科目
@@ -4346,15 +4340,15 @@
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),未关闭的财年利润/损失
 DocType: Sales Invoice,Time Sheets,考勤表
 DocType: Clinical Procedure Template,Change In Item,更改项目
-DocType: Payment Gateway Account,Default Payment Request Message,默认的付款请求消息
+DocType: Payment Gateway Account,Default Payment Request Message,默认的付款申请消息
 DocType: Retention Bonus,Bonus Amount,奖金金额
-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/accounts/report/general_ledger/general_ledger.py +361,Balance ({0}),余额（{0}）
 DocType: Loyalty Point Entry,Redeem Against,兑换
 apps/erpnext/erpnext/config/accounts.py +140,Banking and Payments,银行和支付
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py +99,Please enter API Consumer Key,请输入API使用者密钥
 ,Welcome to ERPNext,欢迎使用ERPNext
-apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,导致报价
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,从线索到报价
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +34,Email Reminders will be sent to all parties with email contacts,电子邮件提醒将通过电子邮件联系方式发送给各方
 DocType: Project,Twice Daily,每天两次
 DocType: Patient,A Negative,一个负面的
@@ -4364,58 +4358,58 @@
 apps/erpnext/erpnext/utilities/user_progress.py +143,A Product,一个产品
 DocType: Employee Tax Exemption Declaration,Declarations,声明
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +235,Batches,批
-apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,制作费用表
+apps/erpnext/erpnext/education/doctype/fee_structure/fee_structure.js +34,Make Fee Schedule,创建收费计划表
 DocType: Purchase Order Item Supplied,Stock UOM,库存计量单位
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +249,Purchase Order {0} is not submitted,采购订单{0}未提交
-DocType: Account,Expenses Included In Asset Valuation,资产评估中包含的费用
+DocType: Account,Expenses Included In Asset Valuation,包含在资产评估价中的费用科目
 DocType: Vital Signs,Normal reference range for an adult is 16–20 breaths/minute (RCP 2012),成人的正常参考范围是16-20次呼吸/分钟（RCP 2012）
 DocType: Customs Tariff Number,Tariff Number,税则号
 DocType: Work Order Item,Available Qty at WIP Warehouse,在WIP仓库可用的数量
-apps/erpnext/erpnext/stock/doctype/item/item.js +41,Projected,预计
+apps/erpnext/erpnext/stock/doctype/item/item.js +41,Projected,预期可用库存报表
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +231,Serial No {0} does not belong to Warehouse {1},序列号{0}不属于仓库{1}
-apps/erpnext/erpnext/controllers/status_updater.py +180,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为品目{0}检查超额发货或超额预订，因为其数量或金额为0
+apps/erpnext/erpnext/controllers/status_updater.py +180,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注意：系统将不会为物料{0}检查超额发货或超额预订，因为其数量或金额为0
 DocType: Notification Control,Quotation Message,报价信息
-DocType: Issue,Opening Date,开幕日期
+DocType: Issue,Opening Date,问题提交日期
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +89,Please save the patient first,请先保存患者
-apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,出席已成功标记。
+apps/erpnext/erpnext/education/api.py +80,Attendance has been marked successfully.,考勤登记成功。
 DocType: Program Enrollment,Public Transport,公共交通
 DocType: Soil Texture,Silt Composition (%),粉尘成分（％）
 DocType: Journal Entry,Remark,备注
 DocType: Healthcare Settings,Avoid Confirmation,避免确认
 DocType: Purchase Receipt Item,Rate and Amount,单价及小计
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Account Type for {0} must be {1},{0}的帐户类型必须为{1}
-DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,如果没有在医师中设置默认收入帐户来预订咨询费用。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Account Type for {0} must be {1},{0}的科目类型必须为{1}
+DocType: Healthcare Settings,Default income accounts to be used if not set in Physician to book Consultation charges.,如果没有在医师中设置默认收入科目来预订咨询费用。
 apps/erpnext/erpnext/config/hr.py +34,Leaves and Holiday,休假与节假日
 DocType: Education Settings,Current Academic Term,当前学术期限
 DocType: Education Settings,Current Academic Term,当前学术期限
 DocType: Sales Order,Not Billed,未开票
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +76,Both Warehouse must belong to same Company,两个仓库必须属于同一公司
-DocType: Employee Grade,Default Leave Policy,默认离开政策
+DocType: Employee Grade,Default Leave Policy,默认休假政策
 DocType: Shopify Settings,Shop URL,商店网址
 apps/erpnext/erpnext/public/js/templates/contact_list.html +34,No contacts added yet.,暂无联系人。
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本凭证金额
-,Item Balance (Simple),物品余额（简单）
+,Item Balance (Simple),物料余额（简单）
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,供应商开出的账单
-DocType: POS Profile,Write Off Account,核销帐户
+DocType: POS Profile,Write Off Account,销帐科目
 DocType: Patient Appointment,Get prescribed procedures,获取规定的程序
 DocType: Sales Invoice,Redemption Account,赎回账户
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Debit Note Amt,借方票据
 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/setup/setup_wizard/setup_wizard.py +66,Failed to set defaults,无法设置默认值
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Relation with Guardian1,与关系Guardian1
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +801,Please select BOM against item {0},请选择物料{0}的物料清单
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +18,Make Invoices,制作发票
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +18,Make Invoices,创建发票
 DocType: Shopping Cart Settings,Show Stock Quantity,显示库存数量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +77,Net Cash from Operations,从运营的净现金
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,项目4
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,物料4
 DocType: Student Admission,Admission End Date,录取结束日期
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +30,Sub-contracting,分包
-DocType: Journal Entry Account,Journal Entry Account,日记帐分录帐号
+DocType: Journal Entry Account,Journal Entry Account,手工凭证帐号
 apps/erpnext/erpnext/education/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 +57,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +57,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的物料已存在，请更名
 DocType: Soil Analysis Criteria,Soil Analysis Criteria,土壤分析标准
 apps/erpnext/erpnext/accounts/page/pos/pos.js +2049,Please select customer,请选择客户
 DocType: C-Form,I,我
@@ -4424,23 +4418,23 @@
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
 DocType: Assessment Plan,Assessment Plan,评估计划
 DocType: Travel Request,Fully Sponsored,完全赞助
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,反向日记帐分录
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +28,Reverse Journal Entry,反向手工凭证
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +90,Customer {0} is created.,客户{0}已创建。
 DocType: Stock Settings,Limit Percent,限制百分比
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +82, Currently no stock available in any warehouse,目前没有任何仓库可用的库存
-,Payment Period Based On Invoice Date,已经提交。
+,Payment Period Based On Invoice Date,付款期间基于发票日
 DocType: Sample Collection,No. of print,打印数量
 DocType: Hotel Room Reservation Item,Hotel Room Reservation Item,酒店房间预订项目
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0}没有货币汇率
-DocType: Employee Health Insurance,Health Insurance Name,健康保险名称
+DocType: Employee Health Insurance,Health Insurance Name,医保名称
 DocType: Assessment Plan,Examiner,检查员
 DocType: Student,Siblings,兄弟姐妹
-DocType: Journal Entry,Stock Entry,库存记录
+DocType: Journal Entry,Stock Entry,手工库存移动
 DocType: Payment Entry,Payment References,付款参考
-DocType: C-Form,C-FORM-,C-形式 -
+DocType: C-Form,C-FORM-,C-表单 -
 DocType: Subscription Plan,"Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days",间隔字段的间隔数，例如，如果间隔为&#39;天数&#39;并且计费间隔计数为3，则会每3天生成一次发票
 DocType: Clinical Procedure Template,Allow Stock Consumption,允许库存消耗
-DocType: Asset,Insurance Details,保险详情
+DocType: Asset,Insurance Details,保险信息
 DocType: Account,Payable,支付
 DocType: Share Balance,Share Type,分享类型
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +123,Please enter Repayment Periods,请输入还款期
@@ -4450,19 +4444,19 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,毛利％
 DocType: Appraisal Goal,Weightage (%),权重（％）
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +554,Change POS Profile,更改POS配置文件
-DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
+DocType: Bank Reconciliation Detail,Clearance Date,清帐日期
 apps/erpnext/erpnext/stock/doctype/item/item.py +700,"Asset is already exists against the item {0}, you cannot change the has serial no value",资产已针对商品{0}存在，您无法更改已连续编号的值
-apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,评估报告
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Gross Purchase Amount is mandatory,总消费金额是强制性
+apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +7,Assessment Report,评估报表
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +72,Gross Purchase Amount is mandatory,总消费金额字段必填
 apps/erpnext/erpnext/setup/doctype/company/company.js +115,Company name not same,公司名称不一样
 DocType: Lead,Address Desc,地址倒序
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +114,Party is mandatory,请输入往来单位
-DocType: Journal Entry,JV-,将N-
+DocType: Journal Entry,JV-,JV-
 apps/erpnext/erpnext/controllers/accounts_controller.py +747,Rows with duplicate due dates in other rows were found: {list},在其他行中找到具有重复到期日的行：{list}
 DocType: Topic,Topic Name,主题名称
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +319,Please set default template for Leave Approval Notification in HR Settings.,请在人力资源设置中为离职审批通知设置默认模板。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,选择一名员工以推进员工。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +308,Select an employee to get the employee advance.,请选择员工，再选择员工预支。
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +56,Please select a valid Date,请选择一个有效的日期
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,Select the nature of your business.,选择您的业务的性质。
 DocType: Lab Test Template,"Single for results which require only a single input, result UOM and normal value 
@@ -4484,22 +4478,22 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +638,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：资产{1}不属于公司{2}
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +206,Sales Invoice {0} created,已创建销售发票{0}
 DocType: Employee,Confirmation Date,确认日期
-DocType: C-Form,Total Invoiced Amount,发票总金额
+DocType: C-Form,Total Invoiced Amount,发票金额
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +51,Min Qty can not be greater than Max Qty,最小数量不能大于最大数量
 DocType: Soil Texture,Silty Clay,粉泥
 DocType: Account,Accumulated Depreciation,累计折旧
 DocType: Supplier Scorecard Scoring Standing,Standing Name,常务名称
 DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
 DocType: Asset Value Adjustment,Current Asset Value,流动资产价值
-DocType: Travel Request,Travel Funding,旅行资助
+DocType: Travel Request,Travel Funding,出差经费来源
 DocType: Loan Application,Required by Date,按日期必填
-DocType: Lead,Lead Owner,线索所有者
-DocType: Production Plan,Sales Orders Detail,销售订单明细
-DocType: Bin,Requested Quantity,要求的数量
+DocType: Lead,Lead Owner,线索负责人
+DocType: Production Plan,Sales Orders Detail,销售订单信息
+DocType: Bin,Requested Quantity,需求数量
 DocType: Patient,Marital Status,婚姻状况
 DocType: Stock Settings,Auto Material Request,自动材料需求
 DocType: Woocommerce Settings,API consumer secret,API消费者秘密
-DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在从仓库可用的批次数量
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,源仓库可用的批次数量
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工资总额 - 扣除总额 - 贷款还款
 DocType: Bank Account,IBAN,IBAN
@@ -4510,11 +4504,11 @@
 DocType: Sales Invoice,Against Income Account,对收益账目
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +117,{0}% Delivered,{0}％交付
 DocType: Subscription,Trial Period Start Date,试用期开始日期
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,项目{0}：有序数量{1}不能低于最低订货量{2}（项中定义）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,物料{0}的订单数量{1}不能小于最低订货量{2}（物料主数据中定义）。
 DocType: Certification Application,Certified,认证
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +61,Please login as another user.,请以其他用户身份登录。
-DocType: Daily Work Summary Group User,Daily Work Summary Group User,日常工作摘要组用户
+DocType: Daily Work Summary Group User,Daily Work Summary Group User,每日工作总结组用户
 DocType: Territory,Territory Targets,区域目标
 DocType: Soil Analysis,Ca/Mg,钙/镁
 DocType: Delivery Note,Transporter Info,承运商信息
@@ -4522,8 +4516,8 @@
 DocType: Cheque Print Template,Starting position from top edge,起价顶边位置
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +33,Same supplier has been entered multiple times,同一个供应商已多次输入
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,总利润/亏损
-,Warehouse wise Item Balance Age and Value,仓库明智的项目平衡年龄和价值
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,采购订单项目提供
+,Warehouse wise Item Balance Age and Value,仓库级物料库龄和金额报表
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,采购订单外发物料
 apps/erpnext/erpnext/public/js/setup_wizard.js +94,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.,标题打印模板例如形式发票。
@@ -4533,14 +4527,14 @@
 DocType: Stock Settings,Use Naming Series,使用命名系列
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +220,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/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/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
-DocType: Certification Application,Payment Details,付款详情
+DocType: Certification Application,Payment Details,付款信息
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +40,BOM Rate,BOM税率
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +240,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止的工作订单不能取消，先取消停止
-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 +474,Journal Entries {0} are un-linked,日记帐分录{0}没有关联
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +240,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止的工单不能取消，先取消停止
+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 +474,Journal Entries {0} are un-linked,手工凭证{0}没有关联
 apps/erpnext/erpnext/accounts/utils.py +803,{0} Number {1} already used in account {2},{0}号码{1}已经在账号{2}中使用
 apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.",包含电子邮件，电话，聊天，访问等所有通信记录
 DocType: Supplier Scorecard Scoring Standing,Supplier Scorecard Scoring Standing,供应商记分卡
@@ -4551,24 +4545,24 @@
 DocType: Academic Term,Term Name,术语名称
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +355,Credit ({0}),信用（{0}）
 apps/erpnext/erpnext/hr/doctype/department/department.js +14,You cannot edit root node.,您不能编辑根节点。
-DocType: Buying Settings,Purchase Order Required,购货订单要求
+DocType: Buying Settings,Purchase Order Required,需要采购订单
 apps/erpnext/erpnext/public/js/projects/timer.js +5,Timer,计时器
-,Item-wise Sales History,逐项销售历史
-DocType: Expense Claim,Total Sanctioned Amount,总被制裁金额
+,Item-wise Sales History,物料销售历史
+DocType: Expense Claim,Total Sanctioned Amount,总核准金额
 DocType: Land Unit,Land Unit,土地单位
-,Purchase Analytics,购买Analytics（分析）
-DocType: Sales Invoice Item,Delivery Note Item,送货单品目
+,Purchase Analytics,采购Analytics（分析）
+DocType: Sales Invoice Item,Delivery Note Item,销售出货单项
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +371,Current invoice {0} is missing,当前发票{0}缺失
 DocType: Asset Maintenance Log,Task,任务
 DocType: Purchase Taxes and Charges,Reference Row #,参考行＃
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},物料{0}必须指定批次号
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,这是一个root销售人员，无法被编辑。
-DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果选择此项，则在此组件中指定或计算的值不会对收入或扣除贡献。但是，它的值可以被添加或扣除的其他组件引用。
-DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果选择此项，则在此组件中指定或计算的值不会对收入或扣除贡献。但是，它的值可以被添加或扣除的其他组件引用。
+DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",勾选此项，指定或计算的值不影响收入和扣除，但可被其他收入或扣除项引用。
+DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",勾选此项，指定或计算的值不影响收入和扣除，但可被其他收入或扣除项引用。
 DocType: Asset Settings,Number of Days in Fiscal Year,会计年度的天数
 ,Stock Ledger,库存总帐
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},价格：{0}
-DocType: Company,Exchange Gain / Loss Account,兑换收益/损失帐户
+DocType: Company,Exchange Gain / Loss Account,汇兑损益科目
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,员工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +106,Purpose must be one of {0},目的必须是一个{0}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +99,Fill the form and save it,填写表格并保存
@@ -4576,34 +4570,34 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,实际库存数量
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +52,Actual qty in stock,实际库存数量
 DocType: Homepage,"URL for ""All Products""",网址“所有产品”
-DocType: Leave Application,Leave Balance Before Application,申请前假期余量
+DocType: Leave Application,Leave Balance Before Application,申请前剩余天数
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +46,Send SMS,发送短信
 DocType: Supplier Scorecard Criteria,Max Score,最高分数
-DocType: Cheque Print Template,Width of amount in word,在字量的宽度
+DocType: Cheque Print Template,Width of amount in word,文字表示的金额输出宽度
 DocType: Company,Default Letter Head,默认信头
-DocType: Purchase Order,Get Items from Open Material Requests,从公未完成材料申请获取物料
+DocType: Purchase Order,Get Items from Open Material Requests,从未完成物料申请获取物料
 DocType: Hotel Room Amenity,Billable,可开票
-DocType: Lab Test Template,Standard Selling Rate,标准销售率
+DocType: Lab Test Template,Standard Selling Rate,标准售价
 DocType: Account,Rate at which this tax is applied,应用此税率的单价
 DocType: Cash Flow Mapper,Section Name,部分名称
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +79,Reorder Qty,再订购数量
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +283,Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1},折旧行{0}：使用寿命后的预期值必须大于或等于{1}
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +55,Current Job Openings,当前职位空缺
-DocType: Company,Stock Adjustment Account,库存调整账户
-apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,抹杀
+DocType: Company,Stock Adjustment Account,库存调整科目
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,内部销账
 DocType: Healthcare Service Unit,Allow Overlap,允许重叠
 DocType: Timesheet Detail,Operation ID,操作ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系统用户的（登录）ID，将作为人力资源表单的默认ID。
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +86,Enter depreciation details,输入折旧明细
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +86,Enter depreciation details,输入折旧信息
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：来自{1}
 DocType: Task,depends_on,depends_on
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +71,Queued for updating latest price in all Bill of Materials. It may take a few minutes.,排队更新所有材料清单中的最新价格。可能需要几分钟。
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帐户的名称。注：请不要创建帐户的客户和供应商
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新科目的名称。注：请不要创建科目的客户和供应商
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,国家的默认地址模板
 DocType: Water Analysis,Appearance,出现
 DocType: HR Settings,Leave Status Notification Template,离开状态通知模板
-apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,平均。买价格表价格
-DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
+apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py +77,Avg. Buying Price List Rate,平均采购价格清单价格
+DocType: Sales Order Item,Supplier delivers to Customer,供应商直接出货给客户
 DocType: Asset,AT,在
 apps/erpnext/erpnext/config/non_profit.py +23,Member information.,会员信息。
 DocType: Identification Document Type,Identification Document Type,识别文件类型
@@ -4614,17 +4608,17 @@
 DocType: Woocommerce Settings,API consumer key,API消费者密钥
 apps/erpnext/erpnext/accounts/party.py +332,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
-DocType: Patient,Account Details,帐户明细
+DocType: Patient,Account Details,科目信息
 DocType: Crop,Materials Required,所需材料
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +76,No students Found,没有发现学生
 DocType: Employee Tax Exemption Declaration,Monthly HRA Exemption,每月HRA豁免
 DocType: Clinical Procedure,Medical Department,医学系
 DocType: Supplier Scorecard Scoring Criteria,Supplier Scorecard Scoring Criteria,供应商记分卡评分标准
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,发票发布日期
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,卖
-DocType: Purchase Invoice,Rounded Total,元整后金额
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,发票记帐日期
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,销售
+DocType: Purchase Invoice,Rounded Total,圆整后金额
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +91,Slots for {0} are not added to the schedule,{0}的插槽未添加到计划中
-DocType: Product Bundle,List items that form the package.,打包的品目列表。
+DocType: Product Bundle,List items that form the package.,本包装内的物料列表。
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py +39,Not permitted. Please disable the Test Template,不允许。请禁用测试模板
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配应该等于100 ％
 DocType: Crop Cycle,Linked Land Unit,相关的土地单位
@@ -4634,40 +4628,40 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +203,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
 DocType: Purchase Order,Order Confirmation Date,订单确认日期
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,创建维护访问
-DocType: Employee Transfer,Employee Transfer Details,员工转移详情
+DocType: Employee Transfer,Employee Transfer Details,员工转移信息
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +239,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
-DocType: Company,Default Cash Account,默认现金账户
-apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
-apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,这是基于这名学生出席
+DocType: Company,Default Cash Account,默认现金科目
+apps/erpnext/erpnext/config/accounts.py +62,Company (not Customer or Supplier) master.,公司(非客户或供应商)主数据。
+apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,基于该学生的考勤
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +178,No Students in,没有学生
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +179,Add more items or open full form,添加更多项目或全开放形式
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +219,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +219,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消销售出货单{0}
 apps/erpnext/erpnext/utilities/user_progress.py +259,Go to Users,转到用户
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+写的抵销金额不能大于总计
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +101,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金额+销帐金额不能大于总金额
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是物料{1}的有效批次号
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Note: There is not enough leave balance for Leave Type {0},注意：休假期类型{0}的剩余天数不够
 apps/erpnext/erpnext/regional/india/utils.py +19,Invalid GSTIN or Enter NA for Unregistered,无效的GSTIN或输入NA未注册
 DocType: Training Event,Seminar,研讨会
 DocType: Program Enrollment Fee,Program Enrollment Fee,计划注册费
-DocType: Item,Supplier Items,供应商品目
+DocType: Item,Supplier Items,供应商物料
 DocType: Opportunity,Opportunity Type,机会类型
 DocType: Asset Movement,To Employee,给员工
 DocType: Employee Transfer,New Company,新建公司
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,交易只能由公司的创建者删除
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,总帐分录发现错误数字，你可能在交易中选择了错误的科目。
+apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,总帐分录发现错误数字，可能是选择了错误的科目。
 DocType: Employee,Prefered Contact Email,首选联系邮箱
 DocType: Cheque Print Template,Cheque Width,支票宽度
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,验证售价反对预订价或估价RATE项目
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,比对物料销售价，采购价与库存评估价
 DocType: Fee Schedule,Fee Schedule,收费表
 DocType: Hub Settings,Publish Availability,发布房源
-DocType: Company,Create Chart Of Accounts Based On,创建图表的帐户根据
+DocType: Company,Create Chart Of Accounts Based On,基于...创建科目表
 apps/erpnext/erpnext/projects/doctype/task/task.js +91,Cannot convert it to non-group. Child Tasks exist.,无法将其转换为非组。子任务存在。
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +122,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
 DocType: Travel Request,"Partially Sponsored, Require Partial Funding",部分赞助，需要部分资金
 apps/erpnext/erpnext/education/doctype/student/student.py +40,Student {0} exist against student applicant {1},学生{0}存在针对学生申请{1}
 DocType: Purchase Invoice,Rounding Adjustment (Company Currency),四舍五入调整（公司货币）
-apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,时间表
+apps/erpnext/erpnext/projects/doctype/task/task.js +39,Timesheet,工时单
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html +243,Batch: ,批量：
 DocType: Volunteer,Afternoon,下午
 DocType: Loyalty Program,Loyalty Program Help,忠诚度计划帮助
@@ -4678,60 +4672,60 @@
 DocType: Timesheet,Total Billable Amount,总结算金额
 DocType: Customer,Credit Limit and Payment Terms,信用额度和付款条款
 DocType: Loyalty Program,Collection Rules,收集规则
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,物料3
 apps/erpnext/erpnext/restaurant/doctype/restaurant/restaurant.js +6,Order Entry,订单输入
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
-DocType: Warranty Claim,Item and Warranty Details,项目和保修细节
+DocType: Warranty Claim,Item and Warranty Details,物料和保修
 DocType: Chapter,Chapter Members,章节成员
 DocType: Sales Team,Contribution (%),贡献（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +125,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
+apps/erpnext/erpnext/controllers/accounts_controller.py +125,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：“现金或银行科目”未指定，付款凭证不会创建
 apps/erpnext/erpnext/projects/doctype/project/project.py +71,Project {0} already exists,项目{0}已经存在
 DocType: Clinical Procedure,Nursing User,护理用户
-DocType: Employee Benefit Application,Payroll Period,工资期
+DocType: Employee Benefit Application,Payroll Period,工资期间
 DocType: Plant Analysis,Plant Analysis Criterias,植物分析标准
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +237,Serial No {0} does not belong to Batch {1},序列号{0}不属于批次{1}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +220,Responsibilities,职责
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +125,Validity period of this quotation has ended.,此报价的有效期已经结束。
-DocType: Expense Claim Account,Expense Claim Account,报销账户
-DocType: Account,Capital Work in Progress,资本工作正在进行中
-DocType: Accounts Settings,Allow Stale Exchange Rates,允许陈旧的汇率
+DocType: Expense Claim Account,Expense Claim Account,费用报销科目
+DocType: Account,Capital Work in Progress,在途资本
+DocType: Accounts Settings,Allow Stale Exchange Rates,允许使用历史汇率
 DocType: Sales Person,Sales Person Name,销售人员姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,请在表中输入ATLEAST 1发票
 apps/erpnext/erpnext/utilities/user_progress.py +247,Add Users,添加用户
-DocType: POS Item Group,Item Group,项目群组
+DocType: POS Item Group,Item Group,物料群组
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +16,Student Group: ,学生组：
-DocType: Depreciation Schedule,Finance Book Id,金融书籍ID
+DocType: Depreciation Schedule,Finance Book Id,账簿ID
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +380,Select Country,选择国家
 DocType: Item,Safety Stock,安全库存
 DocType: Healthcare Settings,Healthcare Settings,医疗设置
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +8,Total Allocated Leaves,总分配的叶子
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +8,Total Allocated Leaves,总已分配休假天数
 apps/erpnext/erpnext/projects/doctype/task/task.py +54,Progress % for a task cannot be more than 100.,为任务进度百分比不能超过100个。
 DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
-DocType: Sales Order,Partly Billed,天色帐单
+DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),税/费已添加（公司货币）
+apps/erpnext/erpnext/stock/doctype/item/item.py +492,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,物料税项行{0}中必须指定类型为税项/收益/支出/应课的科目。
+DocType: Sales Order,Partly Billed,部分开票
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +54,Item {0} must be a Fixed Asset Item,物料{0}必须被定义为是固定资产
-apps/erpnext/erpnext/stock/doctype/item/item.js +403,Make Variants,变种
+apps/erpnext/erpnext/stock/doctype/item/item.js +403,Make Variants,创建物料变式
 DocType: Item,Default BOM,默认的BOM
 DocType: Project,Total Billed Amount (via Sales Invoices),总开票金额（通过销售发票）
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,借方票据金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +131,Debit Note Amount,退款金额
 DocType: Project Update,Not Updated,未更新
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +107,"There are inconsistencies between the rate, no of shares and the amount calculated",费率，股份数量和计算的金额之间不一致
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py +39,You are not present all day(s) between compensatory leave request days,您在补休请求日之间不是全天
 apps/erpnext/erpnext/setup/doctype/company/company.js +109,Please re-type company name to confirm,请确认重新输入公司名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,总待处理金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +234,Total Outstanding Amt,总未付金额
 DocType: Journal Entry,Printing Settings,打印设置
-DocType: Employee Advance,Advance Account,预付帐户
+DocType: Employee Advance,Advance Account,预支科目
 DocType: Job Offer,Job Offer Terms,招聘条款
-DocType: Sales Invoice,Include Payment (POS),包括支付（POS）
+DocType: Sales Invoice,Include Payment (POS),直接付款（POS订单）
 DocType: Shopify Settings,eg: frappe.myshopify.com,例如：frappe.myshopify.com
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Total Debit must be equal to Total Credit. The difference is {0},总借方必须等于总贷方金额，差异{0}。
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +11,Automotive,汽车
 DocType: Vehicle,Insurance Company,保险公司
-DocType: Asset Category Account,Fixed Asset Account,固定资产帐户
+DocType: Asset Category Account,Fixed Asset Account,固定资产科目
 DocType: Salary Structure Assignment,Variable,变量
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,来自送货单
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,源销售出货单
 DocType: Chapter,Members,会员
 DocType: Student,Student Email Address,学生的电子邮件地址
 DocType: Item,Hub Warehouse,Hub仓库
@@ -4745,9 +4739,9 @@
 DocType: Loyalty Program,Multiple Tier Program,多层计划
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Student Address,学生地址
-DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
+DocType: Purchase Invoice,Price List Exchange Rate,价格清单汇率
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +116,All Supplier Groups,所有供应商组织
-DocType: Employee Boarding Activity,Required for Employee Creation,员工创建需要
+DocType: Employee Boarding Activity,Required for Employee Creation,用于创建员工时
 DocType: GoCardless Mandate,Mandate,要求
 DocType: POS Profile,POS Profile Name,POS配置文件名称
 DocType: Hotel Room Reservation,Booked,预订
@@ -4755,7 +4749,7 @@
 DocType: Purchase Invoice Item,Rate,单价
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +107,Intern,实习生
 DocType: Delivery Stop,Address Name,地址名称
-DocType: Stock Entry,From BOM,从BOM
+DocType: Stock Entry,From BOM,展BOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Splitting {0} units of {1},拆分{1}个{0}个单位
 DocType: Assessment Code,Assessment Code,评估准则
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +76,Basic,基本
@@ -4766,39 +4760,39 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +37,Error evaluating the criteria formula,评估标准公式时出错
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +125,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
 DocType: Subscription,Plans,计划
-DocType: Salary Slip,Salary Structure,薪酬结构
+DocType: Salary Slip,Salary Structure,薪资结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +9,Airline,航空公司
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +921,Issue Material,发料
 apps/erpnext/erpnext/config/erpnext_integrations.py +32,Connect Shopify with ERPNext,将Shopify与ERPNext连接
-DocType: Material Request Item,For Warehouse,对仓库
-DocType: Employee,Offer Date,录取日期
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
+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 +746,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
 DocType: Leave Period,Grant,格兰特
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +47,No Student Groups created.,没有学生团体创建的。
 DocType: Purchase Invoice Item,Serial No,序列号
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +129,Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,请输入您的详细维护性第一
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,请先输入客户拜访（维护）信息
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Row #{0}: Expected Delivery Date cannot be before Purchase Order Date,行＃{0}：预计交货日期不能在采购订单日期之前
 DocType: Purchase Invoice,Print Language,打印语言
 DocType: Salary Slip,Total Working Hours,总的工作时间
 DocType: Sales Invoice,Customer PO Details,客户PO详细信息
-DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
-DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,临时开户
+DocType: Stock Entry,Including items for sub assemblies,包括下层组件物料
+DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,临时开账科目
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1976,Enter value must be positive,输入值必须为正
-DocType: Asset,Finance Books,财务书籍
+DocType: Asset,Finance Books,账簿
 DocType: Employee Tax Exemption Declaration Category,Employee Tax Exemption Declaration Category,员工免税申报类别
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/pos.py +448,All Territories,所有的区域
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1346,Invalid Blanket Order for the selected Customer and Item,所选客户和物料的无效总订单
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1346,Invalid Blanket Order for the selected Customer and Item,无效框架订单对所选客户和物料无效
 apps/erpnext/erpnext/projects/doctype/task/task_tree.js +49,Add Multiple Tasks,添加多个任务
-DocType: Purchase Invoice,Items,项目
+DocType: Purchase Invoice,Items,物料
 apps/erpnext/erpnext/crm/doctype/contract/contract.py +38,End Date cannot be before Start Date.,结束日期不能在开始日期之前。
 apps/erpnext/erpnext/education/doctype/program_enrollment/program_enrollment.py +34,Student is already enrolled.,学生已经注册。
 DocType: Fiscal Year,Year Name,年度名称
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +311,There are more holidays than working days this month.,这个月的假期比工作日多。
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +101,PDC/LC Ref,PDC / LC参考
-DocType: Production Plan Item,Product Bundle Item,产品包项目
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +311,There are more holidays than working days this month.,本月假期比工作日多。
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +101,PDC/LC Ref,部分支付参考号码
+DocType: Production Plan Item,Product Bundle Item,产品包物料
 DocType: Sales Partner,Sales Partner Name,销售合作伙伴名称
 apps/erpnext/erpnext/hooks.py +136,Request for Quotations,索取报价
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
@@ -4818,17 +4812,17 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py +718,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',物料变体的默认单位“{0}”必须与模板默认单位一致“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Contract,Unfulfilled,秕
-DocType: Delivery Note Item,From Warehouse,从仓库
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +65,No employees for the mentioned criteria,没有雇员提到的标准
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1002,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
+DocType: Delivery Note Item,From Warehouse,源仓库
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +65,No employees for the mentioned criteria,没有员工提到的标准
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1002,No Items with Bill of Materials to Manufacture,待生产物料没有物料清单
 DocType: Shopify Settings,Default Customer,默认客户
 DocType: Assessment Plan,Supervisor Name,主管名称
 DocType: Healthcare Settings,Do not confirm if appointment is created for the same day,不要确认是否在同一天创建约会
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +187,Make Sample Retention Stock Entry,使样品保留库存条目
-DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
-DocType: Leave Encashment,Encashment Amount,填充量
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +187,Make Sample Retention Stock Entry,创建留存样品手工库存移动记录
+DocType: Purchase Taxes and Charges,Valuation and Total,库存评估价与总计
+DocType: Leave Encashment,Encashment Amount,折现金额
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py +11,Scorecards,记分卡
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +159,Expired Batches,过期批次
 DocType: Employee,This will restrict user access to other employee records,这将限制用户访问其他员工记录
@@ -4841,24 +4835,24 @@
 DocType: Lab Test Groups,Add Test,添加测试
 DocType: Manufacturer,Limited to 12 characters,限12个字符
 DocType: Journal Entry,Print Heading,打印标题
-apps/erpnext/erpnext/config/stock.py +150,Delivery Trip service tours to customers.,送货服务游览给顾客。
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,总不能为零
+apps/erpnext/erpnext/config/stock.py +150,Delivery Trip service tours to customers.,配送顾客。
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,总分数不能为零
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“ 最后的订单到目前的天数”必须大于或等于零
 DocType: Plant Analysis Criteria,Maximum Permissible Value,最大允许值
-DocType: Journal Entry Account,Employee Advance,员工晋升
-DocType: Payroll Entry,Payroll Frequency,工资频率
+DocType: Journal Entry Account,Employee Advance,员工预支
+DocType: Payroll Entry,Payroll Frequency,工资发放频率
 DocType: Lab Test Template,Sensitivity,灵敏度
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +965,Raw Material,原料
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +965,Raw Material,原材料
 DocType: Leave Application,Follow via Email,通过电子邮件关注
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Plants and Machineries,植物和机械设备
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,税额折后金额
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作总结设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1251,Selected Price List should have buying and selling fields checked.,选定价目表应该有买入和卖出的字段。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1251,Selected Price List should have buying and selling fields checked.,选定价格清单应该有买入和卖出的字段。
 apps/erpnext/erpnext/controllers/buying_controller.py +664,Please enter Reqd by Date,请输入按日期请求
 DocType: Payment Entry,Internal Transfer,内部转账
 DocType: Asset Maintenance,Maintenance Tasks,维护任务
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,需要指定目标数量和金额
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +427,Please select Posting Date first,请选择发布日期第一
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +427,Please select Posting Date first,请先选择记帐日期
 apps/erpnext/erpnext/public/js/account_tree_grid.js +209,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
 DocType: Travel Itinerary,Flight,飞行
 DocType: Leave Control Panel,Carry Forward,顺延
@@ -4869,7 +4863,7 @@
 DocType: Crop Cycle,Detected Disease,检测到的疾病
 ,Produced,生产
 apps/erpnext/erpnext/hr/doctype/loan/loan.py +26,Repayment Start Date cannot be before Disbursement Date.,还款开始日期不能在付款日期之前。
-DocType: Item,Item Code for Suppliers,对于供应商项目编号
+DocType: Item,Item Code for Suppliers,对于供应商物料代码
 DocType: Issue,Raised By (Email),提出（电子邮件）
 DocType: Training Event,Trainer Name,讲师姓名
 DocType: Mode of Payment,General,一般
@@ -4877,9 +4871,9 @@
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py +66,Queued for replacing the BOM. It may take a few minutes.,排队等待更换BOM。可能需要几分钟时间。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +374,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +248,Serial Nos Required for Serialized Item {0},序列化的品目{0}必须指定序列号
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +248,Serial Nos Required for Serialized Item {0},序列化的物料{0}必须指定序列号
 apps/erpnext/erpnext/config/accounts.py +150,Match Payments with Invoices,匹配付款与发票
-DocType: Journal Entry,Bank Entry,银行记录
+DocType: Journal Entry,Bank Entry,银行凭证
 DocType: Authorization Rule,Applicable To (Designation),适用于(职位)
 ,Profitability Analysis,盈利能力分析
 DocType: Fees,Student Email,学生电子邮件
@@ -4891,24 +4885,24 @@
 apps/erpnext/erpnext/config/accounts.py +304,Enable / disable currencies.,启用/禁用货币。
 DocType: Exchange Rate Revaluation,Get Entries,获取条目
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +107,Dr {0} on Half day Leave on {1},{0}博士半天在{1}
-DocType: Production Plan,Get Material Request,获取材质要求
+DocType: Production Plan,Get Material Request,获取物料需求
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Postal Expenses,邮政费用
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html +8,Sales Summary,销售摘要
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +26,Entertainment & Leisure,娱乐休闲
-,Item Variant Details,项目变体的详细信息
-DocType: Quality Inspection,Item Serial No,项目序列号
+,Item Variant Details,物料变体详细信息
+DocType: Quality Inspection,Item Serial No,物料序列号
 apps/erpnext/erpnext/utilities/activation.py +135,Create Employee Records,建立员工档案
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +97,Total Present,总现
 apps/erpnext/erpnext/config/accounts.py +105,Accounting Statements,会计报表
 DocType: Drug Prescription,Hour,小时
 DocType: Restaurant Order Entry,Last Sales Invoice,上次销售发票
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +803,Please select Qty against item {0},请选择项目{0}的数量
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +31,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过库存记录和采购收据设置。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +803,Please select Qty against item {0},请选择为物料{0}指定数量
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +31,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 +190,You are not authorized to approve leaves on Block Dates,您无权批准锁定日期内的休假
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +396,All these items have already been invoiced,这些品目都已开具发票
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +987,Set New Release Date,设置新的发布日期
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +396,All these items have already been invoiced,这些物料都已开具发票
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +987,Set New Release Date,设置新的审批日期
 DocType: Company,Monthly Sales Target,每月销售目标
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},可以被{0}的批准
 DocType: Hotel Room,Hotel Room Type,酒店房间类型
@@ -4916,7 +4910,7 @@
 DocType: Item,Default Material Request Type,默认物料申请类型
 DocType: Supplier Scorecard,Evaluation Period,评估期
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js +13,Unknown,未知
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1001,Work Order not created,工作订单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1001,Work Order not created,工单未创建
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +33,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",已为组件{1}申请的金额{0}，设置等于或大于{2}的金额
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
@@ -4924,7 +4918,7 @@
 DocType: Salary Slip Loan,Salary Slip Loan,工资单贷款
 DocType: BOM Update Tool,The new BOM after replacement,更换后的物料清单
 ,Point of Sale,销售点
-DocType: Payment Entry,Received Amount,收金额
+DocType: Payment Entry,Received Amount,收到的金额
 DocType: Patient,Widow,寡妇
 DocType: GST Settings,GSTIN Email Sent On,发送GSTIN电子邮件
 DocType: Program Enrollment,Pick/Drop by Guardian,由守护者选择
@@ -4935,19 +4929,19 @@
 DocType: Account,Tax,税项
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,未标记
 DocType: Contract,Signed,签
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,打开发票摘要
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html +1,Opening Invoices Summary,待创建发票汇总
 DocType: Education Settings,Education Manager,教育经理
 DocType: Crop Cycle,The minimum length between each plant in the field for optimum growth,每个工厂之间的最小长度为最佳的增长
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量项目{0}无法使用库存调节更新，而是使用库存条目
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量项目{0}无法使用库存调节更新，而是使用库存条目
-DocType: Quality Inspection,Report Date,报告日期
-DocType: Student,Middle Name,中间名字
-DocType: Serial No,Asset Details,资产详情
+DocType: Quality Inspection,Report Date,报表日期
+DocType: Student,Middle Name,中间名
+DocType: Serial No,Asset Details,资产信息
 DocType: Bank Statement Transaction Payment Item,Invoices,发票
 DocType: Water Analysis,Type of Sample,样品类型
 DocType: Batch,Source Document Name,源文档名称
 DocType: Batch,Source Document Name,源文档名称
-DocType: Production Plan,Get Raw Materials For Production,获取生产原料
+DocType: Production Plan,Get Raw Materials For Production,获取生产用原材料
 DocType: Job Opening,Job Title,职位
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +84,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{0}表示{1}不会提供报价，但所有项目都已被引用。更新询价状态。
@@ -4959,29 +4953,29 @@
 DocType: Supplier Scorecard,Per Month,每月
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +467,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 DocType: Asset Settings,Calculate Prorated Depreciation Schedule Based on Fiscal Year,根据会计年度计算折旧折旧计划
-apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,保养电话的现场报告。
-DocType: Stock Entry,Update Rate and Availability,更新存货估价和可用性数量
+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: Loyalty Program,Customer Group,客户群组
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +262,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Time Logs,行＃{0}：操作{1}未完成{2}工件订单＃{3}中成品的数量。请通过时间日志更新操作状态
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),新批号（可选）
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +128,New Batch ID (Optional),新批号（可选）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Expense account is mandatory for item {0},品目{0}必须指定开支账户
-DocType: BOM,Website Description,网站简介
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Expense account is mandatory for item {0},必须为物料{0}指定费用科目
+DocType: BOM,Website Description,显示在网站商的详细说明，可文字，图文，多媒体混排
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +101,Net Change in Equity,在净资产收益变化
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +291,Please cancel Purchase Invoice {0} first,请先取消采购发票{0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期时间
 DocType: Asset,Receipt,收据
-,Sales Register,销售记录
-DocType: Daily Work Summary Group,Send Emails At,发送电子邮件在
-DocType: Quotation,Quotation Lost Reason,报价丧失原因
+,Sales Register,销售台帐
+DocType: Daily Work Summary Group,Send Emails At,电子邮件发送时机
+DocType: Quotation,Quotation Lost Reason,报价输了的原因
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +383,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js +5,There is nothing to edit.,无需编辑。
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +541,Form View,表单视图
-DocType: HR Settings,Expense Approver Mandatory In Expense Claim,费用审批人必须在费用索赔中
+DocType: HR Settings,Expense Approver Mandatory In Expense Claim,请选择报销审批人
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +118,Summary for this month and pending activities,本月和待活动总结
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py +91,Please set Unrealized Exchange Gain/Loss Account in Company {0},请在公司{0}中设置未实现的汇兑收益/损失帐户
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py +91,Please set Unrealized Exchange Gain/Loss Account in Company {0},请在公司{0}中设置未实现汇兑损益科目
 apps/erpnext/erpnext/utilities/user_progress.py +248,"Add users to your organization, other than yourself.",将用户添加到您的组织，而不是您自己。
 DocType: Customer Group,Customer Group Name,客户群组名称
 apps/erpnext/erpnext/public/js/pos/pos.html +109,No Customers yet!,还没有客户！
@@ -4992,12 +4986,12 @@
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +518,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: GL Entry,Against Voucher Type,凭证类型
 DocType: Physician,Phone (R),电话（R）
 apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +104,Time slots added,添加时隙
 DocType: Item,Attributes,属性
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +36,Enable Template,启用模板
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +242,Please enter Write Off Account,请输入核销帐户
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +242,Please enter Write Off Account,请输入销帐科目
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
 DocType: Salary Component,Is Payable,应付
 DocType: Patient,B Negative,B负面
@@ -5005,7 +4999,7 @@
 DocType: Holiday List,Add Weekly Holidays,添加每周假期
 DocType: Staffing Plan Detail,Vacancies,职位空缺
 DocType: Hotel Room,Hotel Room,旅馆房间
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,Account {0} does not belongs to company {1},科目{0}不属于公司{1}
 DocType: Leave Type,Rounding,四舍五入
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +936,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),分配金额（按比例分配）
@@ -5018,28 +5012,28 @@
 DocType: Production Plan Item,Planned Start Date,计划开始日期
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +625,Please select a BOM,请选择一个物料清单
 DocType: Purchase Invoice,Availed ITC Integrated Tax,有效的ITC综合税收
-DocType: Purchase Order Item,Blanket Order Rate,一揽子订单费率
+DocType: Purchase Order Item,Blanket Order Rate,一揽子订单单价
 apps/erpnext/erpnext/hooks.py +152,Certification,证明
 DocType: Bank Guarantee,Clauses and Conditions,条款和条件
 DocType: Serial No,Creation Document Type,创建文件类型
-DocType: Project Task,View Timesheet,查看时间表
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js +24,Make Journal Entry,创建日记帐分录
-DocType: Leave Allocation,New Leaves Allocated,新调配的假期
-apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,项目明智的数据不适用于报价
+DocType: Project Task,View Timesheet,查看工时单
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js +24,Make Journal Entry,创建手工凭证
+DocType: Leave Allocation,New Leaves Allocated,新分配的休假（天数）
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,无项目数据，无法报价
 apps/erpnext/erpnext/education/doctype/student_admission/templates/student_admission.html +30,End on,结束
 DocType: Project,Expected End Date,预计结束日期
 DocType: Budget Account,Budget Amount,预算额
 DocType: Donor,Donor Name,捐助者名称
-DocType: Journal Entry,Inter Company Journal Entry Reference,Inter公司日记帐分录参考
+DocType: Journal Entry,Inter Company Journal Entry Reference,关联公司业务手工凭证参考
 DocType: Appraisal Template,Appraisal Template Title,评估模板标题
 apps/erpnext/erpnext/utilities/user_progress_utils.py +29,Commercial,商业
 DocType: Patient,Alcohol Current Use,酒精当前使用
 DocType: Employee Tax Exemption Proof Submission,House Rent Payment Amount,房屋租金付款金额
 DocType: Student Admission Program,Student Admission Program,学生入学计划
 DocType: Employee Tax Exemption Sub Category,Tax Exemption Category,免税类别
-DocType: Payment Entry,Account Paid To,账户支付至
+DocType: Payment Entry,Account Paid To,收款科目
 DocType: Subscription Settings,Grace Period,宽限期
-DocType: Item Alternative,Alternative Item Name,替代项目名称
+DocType: Item Alternative,Alternative Item Name,替代物料名称
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父项{0}不能是库存产品
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +187,Website Listing,网站列表
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +533,"Could not submit any Salary Slip <br>\
@@ -5047,10 +5041,10 @@
 			1. Net pay is less than 0. <br>\
 			2. Company Email Address specified in employee master is not valid. <br>",无法提交任何薪资单<br> \可能的原因： <br> \ 1.净工资小于0。 <br> \ 2.员工主数据中指定的公司电子邮件地址无效。 <br>
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,所有的产品或服务。
-DocType: Expense Claim,More Details,更多详情
+DocType: Expense Claim,More Details,更多信息
 DocType: Supplier Quotation,Supplier Address,供应商地址
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +160,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} 账户{1}对于{2}{3}的预算是{4}. 预期增加{5}
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,输出数量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Out Qty,发出数量
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +49,Series is mandatory,系列是必须项
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +28,Financial Services,金融服务
 DocType: Student Sibling,Student ID,学生卡
@@ -5060,7 +5054,7 @@
 DocType: Stock Entry Detail,Basic Amount,基本金额
 DocType: Training Event,Exam,考试
 DocType: Complaint,Complaint,抱怨
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +489,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +489,Warehouse required for stock Item {0},物料{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的休假
 apps/erpnext/erpnext/hr/doctype/loan/loan.js +83,Make Repayment Entry,进行还款分录
 apps/erpnext/erpnext/patches/v11_0/update_department_lft_rgt.py +8,All Departments,所有部门
@@ -5071,9 +5065,9 @@
 DocType: Tax Rule,Billing State,计费状态
 DocType: Share Transfer,Transfer,转让
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +259,Work Order {0} must be cancelled before cancelling this Sales Order,在取消此销售订单之前，必须先取消工单{0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +985,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +985,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子物料）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
-apps/erpnext/erpnext/controllers/accounts_controller.py +162,Due Date is mandatory,截止日期是强制性的
+apps/erpnext/erpnext/controllers/accounts_controller.py +162,Due Date is mandatory,截止日期字段必填
 apps/erpnext/erpnext/controllers/item_variant.py +82,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
 DocType: Employee Benefit Claim,Benefit Type and Amount,福利类型和金额
 apps/erpnext/erpnext/hotels/report/hotel_room_occupancy/hotel_room_occupancy.py +19,Rooms Booked,客房预订
@@ -5085,44 +5079,44 @@
 DocType: Support Settings,Support Portal,支持门户
 apps/erpnext/erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py +19,Registration fee can not be Zero,注册费不能为零
 DocType: Disease,Treatment Period,治疗期
-DocType: Travel Itinerary,Travel Itinerary,旅游行程
+DocType: Travel Itinerary,Travel Itinerary,出差行程
 apps/erpnext/erpnext/education/api.py +338,Result already Submitted,结果已提交
-apps/erpnext/erpnext/controllers/buying_controller.py +180,Reserved Warehouse is mandatory for Item {0} in Raw Materials supplied,保留仓库对于提供的原材料中的项目{0}是强制性的
-,Inactive Customers,不活跃的客户
+apps/erpnext/erpnext/controllers/buying_controller.py +180,Reserved Warehouse is mandatory for Item {0} in Raw Materials supplied,发给供应供应商的原物料{0}其保留仓库字段必填
+,Inactive Customers,非活跃客户
 DocType: Student Admission Program,Maximum Age,最大年龄
 apps/erpnext/erpnext/regional/doctype/gst_settings/gst_settings.py +28,Please wait 3 days before resending the reminder.,请重新发送提醒之前请等待3天。
 DocType: Landed Cost Voucher,LCV,LCV
-DocType: Landed Cost Voucher,Purchase Receipts,购买收据
+DocType: Landed Cost Voucher,Purchase Receipts,采购收货
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,定价规则如何应用？
-DocType: Stock Entry,Delivery Note No,送货单编号
+DocType: Stock Entry,Delivery Note No,销售出货单编号
 DocType: Cheque Print Template,Message to show,信息显示
 apps/erpnext/erpnext/public/js/setup_wizard.js +28,Retail,零售
-DocType: Student Attendance,Absent,缺席
-DocType: Staffing Plan,Staffing Plan Detail,人员配置计划详情
-DocType: Employee Promotion,Promotion Date,促销日期
+DocType: Student Attendance,Absent,缺勤
+DocType: Staffing Plan,Staffing Plan Detail,人员配置计划信息
+DocType: Employee Promotion,Promotion Date,升职日期
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +596,Product Bundle,产品包
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +38,Unable to find score starting at {0}. You need to have standing scores covering 0 to 100,无法从{0}开始获得分数。你需要有0到100的常规分数
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,Row {0}: Invalid reference {1},行{0}：无效参考{1}
 apps/erpnext/erpnext/assets/doctype/location/location_tree.js +23,New Location,新位置
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,进项税/费模板
 DocType: Subscription,Current Invoice Start Date,当前发票开始日期
 DocType: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：借方或贷方金额是必输的{2}
 DocType: GL Entry,Remarks,备注
 DocType: Hotel Room Amenity,Hotel Room Amenity,酒店客房舒适
 DocType: Budget,Action if Annual Budget Exceeded on MR,年度预算超出MR的行动
-DocType: Payment Entry,Account Paid From,帐户支付于
-DocType: Purchase Order Item Supplied,Raw Material Item Code,原料产品编号
+DocType: Payment Entry,Account Paid From,付款科目
+DocType: Purchase Order Item Supplied,Raw Material Item Code,原材料物料编号
 DocType: Task,Parent Task,父任务
-DocType: Journal Entry,Write Off Based On,核销基于
-apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,使铅
+DocType: Journal Entry,Write Off Based On,销帐基于
+apps/erpnext/erpnext/utilities/activation.py +65,Make Lead,创建线索
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +119,Print and Stationery,打印和文具
-DocType: Stock Settings,Show Barcode Field,显示条形码域
+DocType: Stock Settings,Show Barcode Field,显示条形码字段
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +833,Send Supplier Emails,发送电子邮件供应商
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +172,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工资已经处理了与{0}和{1}，留下申请期之间不能在此日期范围内的时期。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +172,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工资已经结算了与{0}和{1}，不可在此期间再申请休假。
 DocType: Fiscal Year,Auto Created,自动创建
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py +19,Submit this to create the Employee record,提交这个来创建员工记录
-DocType: Item Default,Item Default,项目默认值
+DocType: Item Default,Item Default,物料默认值
 DocType: Chapter Member,Leave Reason,离开原因
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +203,Invoice {0} no longer exists,发票{0}不再存在
 DocType: Guardian Interest,Guardian Interest,卫利息
@@ -5135,30 +5129,30 @@
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Guardian1 Email ID,Guardian1电子邮件ID
 DocType: Lab Prescription,Test Code,测试代码
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,对网站的主页设置
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +877,{0} is on hold till {1},{0}在挂起，直到{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +877,{0} is on hold till {1},{0}暂缓处理，直到{1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +40,RFQs are not allowed for {0} due to a scorecard standing of {1},由于{1}的记分卡，{0}不允许使用RFQ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +9,Used Leaves,使用的叶子
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +9,Used Leaves,已休假(天数)
 DocType: Job Offer,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +83,Above,以上
 DocType: Support Search Source,Link Options,链接选项
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1556,Total Amount {0},总金额{0}
 apps/erpnext/erpnext/controllers/item_variant.py +315,Invalid attribute {0} {1},无效的属性{0} {1}
-DocType: Supplier,Mention if non-standard payable account,如果非标准应付账款提到
+DocType: Supplier,Mention if non-standard payable account,如使用非标准应付科目，请在这里指定
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.py +25,Please select the assessment group other than 'All Assessment Groups',请选择“所有评估组”以外的评估组
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +67,Row {0}: Cost center is required for an item {1},行{0}：项目{1}需要费用中心
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +6,This is based on transactions against this Physician.,这是基于对这位医师的交易。
 DocType: Training Event Employee,Optional,可选的
-DocType: Salary Slip,Earning & Deduction,盈余及扣除
+DocType: Salary Slip,Earning & Deduction,收入及扣除
 DocType: Agriculture Analysis Criteria,Water Analysis,水分析
 DocType: Chapter,Region,区域
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,负评估价格是不允许的
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,评估价不可以为负数
 DocType: Holiday List,Weekly Off,周末
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.js +7,Reload Linked Analysis,重新加载链接分析
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",对例如2012，2012-13
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +97,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: 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: Blanket Order,BO.#####,BO，#####
@@ -5167,14 +5161,14 @@
 ,Monthly Attendance Sheet,每月考勤表
 apps/erpnext/erpnext/hr/report/employee_advance_summary/employee_advance_summary.py +15,No record found,未找到记录
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Cost of Scrapped Asset,报废资产成本
-apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是品目{2}的必须项
+apps/erpnext/erpnext/controllers/stock_controller.py +240,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是物料{2}的必须项
 DocType: Vehicle,Policy No,政策：
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +710,Get Items from Product Bundle,从产品包获取物料
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,分裂
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +72,Split,分裂
-DocType: Employee Transfer,Re-allocate Leaves,重新分配叶子
+DocType: Employee Transfer,Re-allocate Leaves,重新分配休假
 DocType: GL Entry,Is Advance,是否预付款
 apps/erpnext/erpnext/config/hr.py +202,Employee Lifecycle,员工生命周期
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,必须指定考勤起始日期和结束日期
@@ -5185,20 +5179,20 @@
 DocType: Sales Team,Contact No.,联络人电话
 DocType: Bank Reconciliation,Payment Entries,付款项
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py +33,Access token or Shopify URL missing,访问令牌或Shopify网址丢失
-DocType: Land Unit,Land Unit Details,土地单位详情
+DocType: Land Unit,Land Unit Details,土地单位信息
 DocType: Land Unit,Latitude,纬度
 DocType: Work Order,Scrap Warehouse,废料仓库
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +179,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行，需要仓库，请为公司{2}的物料{1}设置默认仓库
 DocType: Work Order,Check if material transfer entry is not required,检查是否不需要材料转移条目
 DocType: Work Order,Check if material transfer entry is not required,检查是否不需要材料转移条目
 DocType: Program Enrollment Tool,Get Students From,让学生从
-apps/erpnext/erpnext/config/learn.py +263,Publish Items on Website,公布于网页上的项目
+apps/erpnext/erpnext/config/learn.py +263,Publish Items on Website,发布物料到网站上
 apps/erpnext/erpnext/utilities/activation.py +126,Group your students in batches,一群学生在分批
 DocType: Authorization Rule,Authorization Rule,授权规则
 DocType: POS Profile,Offline POS Section,离线POS部分
-DocType: Sales Invoice,Terms and Conditions Details,条款和条件详情
+DocType: Sales Invoice,Terms and Conditions Details,条款和条件信息
 apps/erpnext/erpnext/templates/generators/item.html +100,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/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),总（信用）
 DocType: Repayment Schedule,Payment Date,付款日期
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +122,New Batch Qty,新批量
@@ -5209,15 +5203,15 @@
 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: Program Enrollment,Institute's Bus,学院的巴士
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,角色允许设置冻结帐户和编辑冷冻项
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,允许设置冻结科目和编辑冻结凭证的角色
 DocType: Supplier Scorecard Scoring Variable,Path,路径
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cannot convert Cost Center to ledger as it has child nodes,不能将成本中心转换为总账，因为它有子项。
 DocType: Production Plan,Total Planned Qty,总计划数量
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,开度值
-DocType: Salary Component,Formula,式
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +70,Opening Value,期初金额
+DocType: Salary Component,Formula,公式
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +47,Serial #,序列号
 DocType: Lab Test Template,Lab Test Template,实验室测试模板
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Sales Account,销售帐户
+apps/erpnext/erpnext/setup/doctype/company/company.py +190,Sales Account,销售科目
 DocType: Purchase Invoice Item,Total Weight,总重量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Commission on Sales,销售佣金
 DocType: Job Offer Term,Value / Description,值/说明
@@ -5230,30 +5224,30 @@
 DocType: Asset Maintenance Task,Assign To Name,分配到名称
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Entertainment Expenses,娱乐费用
 DocType: Hub Settings,Enabled Users,已启用的用户
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +98,Make Material Request,制作材料要求
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打开项目{0}
-DocType: Asset Finance Book,Written Down Value,写下价值
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +98,Make Material Request,创建物料需求
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打开物料{0}
+DocType: Asset Finance Book,Written Down Value,账面净值
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +229,Sales Invoice {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消销售发票{0}
 DocType: Clinical Procedure,Age,账龄
 DocType: Sales Invoice Timesheet,Billing Amount,开票金额
 DocType: Cash Flow Mapping,Select Maximum Of 1,选择最多1个
 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的数字。
-DocType: Company,Default Employee Advance Account,默认员工高级帐户
+DocType: Company,Default Employee Advance Account,默认员工预支科目
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1180,Search Item (Ctrl + i),搜索项目（Ctrl + i）
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,Account with existing transaction can not be deleted,有交易的科目不能被删除
 DocType: Vehicle,Last Carbon Check,最后检查炭
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Legal Expenses,法律费用
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +147,Please select quantity on row ,请选择行数量
-apps/erpnext/erpnext/config/accounts.py +283,Make Opening Sales and Purchase Invoices,打开销售和购买发票
-DocType: Purchase Invoice,Posting Time,发布时间
+apps/erpnext/erpnext/config/accounts.py +283,Make Opening Sales and Purchase Invoices,打开销售和采购发票
+DocType: Purchase Invoice,Posting Time,记帐时间
 DocType: Timesheet,% Amount Billed,（％）金额帐单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +125,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 +141,No Item with Serial No {0},没有序列号为{0}的品目
+apps/erpnext/erpnext/stock/get_item_details.py +141,No Item with Serial No {0},没有序列号为{0}的物料
 DocType: Email Digest,Open Notifications,打开通知
 DocType: Payment Entry,Difference Amount (Company Currency),差异金额（公司币种）
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Direct Expenses,直接开支
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Direct Expenses,直接费用
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,新客户收入
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Travel Expenses,差旅费
 DocType: Maintenance Visit,Breakdown,细目
@@ -5262,7 +5256,7 @@
 DocType: Bank Statement Transaction Settings Item,Bank Data,银行数据
 DocType: Purchase Receipt Item,Sample Quantity,样品数量
 DocType: Bank Guarantee,Name of Beneficiary,受益人姓名
-DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",通过后台排程程序基于最新的存货估价/价格表单价/最近的原材料采购单价自动更新BOM成本。
+DocType: Manufacturing Settings,"Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",通过后台排程程序基于最新的存货评估价/价格清单单价/最近的原材料采购单价自动更新BOM成本。
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 apps/erpnext/erpnext/setup/doctype/company/company.js +126,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
@@ -5273,10 +5267,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +103,Probation,缓刑
 DocType: Program Enrollment Tool,New Academic Year,新学年
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +855,Return / Credit Note,退货/退款单
-DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
+DocType: Stock Settings,Auto insert Price List rate if missing,如果价格清单中不存在该单价则自动插入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +130,Total Paid Amount,总支付金额
 DocType: GST Settings,B2C Limit,B2C限制
-DocType: Work Order Item,Transferred Qty,转让数量
+DocType: Work Order Item,Transferred Qty,已发料数量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,导航
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +164,Planning,规划
 DocType: Contract,Signee,签署人
@@ -5284,24 +5278,24 @@
 DocType: Loan,Repayment Start Date,还款开始日期
 apps/erpnext/erpnext/education/doctype/student/student_dashboard.py +14,Student Activity,学生活动
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +80,Supplier Id,供应商编号
-DocType: Payment Request,Payment Gateway Details,支付网关详情
+DocType: Payment Request,Payment Gateway Details,支付网关信息
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +276,Quantity should be greater than 0,量应大于0
 DocType: Journal Entry,Cash Entry,现金分录
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子节点可以在&#39;集团&#39;类型的节点上创建
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子节点只可创建在群组类节点下
 DocType: Attendance Request,Half Day Date,半天日期
 DocType: Academic Year,Academic Year Name,学年名称
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1135,{0} not allowed to transact with {1}. Please change the Company.,不允许{0}与{1}进行交易。请更改公司。
 DocType: Sales Partner,Contact Desc,联系人倒序
-DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报告。
+DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报表。
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +288,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +11,Available Leaves,可用的叶子
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +288,Please set default account in Expense Claim Type {0},请为报销类型设置默认科目{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html +11,Available Leaves,可用休假天数
 DocType: Assessment Result,Student Name,学生姓名
-DocType: Brand,Item Manager,项目经理
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Payroll Payable,应付职工薪酬
+DocType: Brand,Item Manager,物料经理
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +150,Payroll Payable,应付职工薪资
 DocType: Plant Analysis,Collection Datetime,收集日期时间
 DocType: Work Order,Total Operating Cost,总营运成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Note: Item {0} entered multiple times,注意：品目{0}已多次输入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +173,Note: Item {0} entered multiple times,注意：物料{0}已多次输入
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,所有联系人。
 DocType: Accounting Period,Closed Documents,关闭的文件
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Company Abbreviation,公司缩写
@@ -5310,9 +5304,9 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +34,Date of Commencement should be greater than Date of Incorporation,开始日期应大于公司注册日期
 DocType: Contract,Signed On,签名
 DocType: Bank Statement Transaction Invoice Item,Party Type,往来单位类型
-DocType: Payment Schedule,Payment Schedule,付款时间表
+DocType: Payment Schedule,Payment Schedule,付款工时单
 DocType: Item Attribute Value,Abbreviation,缩写
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,付款记录已存在
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +195,Payment Entry already exists,付款凭证已存在
 DocType: Subscription,Trial Period End Date,试用期结束日期
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允许，因为{0}超出范围
 DocType: Serial No,Asset Status,资产状态
@@ -5322,8 +5316,8 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,购物车设置税收规则
 DocType: Purchase Invoice,Taxes and Charges Added,已添加的税费
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +214,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折旧行{0}：下一个折旧日期不能在可供使用的日期之前
-,Sales Funnel,销售管道
-apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,缩写是强制性的
+,Sales Funnel,销售漏斗
+apps/erpnext/erpnext/setup/doctype/company/company.py +53,Abbreviation is mandatory,缩写字段必填
 DocType: Project,Task Progress,任务进度
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,购物车
 DocType: Certified Consultant,GitHub ID,GitHub ID
@@ -5337,28 +5331,28 @@
 DocType: Attendance Request,On Duty,值班
 apps/erpnext/erpnext/controllers/accounts_controller.py +816,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0}是必填项。{1}和{2}的货币转换记录可能还未生成。
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py +51,Staffing Plan {0} already exist for designation {1},已存在人员配置计划{0}以用于指定{1}
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,税务模板是强制性的。
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +46,Tax Template is mandatory.,税务模板字段必填。
 apps/erpnext/erpnext/accounts/doctype/account/account.py +46,Account {0}: Parent account {1} does not exist,科目{0}的上级科目{1}不存在
 DocType: POS Closing Voucher,Period Start Date,期间开始日期
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格列表费率（公司货币）
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),价格清单单价（公司货币）
 DocType: Products Settings,Products Settings,产品设置
-,Item Price Stock,项目价格股票
+,Item Price Stock,物料价格与库存
 DocType: Lab Prescription,Test Created,测试已创建
 DocType: Healthcare Settings,Custom Signature in Print,自定义签名打印
 DocType: Account,Temporary,临时
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,客户LPO号
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +120,Customer LPO No.,客户采购订单号
 DocType: Program,Courses,培训班
 DocType: Monthly Distribution Percentage,Percentage Allocation,核销百分比
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +116,Secretary,秘书
 apps/erpnext/erpnext/regional/india/utils.py +175,House rented dates required for exemption calculation,房子租用日期计算免责
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在词”字段不会在任何交易可见
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +29,This action will stop future billing. Are you sure you want to cancel this subscription?,此操作将停止未来的结算。您确定要取消此订阅吗？
-DocType: Serial No,Distinct unit of an Item,品目的属性
+DocType: Serial No,Distinct unit of an Item,物料的属性
 DocType: Supplier Scorecard Criteria,Criteria Name,标准名称
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +1364,Please set Company,请设公司
 DocType: Pricing Rule,Buying,采购
 apps/erpnext/erpnext/config/agriculture.py +24,Diseases & Fertilizers,疾病与肥料
-DocType: HR Settings,Employee Records to be created by,雇员记录创建于
+DocType: HR Settings,Employee Records to be created by,员工记录由谁创建
 DocType: Patient,AB Negative,AB阴性
 DocType: Sample Collection,SMPL-,SMPL-
 DocType: POS Profile,Apply Discount On,申请折扣
@@ -5366,12 +5360,12 @@
 ,Reqd By Date,需求日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Creditors,债权人
 DocType: Assessment Plan,Assessment Name,评估名称
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +101,Show PDC in Print,在打印中显示PDC
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +101,Show PDC in Print,在打印中显示部分支付
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,行＃{0}：序列号是必需的
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,项目特定的税项详情
+DocType: Purchase Taxes and Charges,Item Wise Tax Detail,物料税/费信息
 DocType: Employee Onboarding,Job Offer,工作机会
 apps/erpnext/erpnext/public/js/setup_wizard.js +71,Institute Abbreviation,机构缩写
-,Item-wise Price List Rate,逐项价目表率
+,Item-wise Price List Rate,物料价格清单单价
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1106,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/utilities/transaction_base.py +158,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
@@ -5380,14 +5374,14 @@
 DocType: Selling Settings,Each Transaction,每笔交易
 DocType: Consultation,C-,C-
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +508,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +508,Barcode {0} already used in Item {1},条码{0}已被物料{1}使用
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
 DocType: Hotel Room,Extra Bed Capacity,加床容量
 DocType: Item,Opening Stock,期初库存
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客户是必须项
 DocType: Lab Test,Result Date,结果日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +100,PDC/LC Date,PDC / LC日期
-DocType: Purchase Order,To Receive,接受
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +100,PDC/LC Date,部分支付日期
+DocType: Purchase Order,To Receive,等收货
 DocType: Leave Period,Holiday List for Optional Leave,可选假期的假期列表
 apps/erpnext/erpnext/utilities/user_progress.py +252,user@example.com,user@example.com
 DocType: Asset,Asset Owner,资产所有者
@@ -5400,19 +5394,19 @@
 DocType: Work Order Operation,"in Minutes
 Updated via 'Time Log'",单位为分钟，通过“时间日志”更新
 DocType: Customer,From Lead,来自潜在客户
-apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
-apps/erpnext/erpnext/public/js/account_tree_grid.js +65,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +594,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,工单已审批可开始生产。
+apps/erpnext/erpnext/public/js/account_tree_grid.js +65,Select Fiscal Year...,选择财务年度...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +594,POS Profile required to make POS Entry,请创建POS配置记录
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +15,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",忠诚度积分将根据所花费的完成量（通过销售发票）计算得出。
 DocType: Program Enrollment Tool,Enroll Students,招生
 DocType: Company,HRA Settings,HRA设置
-DocType: Employee Transfer,Transfer Date,转移日期
+DocType: Employee Transfer,Transfer Date,变动日期
 DocType: Lab Test,Approved Date,批准日期
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,标准销售
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +206,Atleast one warehouse is mandatory,必须选择至少一个仓库
 DocType: Certification Application,Certification Status,认证状态
 apps/erpnext/erpnext/public/js/hub/hub_listing.js +355,Marketplace,市井
-DocType: Travel Itinerary,Travel Advance Required,需要旅行预付款
+DocType: Travel Itinerary,Travel Advance Required,需预支出差费用
 DocType: Subscriber,Subscriber Name,订户名称
 DocType: Serial No,Out of Warranty,超出保修期
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,映射数据类型
@@ -5422,21 +5416,21 @@
 DocType: Antibiotic,Laboratory User,实验室用户
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,项目名称
-DocType: Customer,Mention if non-standard receivable account,提到如果不规范应收账款
+DocType: Customer,Mention if non-standard receivable account,如需记账到非标准应收账款科目
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +60,Please add the remaining benefits {0} to any of the existing component,请将其余好处{0}添加到任何现有组件
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Bank Statement Transaction Entry,Matching Invoices,匹配发票
-DocType: Work Order,Required Items,所需物品
+DocType: Work Order,Required Items,所需物料
 DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
 apps/erpnext/erpnext/config/learn.py +229,Human Resource,人力资源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款对账
 DocType: Disease,Treatment Task,治疗任务
-DocType: Purchase Order Item,Blanket Order,总订单
+DocType: Purchase Order Item,Blanket Order,框架订单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +39,Tax Assets,所得税资产
 apps/erpnext/erpnext/regional/india/utils.py +184,House rent paid days overlap with {0},房租支付天数与{0}重叠
 DocType: BOM Item,BOM No,BOM编号
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Journal Entry {0} does not have account {1} or already matched against other voucher,日记帐分录{0}没有科目{1}或已经匹配其他凭证
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Journal Entry {0} does not have account {1} or already matched against other voucher,手工凭证{0}没有科目{1}或已经匹配其他凭证
 DocType: Item,Moving Average,移动平均
 DocType: BOM Update Tool,The BOM which will be replaced,此物料清单将被替换
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Electronic Equipments,电子设备
@@ -5446,10 +5440,10 @@
 DocType: Work Order,Operation Cost,运营成本
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +45,Outstanding Amt,未付金额
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为销售人员设置品次群组特定的目标
-DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
+DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结超出此天数的库存
 DocType: Asset Maintenance Team,Maintenance Team Name,维护组名称
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则，则会应用优先级别。优先权是一个介于0到20的数字，默认值是零（或留空）。数字越大，意味着优先级别越高。
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,如果选择“机会来源”作为客户，则客户是强制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则，则会用优先级来区分。优先级是一个介于0到20的数字，默认值是零（或留空）。数字越大，意味着优先级别越高。
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +197,Customer is mandatory if 'Opportunity From' is selected as Customer,如果选择“机会来源”作为客户，则客户字段必填
 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.,允许以下用户批准在禁离日请假的申请。
@@ -5468,10 +5462,10 @@
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,累计折旧额
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +42,Private Equity,私募股权投资
 DocType: Supplier Scorecard Variable,Supplier Scorecard Variable,供应商记分卡变数
-apps/erpnext/erpnext/assets/doctype/asset/asset.py +75,Please create purchase receipt or purchase invoice for the item {0},请为项目{0}创建购买收据或购买发票
+apps/erpnext/erpnext/assets/doctype/asset/asset.py +75,Please create purchase receipt or purchase invoice for the item {0},请为物料{0}创建采购收货或采购发票
 DocType: Employee Advance,Due Advance Amount,到期金额
 DocType: Maintenance Visit,Customer Feedback,客户反馈
-DocType: Account,Expense,开支
+DocType: Account,Expense,费用
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.js +54,Score cannot be greater than Maximum Score,分数不能超过最高得分更大
 DocType: Support Search Source,Source Type,来源类型
 apps/erpnext/erpnext/utilities/user_progress.py +129,Customers and Suppliers,客户和供应商
@@ -5488,31 +5482,31 @@
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +54,Jobs,工作
 ,Sales Order Trends,销售订单趋势
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,The 'From Package No.' field must neither be empty nor it's value less than 1.,“From Package No.”字段不能为空，也不能小于1。
-DocType: Employee,Held On,举行日期
-apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +36,Production Item,生产项目
-,Employee Information,雇员资料
+DocType: Employee,Held On,日期
+apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +36,Production Item,生产物料
+,Employee Information,员工资料
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +56,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +942,Make Supplier Quotation,创建供应商报价
-DocType: Quality Inspection,Incoming,接收
+DocType: Quality Inspection,Incoming, 来料检验
 apps/erpnext/erpnext/setup/doctype/company/company.js +90,Default tax templates for sales and purchase are created.,销售和采购的默认税收模板被创建。
 apps/erpnext/erpnext/education/doctype/assessment_result/assessment_result.py +57,Assessment Result record {0} already exists.,评估结果记录{0}已经存在。
-DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例如：ABCD。#####。如果系列已设置且交易中未提及批号，则将根据此系列创建自动批号。如果您始终想要明确提及此料品的批号，请将此留为空白。注意：此设置将优先于库存设置中的命名系列前缀。
+DocType: Item,"Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",例如：ABCD。#####。如果系列已设置且交易中未输入批号，则将根据此系列创建自动批号。如果您始终想要明确提及此料品的批号，请将此留为空白。注意：此设置将优先于库存设置中的命名系列前缀。
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
-DocType: Contract,Party User,派对用户
+DocType: Contract,Party User,往来单位用户
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py +60,Please set Company filter blank if Group By is 'Company',如果Group By是“Company”，请设置公司过滤器空白
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出席编号系列
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +68,Posting Date cannot be future date,发布日期不能是未来的日期
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置考勤编号系列
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +68,Posting Date cannot be future date,记帐日期不能是未来的日期
 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}
 DocType: Stock Entry,Target Warehouse Address,目标仓库地址
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +89,Casual Leave,事假
 DocType: Agriculture Task,End Day,结束的一天
 DocType: Batch,Batch ID,批次ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +412,Note: {0},注： {0}
-,Delivery Note Trends,送货单趋势
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,This Week's Summary,本周的总结
+,Delivery Note Trends,销售出货趋势
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,This Week's Summary,本周总结
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py +22,In Stock Qty,库存量
-,Daily Work Summary Replies,日常工作总结回复
+,Daily Work Summary Replies,每日工作总结回复
 DocType: Delivery Trip,Calculate Estimated Arrival Times,计算预计到达时间
 apps/erpnext/erpnext/accounts/general_ledger.py +113,Account: {0} can only be updated via Stock Transactions,科目{0}只能通过库存处理更新
 DocType: Student Group Creation Tool,Get Courses,获取课程
@@ -5523,33 +5517,33 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +341,Target Location,目标位置
 DocType: Sales Order,Delivery Date,交货日期
 DocType: Opportunity,Opportunity Date,日期机会
-DocType: Employee,Health Insurance Provider,健康保险提供者
-DocType: Purchase Receipt,Return Against Purchase Receipt,回到对外购入库单
+DocType: Employee,Health Insurance Provider,保险公司
+DocType: Purchase Receipt,Return Against Purchase Receipt,基于外购收货退货
 DocType: Water Analysis,Person Responsible,负责人
 DocType: Request for Quotation Item,Request for Quotation Item,询价项目
 DocType: Purchase Order,To Bill,待开票
 DocType: Material Request,% Ordered,%  已排序
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",对于基于课程的学生组，课程将从入学课程中的每个学生确认。
-DocType: Employee Grade,Employee Grade,员工等级
+DocType: Employee Grade,Employee Grade,员工职级
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +106,Piecework,计件工作
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,平均买入价
 DocType: Share Balance,From No,来自No
 DocType: Task,Actual Time (in Hours),实际时间（小时）
-DocType: Employee,History In Company,公司内历史
+DocType: Employee,History In Company,公司内履历
 DocType: Customer,Customer Primary Address,客户主要地址
-apps/erpnext/erpnext/config/learn.py +107,Newsletters,简讯
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,内部通讯
 DocType: Drug Prescription,Description/Strength,说明/力量
 DocType: Bank Statement Transaction Entry,Create New Payment/Journal Entry,创建新的付款/日记账分录
 DocType: Certification Application,Certification Application,认证申请
-DocType: Leave Type,Is Optional Leave,是可选的休假
-DocType: Share Balance,Is Company,是公司
-DocType: Stock Ledger Entry,Stock Ledger Entry,存库分类帐分录
+DocType: Leave Type,Is Optional Leave,是可选休假？
+DocType: Share Balance,Is Company,是公司？
+DocType: Stock Ledger Entry,Stock Ledger Entry,库存分类帐分录
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.js +24,Grant allocations......,拨款分配......
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Same item has been entered multiple times,同一项目已进入多次
-DocType: Department,Leave Block List,禁离日列表
-DocType: Purchase Invoice,Tax ID,税号
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +85,Same item has been entered multiple times,同一物料重复输入了多次（不同的行）
+DocType: Department,Leave Block List,禁止休假日列表
+DocType: Purchase Invoice,Tax ID,纳税登记号
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +195,Item {0} is not setup for Serial Nos. Column must be blank,项目{0}没有启用序列好管理功能，序列号必须留空
-DocType: Accounts Settings,Accounts Settings,账户设置
+DocType: Accounts Settings,Accounts Settings,会计设置
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.js +11,Approve,批准
 DocType: Loyalty Program,Customer Territory,客户地区
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +77,"Malformatted address for {0}, please fix to continue.",格式为{0}的地址格式，请修复以继续。
@@ -5561,34 +5555,34 @@
 ,Project Quantity,工程量
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +79,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有项目为零，可能是你应该“基于分布式费用”改变
 apps/erpnext/erpnext/hr/utils.py +152,To date can not be less than from date,迄今为止不能少于起始日期
-DocType: Opportunity,To Discuss,为了讨论
+DocType: Opportunity,To Discuss,待讨论
 apps/erpnext/erpnext/stock/stock_ledger.py +377,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
 DocType: Loan Type,Rate of Interest (%) Yearly,利息率的比例（％）年
 DocType: Support Settings,Forum URL,论坛URL
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +75,Temporary Accounts,临时账户
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +75,Temporary Accounts,临时科目
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +40,Source Location is required for the asset {0},源位置对资产{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +182,Black,黑
-DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
+DocType: BOM Explosion Item,BOM Explosion Item,BOM展开物料
 DocType: Shareholder,Contact List,联系人列表
 DocType: Account,Auditor,审计员
-DocType: Project,Frequency To Collect Progress,频率收集进展
+DocType: Project,Frequency To Collect Progress,采集进度信息的频率
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +150,{0} items produced,{0}物料已生产
 apps/erpnext/erpnext/utilities/user_progress.py +58,Learn More,学到更多
 DocType: Cheque Print Template,Distance from top edge,从顶边的距离
-DocType: POS Closing Voucher Invoices,Quantity of Items,项目数量
-apps/erpnext/erpnext/stock/get_item_details.py +393,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
+DocType: POS Closing Voucher Invoices,Quantity of Items,物料数量
+apps/erpnext/erpnext/stock/get_item_details.py +393,Price List {0} is disabled or does not exist,价格清单{0}禁用或不存在
 DocType: Purchase Invoice,Return,回报
 DocType: Pricing Rule,Disable,禁用
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +184,Mode of payment is required to make a payment,付款方式需要进行付款
 DocType: Project Task,Pending Review,待审核
 apps/erpnext/erpnext/public/js/utils/item_quick_entry.js +14,"Edit in full page for more options like assets, serial nos, batches etc.",在整页上编辑更多的选项，如资产，序列号，批次等。
-DocType: Leave Type,Maximum Continuous Days Applicable,最大持续天数适用
+DocType: Leave Type,Maximum Continuous Days Applicable,单次最长连续休假天数
 apps/erpnext/erpnext/healthcare/doctype/physician/physician_dashboard.py +10,Appointments and Consultations,预约和咨询
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py +41,{0} - {1} is not enrolled in the Batch {2},{0}  -  {1}未注册批次{2}
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py +115,"Asset {0} cannot be scrapped, as it is already {1}",资产{0}不能被废弃，因为它已经是{1}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +90,Cheques Required,需要检查
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,马克缺席
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,标记为缺勤
 DocType: Job Applicant Source,Job Applicant Source,求职者来源
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +40,Failed to setup company,未能成立公司
 DocType: Asset Repair,Asset Repair,资产修复
@@ -5599,7 +5593,7 @@
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
 apps/erpnext/erpnext/config/hr.py +286,Fleet Management,车队的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1104,Add items from,添加项目..
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +1104,Add items from,从...添加物料
 apps/erpnext/erpnext/config/agriculture.py +7,Crops & Lands,作物和土地
 DocType: Cheque Print Template,Regular,定期
 DocType: Fertilizer,Density (if liquid),密度（如果液体）
@@ -5607,70 +5601,69 @@
 DocType: Purchase Order Item,Last Purchase Rate,最后采购价格
 DocType: Account,Asset,资产
 DocType: Project Task,Task ID,任务ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,品目{0}不能有库存，因为他存在变体
-DocType: Lab Test,Mobile,移动
-,Sales Person-wise Transaction Summary,销售人员特定的交易汇总
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,物料{0}不能有库存，因为他存在变体
+DocType: Lab Test,Mobile,手机号
+,Sales Person-wise Transaction Summary,销售人员业务汇总
 DocType: Training Event,Contact Number,联系电话
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +73,Warehouse {0} does not exist,仓库{0}不存在
 DocType: Employee Tax Exemption Proof Submission Detail,Employee Tax Exemption Proof Submission Detail,员工免税证明提交细节
 DocType: Monthly Distribution,Monthly Distribution Percentages,月度分布比例
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,The selected item cannot have Batch,所选项目不能有批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +115,The selected item cannot have Batch,所选物料不能有批次
 DocType: Delivery Note,% of materials delivered against this Delivery Note,此出货单% 的材料已交货。
 DocType: Asset Maintenance Log,Has Certificate,有证书
 DocType: Project,Customer Details,客户详细信息
 DocType: Asset,Check if Asset requires Preventive Maintenance or Calibration,检查资产是否需要预防性维护或校准
 apps/erpnext/erpnext/public/js/setup_wizard.js +87,Company Abbreviation cannot have more than 5 characters,公司缩写不能超过5个字符
-DocType: Employee,Reports to,报告以
+DocType: Employee,Reports to,上级主管
 ,Unpaid Expense Claim,未付费用报销
-DocType: Payment Entry,Paid Amount,支付的金额
+DocType: Payment Entry,Paid Amount,已付金额
 apps/erpnext/erpnext/utilities/user_progress.py +158,Explore Sales Cycle,探索销售周期
 DocType: Assessment Plan,Supervisor,监
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +918,Retention Stock Entry,保留股票入场
-,Available Stock for Packing Items,库存可用打包品目
-DocType: Item Variant,Item Variant,项目变体
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +918,Retention Stock Entry,留存样品手工库存移动
+,Available Stock for Packing Items,库存可用打包物料
+DocType: Item Variant,Item Variant,物料变体
 ,Work Order Stock Report,工单库存报表
 DocType: Purchase Receipt,Auto Repeat Detail,自动重复细节
 DocType: Assessment Result Tool,Assessment Result Tool,评价结果工具
 apps/erpnext/erpnext/education/doctype/instructor/instructor.js +45,As Supervisor,作为主管
-DocType: Leave Policy Detail,Leave Policy Detail,退出政策细节
+DocType: Leave Policy Detail,Leave Policy Detail,休假政策信息
 apps/erpnext/erpnext/public/js/hub/hub_form.js +381,Suggest Category,建议类别
-DocType: BOM Scrap Item,BOM Scrap Item,BOM项目废料
+DocType: BOM Scrap Item,BOM Scrap Item,BOM废料
 apps/erpnext/erpnext/accounts/page/pos/pos.js +906,Submitted orders can not be deleted,提交的订单不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +116,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",账户余额已设置为'借方'，不能设置为'贷方'
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +325,Quality Management,质量管理
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +52,Item {0} has been disabled,物料{0}已被禁用
-DocType: Project,Total Billable Amount (via Timesheets),总计费用金额（通过时间表）
+DocType: Project,Total Billable Amount (via Timesheets),总计费用金额（通过工时单）
 DocType: Agriculture Task,Previous Business Day,前一个营业日
 DocType: Loan,Repay Fixed Amount per Period,偿还每期固定金额
-DocType: Employee,Health Insurance No,健康保险No
+DocType: Employee,Health Insurance No,保单号
 DocType: Employee Tax Exemption Proof Submission,Tax Exemption Proofs,免税证明
-apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},请输入量的项目{0}
+apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},请输入物料{0}数量
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +233,Credit Note Amt,信用证
 apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py +78,Total Taxable Amount,应纳税总额
-DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
+DocType: Employee External Work History,Employee External Work History,员工外部就职经历
 DocType: Opening Invoice Creation Tool,Purchase,采购
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,余额数量
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +37,Balance Qty,结余数量
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,目标不能为空
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.js +15,Enrolling students,招收学生
-DocType: Item Group,Parent Item Group,父项目组
+DocType: Item Group,Parent Item Group,父（上级）物料组
 DocType: Appointment Type,Appointment Type,预约类型
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1}
 DocType: Healthcare Settings,Valid number of days,有效天数
 apps/erpnext/erpnext/setup/doctype/company/company.js +59,Cost Centers,成本中心
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +19,Restart Subscription,重新启动订阅
 DocType: Land Unit,Linked Plant Analysis,链接的工厂分析
-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,供应商的货币转换为公司的本币后的单价
 DocType: Sales Invoice Item,Service End Date,服务结束日期
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},行＃{0}：与排时序冲突{1}
-DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许零估值
-DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许零估值
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允许评估价为0
 DocType: Bank Guarantee,Receiving,接收
 DocType: Training Event Employee,Invited,邀请
-apps/erpnext/erpnext/config/accounts.py +314,Setup Gateway accounts.,设置网关帐户。
-DocType: Employee,Employment Type,就职类型
+apps/erpnext/erpnext/config/accounts.py +314,Setup Gateway accounts.,设置网关科目。
+DocType: Employee,Employment Type,员工类别
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +43,Fixed Assets,固定资产
-DocType: Payment Entry,Set Exchange Gain / Loss,设置兑换收益/损失
-,GST Purchase Register,消费税相关采购台账
+DocType: Payment Entry,Set Exchange Gain / Loss,设置汇兑损益
+,GST Purchase Register,采购台账（GST)
 ,Cash Flow,现金流量表
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py +25,Combined invoice portion must equal 100%,合并发票部分必须等于100％
 DocType: Item Group,Default Expense Account,默认费用科目
@@ -5679,10 +5672,10 @@
 DocType: Employee,Notice (days),通告（天）
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS关闭凭证发票
 DocType: Tax Rule,Sales Tax Template,销售税模板
-DocType: Employee Benefit Application Detail,Pay Against Benefit Claim,支付利益索赔
+DocType: Employee Benefit Application Detail,Pay Against Benefit Claim,支付福利申报
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +21,Update Cost Center Number,更新成本中心编号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2518,Select items to save the invoice,选取要保存发票
-DocType: Employee,Encashment Date,兑现日期
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2518,Select items to save the invoice,选取物料以保存发票
+DocType: Employee,Encashment Date,折现日期
 DocType: Training Event,Internet,互联网
 DocType: Special Test Template,Special Test Template,特殊测试模板
 DocType: Account,Stock Adjustment,库存调整
@@ -5691,103 +5684,102 @@
 DocType: Academic Term,Term Start Date,合同起始日期
 apps/erpnext/erpnext/config/accounts.py +483,List of all share transactions,所有股份交易清单
 DocType: Shopify Settings,Import Sales Invoice from Shopify if Payment is marked,如果付款已标记，则从Shopify导入销售发票
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,机会数量
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py +224,Both Trial Period Start Date and Trial Period End Date must be set,必须设置试用期开始日期和试用期结束日期
 apps/erpnext/erpnext/accounts/report/share_balance/share_balance.py +52,Average Rate,平均率
 apps/erpnext/erpnext/controllers/accounts_controller.py +763,Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total,支付计划中的总付款金额必须等于大/圆
 DocType: Subscription Plan Detail,Plan,计划
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,银行对账单余额按总帐
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,基于总帐的银行对账单余额
 DocType: Job Applicant,Applicant Name,申请人姓名
-DocType: Authorization Rule,Customer / Item Name,客户/项目名称
-DocType: Buying Settings,"If enabled, last purchase details of items will not be fetched from previous purchase order or purchase receipt",如果启用，则上次采购订单或采购收据不会从上次采购详细信息中提取
+DocType: Authorization Rule,Customer / Item Name,客户/物料名称
+DocType: Buying Settings,"If enabled, last purchase details of items will not be fetched from previous purchase order or purchase receipt",如果启用，则上次采购订单或采购收货单不会从上次采购详细信息中提取
 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",将一组物料集合到另外一种物料。如果将物料组合打包/包装，然后维护这个组合后的物料的库存而不是集合物料。包装物料将有一种属性：“库存条目”（取值“否”），或“销售条目”（取值“是”）。例如：你分别销售笔记本电脑和背包，并且如果有顾客购买两种而使用单独的价格，那么笔记本电脑+背包将是一个新的产品包项目。注：物料BOM =Bill of Materials
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},序列号是品目{0}的必须项
+Note: BOM = Bill of Materials",将一组物料集合到另外一种物料。如果将物料组合打包/包装，然后维护这个组合后的物料的库存而不是集合物料。包装物料将有一种属性：“库存条目”（取值“否”），或“销售条目”（取值“是”）。例如：你分别销售笔记本电脑和背包，并且如果有顾客采购两种而使用单独的价格，那么笔记本电脑+背包将是一个新的产品包项目。注：物料BOM =Bill of Materials
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},序列号是物料{0}的必须项
 DocType: Item Variant Attribute,Attribute,属性
 DocType: Staffing Plan Detail,Current Count,当前计数
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,请从指定/至范围
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js +28,Opening {0} Invoice created,打开{0}已创建发票
 DocType: Serial No,Under AMC,在年度保养合同中
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,项目的评估价格将基于到岸成本凭证金额重新计算
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,物料评估价将基于到岸成本凭证金额重新计算
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,销售业务的默认设置。
 DocType: Guardian,Guardian Of ,守护者
 DocType: Tax Withholding Category,Threshold,阈
 DocType: BOM Update Tool,Current BOM,当前BOM
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +32,Balance (Dr - Cr),平衡（Dr  -  Cr）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +32,Balance (Dr - Cr),结余（Dr  -  Cr）
 apps/erpnext/erpnext/public/js/utils.js +56,Add Serial No,添加序列号
 DocType: Work Order Item,Available Qty at Source Warehouse,源仓库可用数量
 apps/erpnext/erpnext/config/support.py +22,Warranty,质量保证
 DocType: Purchase Invoice,Debit Note Issued,借记发行说明
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +50,Filter based on Cost Center is only applicable if Budget Against is selected as Cost Center,基于成本中心的过滤仅适用于选择Budget Against作为成本中心的情况
-apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1181,"Search by item code, serial number, batch no or barcode",按项目代码，序列号，批号或条码进行搜索
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +1181,"Search by item code, serial number, batch no or barcode",按物料代码，序列号，批号或条码进行搜索
 DocType: Work Order,Warehouses,仓库
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py +19,{0} asset cannot be transferred,{0}资产不得转让
 DocType: Hotel Room Pricing,Hotel Room Pricing,酒店房间价格
 DocType: Subscription,Days Until Due,天至期限
-apps/erpnext/erpnext/stock/doctype/item/item.js +82,This Item is a Variant of {0} (Template).,此项目是{0}（模板）的变体。
+apps/erpnext/erpnext/stock/doctype/item/item.js +82,This Item is a Variant of {0} (Template).,此物料是模板物料{0}的一个变体。
 DocType: Workstation,per hour,每小时
-DocType: Blanket Order,Purchasing,购买
+DocType: Blanket Order,Purchasing,采购
 DocType: Announcement,Announcement,公告
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +107,Customer LPO,客户LPO
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +107,Customer LPO,客户采购订单号
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",对于基于批次的学生组，学生批次将由课程注册中的每位学生进行验证。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +50,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Distribution,分配
 DocType: Journal Entry Account,Loan,贷款
-DocType: Expense Claim Advance,Expense Claim Advance,费用索赔预付款
-DocType: Lab Test,Report Preference,报告偏好
+DocType: Expense Claim Advance,Expense Claim Advance,费用报销预付款
+DocType: Lab Test,Report Preference,报表偏好
 apps/erpnext/erpnext/config/non_profit.py +43,Volunteer information.,志愿者信息。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +121,Project Manager,项目经理
 ,Quoted Item Comparison,项目报价比较
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +34,Overlap in scoring between {0} and {1},{0}和{1}之间的得分重叠
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +321,Dispatch,调度
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +75,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +75,Max discount allowed for item: {0} is {1}%,物料{0}的最大折扣为 {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +191,Net Asset value as on,净资产值作为
 DocType: Crop,Produce,生产
 DocType: Hotel Settings,Default Taxes and Charges,默认税费
 DocType: Account,Receivable,应收账款
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +315,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
-DocType: Stock Entry,Material Consumption for Manufacture,材料消耗制造
-DocType: Item Alternative,Alternative Item Code,替代项目代码
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1037,Select Items to Manufacture,选择项目，以制造
+DocType: Stock Entry,Material Consumption for Manufacture,出库-生产
+DocType: Item Alternative,Alternative Item Code,替代物料代码
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,允许提交超过设定信用额度的交易的角色。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1037,Select Items to Manufacture,选择待生产物料
 DocType: Delivery Stop,Delivery Stop,交付停止
 apps/erpnext/erpnext/accounts/page/pos/pos.js +974,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
 DocType: Item,Material Issue,发料
 DocType: Employee Education,Qualification,学历
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +50,View Salary Slips,查看工资单
-DocType: Item Price,Item Price,项目价格
+DocType: Item Price,Item Price,物料价格
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
-DocType: BOM,Show Items,显示项目
+DocType: BOM,Show Items,显示物料
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,从时间不能超过结束时间大。
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +100,Do you want to notify all the customers by email?,你想通过电子邮件通知所有的客户？
 DocType: Subscription Plan,Billing Interval,计费间隔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +36,Motion Picture & Video,影视业
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,订购
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已下单
 DocType: Hub Settings,Hub Username,Hub用户名
-DocType: Salary Detail,Component,零件
+DocType: Salary Detail,Component,薪资构成
 apps/erpnext/erpnext/assets/doctype/asset_category/asset_category.py +16,Row {0}: {1} must be greater than 0,行{0}：{1}必须大于0
 DocType: Assessment Criteria,Assessment Criteria Group,评估标准组
 DocType: Healthcare Settings,Patient Name By,病人姓名By
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +267,Accrual Journal Entry for salaries from {0} to {1},从{0}到{1}的薪金的应计日记帐分录
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +267,Accrual Journal Entry for salaries from {0} to {1},从{0}到{1}的薪金的应计手工凭证
 DocType: Sales Invoice Item,Enable Deferred Revenue,启用延期收入
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +193,Opening Accumulated Depreciation must be less than equal to {0},打开累计折旧必须小于等于{0}
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,请输入角色核准或审批用户
-DocType: Journal Entry,Write Off Entry,核销分录
+DocType: Journal Entry,Write Off Entry,销帐分录
 DocType: BOM,Rate Of Materials Based On,基于以下的物料单价
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,客户支持分析
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +102,Uncheck all,取消所有
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +102,Uncheck all,取消全选
 DocType: POS Profile,Terms and Conditions,条款和条件
 DocType: Asset,Booked Fixed Asset,预订的固定资产
-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",在这里，你可以保持身高，体重，过敏，医疗问题等
+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/work_order/work_order.py +246,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
 DocType: Loan,Disbursement Date,支付日期
@@ -5797,69 +5789,68 @@
 DocType: Purchase Invoice,In Words,大写金额
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py +21,Enter the name of the bank or lending institution before submittting.,在提交之前输入银行或贷款机构的名称。
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +15,{0} must be submitted,必须提交{0}
-DocType: POS Profile,Item Groups,项目组
+DocType: POS Profile,Item Groups,物料组
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Today is {0}'s birthday!,今天是{0}的生日！
-DocType: Sales Order Item,For Production,对生产
+DocType: Sales Order Item,For Production,生产
 DocType: Payment Request,payment_url,payment_url
-DocType: Exchange Rate Revaluation Account,Balance In Account Currency,账户货币余额
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,请在会计科目表中添加一个临时开户账户
+DocType: Exchange Rate Revaluation Account,Balance In Account Currency,科目币别余额
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +192,Please add a Temporary Opening account in Chart of Accounts,请在会计科目表中添加一个临时开帐科目
 DocType: Customer,Customer Primary Contact,客户主要联系人
 DocType: Project Task,View Task,查看任务
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,机会 / 线索％
 DocType: Bank Guarantee,Bank Account Info,银行账户信息
 DocType: Bank Guarantee,Bank Guarantee Type,银行担保类型
 DocType: Material Request,MREQ-,MREQ-
-DocType: Payment Schedule,Invoice Portion,发票部分
-,Asset Depreciations and Balances,资产折旧和平衡
+DocType: Payment Schedule,Invoice Portion,发票占比
+,Asset Depreciations and Balances,资产折旧和余额
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +372,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/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财务年度为默认值，点击“设为默认”
 DocType: Production Plan,Include Subcontracted Items,包括转包物料
 apps/erpnext/erpnext/projects/doctype/project/project.py +260,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +21,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +750,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +750,Item variant {0} exists with same attributes,相同属性物料变体{0}已存在
 DocType: Loan,Repay from Salary,从工资偿还
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +369,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
 DocType: Employee Benefit Claim,Salary Slip,工资单
-DocType: Lead,Lost Quotation,失落的报价
+DocType: Lead,Lost Quotation,输掉的报价
 apps/erpnext/erpnext/utilities/user_progress.py +221,Student Batches,学生批
 DocType: Pricing Rule,Margin Rate or Amount,保证金税率或税额
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,“结束日期”必需设置
-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: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货物料的装箱单，包括包号，内容和重量。
+DocType: Sales Invoice Item,Sales Order Item,销售订单物料
 DocType: Salary Slip,Payment Days,付款天数
 DocType: Stock Settings,Convert Item Description to Clean HTML,将项目描述转换为清理HTML
 DocType: Patient,Dormant,休眠
-DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,扣除未领取雇员福利的税
+DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,代扣未领取员工福利应纳税款
 DocType: Salary Slip,Total Interest Amount,利息总额
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +124,Warehouses with child nodes cannot be converted to ledger,与子节点仓库不能转换为分类账
-DocType: BOM,Manage cost of operations,管理流程成本
-DocType: Accounts Settings,Stale Days,陈旧的日子
+DocType: BOM,Manage cost of operations,管理成本
+DocType: Accounts Settings,Stale Days,信用证有效期天数
 DocType: Travel Itinerary,Arrival Datetime,到达日期时间
 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.",当所选的业务状态更改为“已提交”时，自动打开一个弹出窗口向有关的联系人编写邮件，业务将作为附件添加。用户可以选择发送或者不发送邮件。
 DocType: Tax Rule,Billing Zipcode,计费邮编
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局设置
 DocType: Crop,Row Spacing UOM,行距UOM
 DocType: Assessment Result Detail,Assessment Result Detail,评价结果详细
-DocType: Employee Education,Employee Education,雇员教育
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在项目组表中找到重复的项目组
+DocType: Employee Education,Employee Education,员工教育
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +53,Duplicate item group found in the item group table,在物料组中有重复物料组
 DocType: Land Unit,Parent Land Unit,家长土地单位
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1121,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1121,It is needed to fetch Item Details.,需要获取物料详细信息。
 DocType: Fertilizer,Fertilizer Name,肥料名称
 DocType: Salary Slip,Net Pay,净支付金额
-DocType: Cash Flow Mapping Accounts,Account,账户
+DocType: Cash Flow Mapping Accounts,Account,科目
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +220,Serial No {0} has already been received,序列号{0}已收到过
-,Requested Items To Be Transferred,要求要传输的项目
+,Requested Items To Be Transferred,已申请待移转物料
 DocType: Expense Claim,Vehicle Log,车辆登录
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded on Actual,累计每月预算超出实际的行动
-DocType: Salary Component,Create Separate Payment Entry Against Benefit Claim,针对福利申请创建单独的付款条目
+DocType: Salary Component,Create Separate Payment Entry Against Benefit Claim,为福利申请创建单独付款凭证
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),发烧（温度&gt; 38.5°C / 101.3°F或持续温度&gt; 38°C / 100.4°F）
-DocType: Customer,Sales Team Details,销售团队详情
+DocType: Customer,Sales Team Details,销售团队信息
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1363,Delete permanently?,永久删除？
-DocType: Expense Claim,Total Claimed Amount,总索赔额
+DocType: Expense Claim,Total Claimed Amount,总申报金额
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
 DocType: Shareholder,Folio no.,Folio no。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +245,Invalid {0},无效的{0}
@@ -5868,17 +5859,17 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +743,are not,不是
 DocType: Delivery Note,Billing Address Name,帐单地址名称
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +22,Department Stores,百货
-,Item Delivery Date,物品交货日期
+,Item Delivery Date,物料交货日期
 DocType: Selling Settings,Sales Update Frequency,销售更新频率
-DocType: Production Plan,Material Requested,要求的材料
+DocType: Production Plan,Material Requested,需求的物料
 DocType: Warehouse,PIN,销
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.py +116,Error '{0}' occured. Arguments {1}.,发生错误“{0}”。参数{1}。
-DocType: Bin,Reserved Qty for sub contract,分包合同的保留数量
+DocType: Bin,Reserved Qty for sub contract,外包预留数量
 DocType: Patient Service Unit,Patinet Service Unit,Patinet服务单位
 DocType: Sales Invoice,Base Change Amount (Company Currency),基地涨跌额（公司币种）
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +309,No accounting entries for the following warehouses,没有以下仓库的会计分录
 apps/erpnext/erpnext/projects/doctype/project/project.js +98,Save the document first.,首先保存文档。
-apps/erpnext/erpnext/shopping_cart/cart.py +74,Only {0} in stock for item {1},物品{1}的库存仅为{0}
+apps/erpnext/erpnext/shopping_cart/cart.py +74,Only {0} in stock for item {1},物料{1}的库存仅为{0}
 DocType: Account,Chargeable,应课
 DocType: Company,Change Abbreviation,更改缩写
 DocType: Contract,Fulfilment Details,履行细节
@@ -5896,30 +5887,30 @@
 DocType: Delivery Stop,Email Sent To,电子邮件发送给
 DocType: Budget,Warn,警告
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.js +107,Are you sure you want to unregister?,你确定要取消注册？
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +945,All items have already been transferred for this Work Order.,所有项目已经为此工作单转移。
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +945,All items have already been transferred for this Work Order.,所有物料已发料到该工单。
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论，值得一提的努力，应该在记录中。
 DocType: Asset Maintenance,Manufacturing User,生产用户
-DocType: Purchase Invoice,Raw Materials Supplied,供应的原料
-DocType: Shopping Cart Settings,Enable purchase of items via the website,通过网站启用购买项目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},价目表{0}的货币必须是{1}或{2}
+DocType: Purchase Invoice,Raw Materials Supplied,发给供应商的原材料
+DocType: Shopping Cart Settings,Enable purchase of items via the website,通过网站启用采购项目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +282,Currency of the price list {0} must be {1} or {2},价格清单{0}的货币必须是{1}或{2}
 DocType: Appraisal,Appraisal Template,评估模板
 DocType: Soil Texture,Ternary Plot,三元剧情
-DocType: Item Group,Item Classification,项目分类
+DocType: Item Group,Item Classification,物料分类
 DocType: Driver,License Number,许可证号
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +119,Business Development Manager,业务发展经理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,维护访问目的
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js +19,Invoice Patient Registration,发票患者登记
 DocType: Crop,Period,期
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +27,General Ledger,总帐
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,Employee {0} on Leave on {1},雇员{0}在{1}正在休假
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,Employee {0} on Leave on {1},员工{0}{1}正在休假
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看（销售）线索
 DocType: Program Enrollment Tool,New Program,新程序
 DocType: Item Attribute Value,Attribute Value,属性值
 DocType: POS Closing Voucher Details,Expected Amount,预期金额
-,Itemwise Recommended Reorder Level,项目特定的推荐重订购级别
-apps/erpnext/erpnext/hr/utils.py +211,Employee {0} of grade {1} have no default leave policy,{1}级员工{0}没有默认离开政策
-DocType: Salary Detail,Salary Detail,薪酬详细
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,请选择{0}第一
+,Itemwise Recommended Reorder Level,建议的物料重订货点
+apps/erpnext/erpnext/hr/utils.py +211,Employee {0} of grade {1} have no default leave policy,{1}职级员工{0}没有默认休假政策
+DocType: Salary Detail,Salary Detail,薪资详细
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1072,Please select {0} first,请先选择{0}
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js +21,"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent",在多层程序的情况下，客户将根据其花费自动分配到相关层
 DocType: Appointment Type,Physician,医师
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +1026,Batch {0} of Item {1} has expired.,物料{1}的批号{0} 已过期。
@@ -5928,21 +5919,21 @@
 DocType: Sales Invoice,Commission,佣金
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +200,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0}（{1}）不能大于工单{3}中的计划数量（{2}）
 DocType: Certification Application,Name of Applicant,申请人名称
-apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,时间表制造。
+apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,工时单制造。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小计
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,股票交易后不能更改Variant属性。你将不得不做一个新的项目来做到这一点。
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,存货业务发生后不能更改变体物料的属性。需要新建新物料。
 apps/erpnext/erpnext/config/erpnext_integrations.py +18,GoCardless SEPA Mandate,GoCardless SEPA授权
 DocType: Physician,Charges,收费
-DocType: Production Plan,Get Items For Work Order,获取工作订单的物品
+DocType: Production Plan,Get Items For Work Order,为工单获取物料
 DocType: Salary Detail,Default Amount,默认金额
 DocType: Lab Test Template,Descriptive,描述的
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,仓库在系统中未找到
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,This Month's Summary,本月摘要
-DocType: Quality Inspection Reading,Quality Inspection Reading,质量检验报告
+DocType: Quality Inspection Reading,Quality Inspection Reading,质量检验报表
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
-DocType: Tax Rule,Purchase Tax Template,购置税模板
+DocType: Tax Rule,Purchase Tax Template,进项税模板
 apps/erpnext/erpnext/utilities/user_progress.py +48,Set a sales goal you'd like to achieve for your company.,为您的公司设定您想要实现的销售目标。
-,Project wise Stock Tracking,项目明智的库存跟踪
+,Project wise Stock Tracking,项目级库存追踪
 DocType: GST HSN Code,Regional,区域性
 apps/erpnext/erpnext/config/healthcare.py +45,Laboratory,实验室
 DocType: UOM Category,UOM Category,UOM类别
@@ -5962,41 +5953,41 @@
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +472,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 DocType: Support Search Source,Post Route String,邮政路线字符串
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,仓库是强制性的
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,仓库信息必填
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +72,Failed to create website,无法创建网站
 DocType: Soil Analysis,Mg/K,镁/ K
-DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +973,Retention Stock Entry already created or Sample Quantity not provided,已创建保留库存条目或未提供“样品数量”
+DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算信息
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +973,Retention Stock Entry already created or Sample Quantity not provided,留存样品手工库存移动已创建或未提供“样品数量”
 DocType: Program,Program Abbreviation,计划缩写
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,费用会在每个物料的采购收货单中更新
 DocType: Warranty Claim,Resolved By,议决
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正确清除
+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 +48,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
-DocType: Purchase Invoice Item,Price List Rate,价格列表费率
+DocType: Purchase Invoice Item,Price List Rate,价格清单单价
 apps/erpnext/erpnext/utilities/activation.py +72,Create customer quotes,创建客户报价
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),物料清单(BOM)
-DocType: Item,Average time taken by the supplier to deliver,采取供应商的平均时间交付
+DocType: Item,Average time taken by the supplier to deliver,供应商交货时间的平均值
 DocType: Travel Itinerary,Check-in Date,入住日期
 DocType: Sample Collection,Collected By,收藏者
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.js +35,Assessment Result,评价结果
 DocType: Hotel Room Package,Hotel Room Package,酒店客房配套
-DocType: Employee Transfer,Employee Transfer,员工转移
+DocType: Employee Transfer,Employee Transfer,员工变动
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小时
 DocType: Project,Expected Start Date,预计开始日期
 DocType: Purchase Invoice,04-Correction in Invoice,04-发票纠正
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1010,Work Order already created for all items with BOM,已经为包含物料清单的所有料品创建工单
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant Details Report,变体详细信息报告
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant Details Report,变体详细信息报表
 DocType: Setup Progress Action,Setup Progress Action,设置进度动作
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,买价格表
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,删除项目，如果收费并不适用于该项目
+apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py +42,Buying Price List,采购价格清单
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,如果费用不适用某物料，请删除它
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js +9,Cancel Subscription,取消订阅
 apps/erpnext/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +21,Please select Maintenance Status as Completed or remove Completion Date,请选择维护状态为已完成或删除完成日期
 DocType: Supplier,Default Payment Terms Template,默认付款条款模板
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +34,Transaction currency must be same as Payment Gateway currency,交易货币必须与支付网关货币
-DocType: Payment Entry,Receive,接受
+DocType: Payment Entry,Receive,收款
 DocType: Employee Benefit Application Detail,Earning Component,收入组件
-apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,语录：
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,报价：
 DocType: Contract,Partially Fulfilled,部分实现
 DocType: Maintenance Visit,Fully Completed,全部完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％已完成
@@ -6004,15 +5995,15 @@
 DocType: Workstation,Operating Costs,运营成本
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +484,Currency for {0} must be {1},货币{0}必须{1}
 DocType: Asset,Disposal Date,处置日期
-DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",电子邮件将在指定的时间发送给公司的所有在职职工，如果他们没有假期。回复摘要将在午夜被发送。
-DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
-apps/erpnext/erpnext/stock/doctype/item/item.py +526,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
+DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",电子邮件将在指定的时间发送给公司的所有在职员工，如果他们没有假期。回复摘要将在午夜被发送。
+DocType: Employee Leave Approver,Employee Leave Approver,员工休假审批者
+apps/erpnext/erpnext/stock/doctype/item/item.py +526,Row {0}: An Reorder entry already exists for this warehouse {1},第{0}行：仓库{1}中已存在重订货记录
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +99,"Cannot declare as lost, because Quotation has been made.",已有报价的情况下，不能更改状态为输。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,CWIP Account,CWIP账户
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +16,Training Feedback,培训反馈
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,供应商记分卡标准
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
-apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},当然是行强制性{0}
+apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py +55,Course is mandatory in row {0},第{0}行中的课程信息必填
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc的DocType
 DocType: Cash Flow Mapper,Section Footer,章节页脚
@@ -6021,21 +6012,21 @@
 DocType: Batch,Parent Batch,父母批
 DocType: Batch,Parent Batch,父母批
 DocType: Cheque Print Template,Cheque Print Template,支票打印模板
-DocType: Salary Component,Is Flexible Benefit,是灵活的好处
+DocType: Salary Component,Is Flexible Benefit,是弹性福利？
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +85,Chart of Cost Centers,成本中心表
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,在取消订阅或将订阅标记为未付之前，发票日期之后的天数已过
 DocType: Clinical Procedure Template,Sample Collection,样品收集
-,Requested Items To Be Ordered,要求项目要订购
+,Requested Items To Be Ordered,已申请待采购物料
 DocType: Price List,Price List Name,价格列表名称
 DocType: Blanket Order,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 +150,Something went wrong!,发现错误！
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +181,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
 DocType: Bank Statement Settings,Transaction Data Mapping,交易数据映射
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +277,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
-DocType: Salary Component,Is Tax Applicable,是否适用税务？
+DocType: Salary Component,Is Tax Applicable,是应纳税所得？
 DocType: Supplier Scorecard Scoring Criteria,Score,得分了
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,会计年度{0}不存在
 DocType: Asset Maintenance Log,Completion Date,完成日期
@@ -6048,39 +6039,39 @@
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.js +91,Stock quantity to start procedure is not available in the warehouse. Do you want to record a Stock Transfer,仓库中不提供开始操作的库存数量。你想记录股票转移吗？
 DocType: Shipping Rule,Shipping Rule Type,运输规则类型
 apps/erpnext/erpnext/utilities/user_progress.py +239,Go to Rooms,去房间
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +257,"Company, Payment Account, From Date and To Date is mandatory",公司，付款帐户，从日期和日期是强制性的
-DocType: Company,Budget Detail,预算详情
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js +257,"Company, Payment Account, From Date and To Date is mandatory",公司，付款科目，开始日期和截止日期字段都是必填的
+DocType: Company,Budget Detail,预算信息
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在发送前，请填写留言
 DocType: Purchase Invoice,DUPLICATE FOR SUPPLIER,供应商重复
-DocType: Email Digest,Pending Quotations,待语录
+DocType: Email Digest,Pending Quotations,待处理报价
 DocType: Asset,Custodian,保管人
-apps/erpnext/erpnext/config/accounts.py +324,Point-of-Sale Profile,简介销售点的
+apps/erpnext/erpnext/config/accounts.py +324,Point-of-Sale Profile,POS配置
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py +25,{0} should be a value between 0 and 100,{0}应该是0到100之间的一个值
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +366,Payment of {0} from {1} to {2},从{1}到{2}的{0}付款
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Unsecured Loans,无担保贷款
 DocType: Cost Center,Cost Center Name,成本中心名称
 DocType: Student,B+,B +
-DocType: HR Settings,Max working hours against Timesheet,最大工作时间针对时间表
+DocType: HR Settings,Max working hours against Timesheet,工时单允许最长工作时间
 DocType: Maintenance Schedule Detail,Scheduled Date,计划日期
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +232,Total Paid Amt,数金额金额
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,大于160个字符的消息将被分割为多条消息
 DocType: Purchase Receipt Item,Received and Accepted,收到并接受
 DocType: Hub Settings,Company and Seller Profile,公司和卖方简介
 ,GST Itemised Sales Register,消费税商品销售登记册
-DocType: Staffing Plan,Staffing Plan Details,人员配置计划详情
+DocType: Staffing Plan,Staffing Plan Details,人员配置计划信息
 DocType: Soil Texture,Silt Loam,淤泥粘土
 ,Serial No Service Contract Expiry,序列号/年度保养合同过期
-DocType: Employee Health Insurance,Employee Health Insurance,员工健康保险
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +331,You cannot credit and debit same account at the same time,您不可以将一个账户同时设置为借方和贷方。
+DocType: Employee Health Insurance,Employee Health Insurance,员工医保
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +331,You cannot credit and debit same account at the same time,一个科目不可以同时为借方和贷方。
 DocType: Vital Signs,Adults' pulse rate is anywhere between 50 and 80 beats per minute.,成年人的脉率在每分钟50到80次之间。
 DocType: Naming Series,Help HTML,HTML帮助
 DocType: Student Group Creation Tool,Student Group Creation Tool,学生组创建工具
 DocType: Item,Variant Based On,基于变异对
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +67,Employee {0} already have Leave Allocation {1} for this period,在此期间，员工{0}已经有离职分配{1}
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
-DocType: Loyalty Point Entry,Loyalty Program Tier,忠诚度计划层
+DocType: Loyalty Point Entry,Loyalty Program Tier,忠诚度计划层级
 apps/erpnext/erpnext/utilities/user_progress.py +109,Your Suppliers,您的供应商
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +80,Cannot set as Lost as Sales Order is made.,已有销售订单的情况下，不能更改状态为输。
 DocType: Request for Quotation Item,Supplier Part No,供应商部件号
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +384,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
 apps/erpnext/erpnext/public/js/hub/hub_form.js +197,Anonymous,匿名
@@ -6088,45 +6079,45 @@
 DocType: Lead,Converted,已转换
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +238,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根据购买设置，如果需要购买记录==“是”，则为了创建采购发票，用户需要首先为项目{0}创建采购凭证
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +238,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}",根据采购设置，如果需要采购记录==“是”，则为了创建采购发票，用户需要首先为项目{0}创建采购凭证
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +169,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +211,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物料{1}无法找到
 DocType: Issue,Content Type,内容类型
 DocType: Asset,Assets,资产
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +17,Computer,电脑
-DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此品目
+DocType: Item,List this Item in multiple groups on the website.,在网站上的多个组中显示此物料
 DocType: Subscription,Current Invoice End Date,当前发票结束日期
 DocType: Payment Term,Due Date Based On,到期日基于
-apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,请在“销售设置”中设置默认客户组和领域
+apps/erpnext/erpnext/healthcare/doctype/patient/patient.py +82,Please set default customer group and territory in Selling Settings,请在“销售设置”中设置默认客户组和地域
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +215,{0} {1} does not exist,{0} {1}不存在
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +355,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +355,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许科目与其他货币
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +88,Item: {0} does not exist in the system,项目{0}不存在
 apps/erpnext/erpnext/accounts/doctype/account/account.py +108,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未对帐/结清分录
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,没有为日记帐分录选择还款
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +159,No repayments selected for Journal Entry,没有为手工凭证选择还款
 DocType: Payment Reconciliation,From Invoice Date,从发票日期
 DocType: Loan,Disbursed,支付
 DocType: Healthcare Settings,Laboratory Settings,实验室设置
 DocType: Clinical Procedure,Service Unit,服务单位
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +97,Successfully Set Supplier,成功设置供应商
-DocType: Leave Encashment,Leave Encashment,假期兑现
-apps/erpnext/erpnext/public/js/setup_wizard.js +114,What does it do?,贵公司的标语
+DocType: Leave Encashment,Leave Encashment,休假折现
+apps/erpnext/erpnext/public/js/setup_wizard.js +114,What does it do?,贵公司的做什么
 apps/erpnext/erpnext/agriculture/doctype/crop_cycle/crop_cycle.py +47,Tasks have been created for managing the {0} disease (on row {1}),为管理{0}疾病创建了任务（在第{1}行）
 DocType: Crop,Byproducts,副产品
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +84,To Warehouse,到仓库
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +26,All Student Admissions,所有学生入学
 ,Average Commission Rate,平均佣金率
 DocType: Share Balance,No of Shares,股份数目
-DocType: Taxable Salary Slab,To Amount,金额
-apps/erpnext/erpnext/stock/doctype/item/item.py +464,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+DocType: Taxable Salary Slab,To Amount,金额(止)
+apps/erpnext/erpnext/stock/doctype/item/item.py +464,'Has Serial No' can not be 'Yes' for non-stock item,不能为非库存物料勾选'是否有序列号'
 apps/erpnext/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js +59,Select Status,选择状态
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance can not be marked for future dates,考勤不能标记为未来的日期
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +44,Attendance can not be marked for future dates,考勤不能选未来的日期
 DocType: Support Search Source,Post Description Key,发布说明密钥
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: School House,House Name,房名
 DocType: Fee Schedule,Total Amount per Student,学生总数
-DocType: Purchase Taxes and Charges,Account Head,账户抬头
+DocType: Purchase Taxes and Charges,Account Head,科目
 DocType: Company,HRA Component,HRA组件
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +142,Electrical,电气
 apps/erpnext/erpnext/utilities/activation.py +100,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的组织的其余部分用户。您还可以添加邀请客户到您的门户网站通过从联系人中添加它们
@@ -6141,7 +6132,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +237,Birthday Reminder for {0},{0}的生日提醒
 DocType: Asset Maintenance Task,Last Completion Date,最后完成日期
 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 +392,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +392,Debit To account must be a Balance Sheet account,借记科目必须是资产负债表科目
 DocType: Asset,Naming Series,命名系列
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +181,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,行{0}：使用寿命后的预期值必须小于总采购额
 DocType: GoCardless Settings,GoCardless Settings,GoCardless设置
@@ -6152,33 +6143,33 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +33,Stock Assets,库存资产
 DocType: Restaurant,Active Menu,活动菜单
 DocType: Target Detail,Target Qty,目标数量
-apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},反对贷款：{0}
+apps/erpnext/erpnext/hr/doctype/loan/loan.py +37,Against Loan: {0},贷款：{0}
 DocType: Shopping Cart Settings,Checkout Settings,结帐设置
-DocType: Student Attendance,Present,现
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,送货单{0}不能提交
+DocType: Student Attendance,Present,出勤
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +37,Delivery Note {0} must not be submitted,销售出货单{0}不能提交
 DocType: Notification Control,Sales Invoice Message,销售发票信息
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,关闭帐户{0}的类型必须是负债/权益
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +395,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
+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 +395,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为工时单创建{1}
 DocType: Vehicle Log,Odometer,里程表
-DocType: Production Plan Item,Ordered Qty,订购数量
+DocType: Production Plan Item,Ordered Qty,订单数量
 apps/erpnext/erpnext/stock/doctype/item/item.py +780,Item {0} is disabled,物料{0}已被禁用
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +998,BOM does not contain any stock item,BOM不包含任何库存项目
-DocType: Chapter,Chapter Head,章主管
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +998,BOM does not contain any stock item,BOM不包含任何库存物料
+DocType: Chapter,Chapter Head,章节开头
 DocType: Payment Term,Month(s) after the end of the invoice month,发票月份结束后的月份
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +47,Salary Structure should have flexible benefit component(s) to dispense benefit amount,薪酬结构应该有灵活的福利组成来分配福利金额
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +47,Salary Structure should have flexible benefit component(s) to dispense benefit amount,薪资结构应该有灵活的福利组成来分配福利金额
 apps/erpnext/erpnext/config/projects.py +24,Project activity / task.,项目活动/任务。
-DocType: Salary Component,Only Tax Impact (Cannot Claim But Part of Taxable Income),只有税收影响（不能索取但应税收入的一部分）
-DocType: Vehicle Log,Refuelling Details,加油详情
+DocType: Salary Component,Only Tax Impact (Cannot Claim But Part of Taxable Income),只影响计税起征点（不能从起征点内扣除）
+DocType: Vehicle Log,Refuelling Details,加油信息
 apps/erpnext/erpnext/agriculture/doctype/water_analysis/water_analysis.py +25,Lab result datetime cannot be before testing datetime,实验结果日期时间不能在测试日期时间之前
 DocType: POS Profile,Allow user to edit Discount,允许用户编辑折扣
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,从中获取客户
-DocType: Purchase Invoice Item,Include Exploded Items,包含爆炸物品
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +63,Get customers from,从...获取客户
+DocType: Purchase Invoice Item,Include Exploded Items,包含爆炸物料
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,"Buying must be checked, if Applicable For is selected as {0}",“适用于”为{0}时必须勾选“采购”
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必须小于100
 DocType: Shipping Rule,Restrict to Countries,限制到国家
 DocType: Shopify Settings,Shared secret,共享秘密
-DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
+DocType: Purchase Invoice,Write Off Amount (Company Currency),销帐金额（公司货币）
 DocType: Sales Invoice Timesheet,Billing Hours,结算时间
 DocType: Project,Total Sales Amount (via Sales Order),总销售额（通过销售订单）
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py +609,Default BOM for {0} not found,默认BOM {0}未找到
@@ -6188,12 +6179,12 @@
 DocType: Share Transfer,To Folio No,对开本No
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},请设置{0}
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}是非活动学生
-apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}是非活动学生
-DocType: Employee,Health Details,健康细节
-DocType: Leave Encashment,Encashable days,可以忍受的日子
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,要创建付款请求参考文档是必需的
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,要创建付款请求参考文档是必需的
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}是非活跃学生
+apps/erpnext/erpnext/education/doctype/student_group/student_group.py +37,{0} - {1} is inactive student,{0}  -  {1}是非活跃学生
+DocType: Employee,Health Details,健康信息
+DocType: Leave Encashment,Encashable days,可折现天数
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,付款申请中参考文档信息必填
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +24,To create a Payment Request reference document is required,付款申请中参考文档信息必填
 DocType: Soil Texture,Sandy Clay,桑迪粘土
 DocType: Grant Application,Assessment  Manager,评估经理
 DocType: Payment Entry,Allocate Payment Amount,分配付款金额
@@ -6201,22 +6192,22 @@
 DocType: Employee External Work History,Salary,工资
 DocType: Serial No,Delivery Document Type,交货文档类型
 DocType: Sales Order,Partly Delivered,部分交付
-apps/erpnext/erpnext/hr/utils.py +213,Employee {0} has no grade to get default leave policy,员工{0}没有等级来获取默认的离职政策
+apps/erpnext/erpnext/hr/utils.py +213,Employee {0} has no grade to get default leave policy,没有为员工{0}设置职级以获取默认的休假政策
 DocType: Item Variant Settings,Do not update variants on save,不要在保存时更新变体
 DocType: Email Digest,Receivables,应收款
 DocType: Lead Source,Lead Source,线索来源
-DocType: Customer,Additional information regarding the customer.,对于客户的其他信息。
-DocType: Quality Inspection Reading,Reading 5,阅读5
+DocType: Customer,Additional information regarding the customer.,该客户的其他信息。
+DocType: Quality Inspection Reading,Reading 5,检验结果5
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +237,"{0} {1} is associated with {2}, but Party Account is {3}",{0} {1}与{2}相关联，但业务伙伴科目为{3}
 DocType: Bank Statement Settings Item,Bank Header,银行标题
 apps/erpnext/erpnext/healthcare/doctype/sample_collection/sample_collection.js +7,View Lab Tests,查看实验室测试
 DocType: Hub Users,Hub Users,Hub用户
 DocType: Purchase Invoice,Y,Y
 DocType: Maintenance Visit,Maintenance Date,维护日期
-DocType: Purchase Invoice Item,Rejected Serial No,拒绝序列号
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,新年的开始日期或结束日期与{0}重叠。为了避免请将公司
+DocType: Purchase Invoice Item,Rejected Serial No,拒收序列号
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,新财年开始或结束日期与{0}重叠。请在公司主数据中设置
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +131,Please mention the Lead Name in Lead {0},请提及潜在客户名称{0}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},物料{0}的开始日期必须小于结束日期
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD ##### 
 如果设置了序列但是没有在交易中输入序列号，那么系统会根据序列自动生产序列号。如果要强制手动输入序列号，请不要勾选此项。"
@@ -6225,42 +6216,42 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +56,Ageing Range 2,账龄范围2
 DocType: SG Creation Tool Course,Max Strength,最大力量
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +28,Installing presets,安装预置
-apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},没有为客户{}选择送货单
+apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js +93,No Delivery Note selected for Customer {},没有为客户{}选择销售出货单
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +17,Employee {0} has no maximum benefit amount,员工{0}没有最大福利金额
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1100,Select Items based on Delivery Date,根据交付日期选择项目
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +1100,Select Items based on Delivery Date,根据交货日期选择物料
 DocType: Grant Application,Has any past Grant Record,有过去的赠款记录吗？
 ,Sales Analytics,销售分析
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +127,Available {0},可用{0}
-,Prospects Engaged But Not Converted,展望未成熟
-,Prospects Engaged But Not Converted,展望未成熟
+,Prospects Engaged But Not Converted,有接洽但未转化
+,Prospects Engaged But Not Converted,有接洽但未转化
 DocType: Manufacturing Settings,Manufacturing Settings,生产设置
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,设置电子邮件
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian1 Mobile No,Guardian1手机号码
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +122,Please enter default currency in Company Master,请在公司设置中维护默认货币
-DocType: Stock Entry Detail,Stock Entry Detail,库存记录详情
+DocType: Stock Entry Detail,Stock Entry Detail,手工库存移动信息
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Daily Reminders,每日提醒
 apps/erpnext/erpnext/templates/pages/help.html +56,See all open tickets,查看所有打开的门票
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js +20,Healthcare Service Unit Tree,医疗服务单位树
 DocType: Products Settings,Home Page is Products,首页显示产品
-,Asset Depreciation Ledger,资产减值总帐
-DocType: Salary Structure,Leave Encashment Amount Per Day,每天离开冲泡量
+,Asset Depreciation Ledger,资产折旧总帐
+DocType: Salary Structure,Leave Encashment Amount Per Day,休假单日折现金额
 DocType: Loyalty Program Collection,For how much spent = 1 Loyalty Point,花费多少= 1忠诚点
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,Tax Rule Conflicts with {0},税收规范冲突{0}
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,新建账户名称
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,供应的原料成本
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +97,Tax Rule Conflicts with {0},税收规则与{0}冲突
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,新建科目名称
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,发给供应商的原材料成本
 DocType: Selling Settings,Settings for Selling Module,销售模块的设置
 DocType: Hotel Room Reservation,Hotel Room Reservation,酒店房间预订
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +322,Customer Service,顾客服务
 DocType: BOM,Thumbnail,缩略图
-DocType: Item Customer Detail,Item Customer Detail,项目客户详情
+DocType: Item Customer Detail,Item Customer Detail,客户物料信息
 DocType: Notification Control,Prompt for Email on Submission of,提示电子邮件的提交
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py +36,Maximum benefit amount of employee {0} exceeds {1},员工{0}的最高福利金额超过{1}
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +102,Total allocated leaves are more than days in the period,总已核销休假大于此期间天数
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +102,Total allocated leaves are more than days in the period,总已分配休假天数大于此期间天数
 DocType: Land Unit,Linked Soil Analysis,连接的土壤分析
 DocType: Pricing Rule,Percentage,百分比
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,项目{0}必须是库存项目
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,物料{0}必须是库存物料
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,默认工作正在进行仓库
-apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +83,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",{0}重叠的时间表，是否要在滑动重叠的插槽后继续？
+apps/erpnext/erpnext/healthcare/doctype/physician_schedule/physician_schedule.js +83,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?",{0}重叠的工时单，是否要在滑动重叠的插槽后继续？
 apps/erpnext/erpnext/config/accounts.py +294,Default settings for accounting transactions.,业务会计的默认设置。
 DocType: Maintenance Visit,MV,MV
 DocType: Restaurant,Default Tax Template,默认税收模板
@@ -6273,7 +6264,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,错误：没有有效的身份证？
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“损益”帐户类型{2}不允许进入开
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“损益”科目类型{2}不允许开帐凭证
 DocType: Job Offer,Printing Details,打印设置
 DocType: Task,Closing Date,结算日期
 DocType: Sales Order Item,Produced Quantity,生产的产品数量
@@ -6282,38 +6273,38 @@
 DocType: Employee Tax Exemption Category,Max Amount,最大金额
 DocType: Journal Entry,Total Amount Currency,总金额币种
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子组件
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Item Code required at Row No {0},行{0}中的项目编号是必须项
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +187,Item Code required at Row No {0},行{0}中的物料代码是必须项
 DocType: GST Account,SGST Account,SGST账户
 apps/erpnext/erpnext/utilities/user_progress.py +154,Go to Items,转到物料主数据
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Restaurant Menu,Restaurant Manager,餐厅经理
 DocType: Authorization Rule,Customerwise Discount,客户折扣
-apps/erpnext/erpnext/config/projects.py +46,Timesheet for tasks.,时间表的任务。
-DocType: Purchase Invoice,Against Expense Account,对开支账目
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +284,Installation Note {0} has already been submitted,安装单{0}已经提交过
+apps/erpnext/erpnext/config/projects.py +46,Timesheet for tasks.,工时单的任务。
+DocType: Purchase Invoice,Against Expense Account,费用账目
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +284,Installation Note {0} has already been submitted,安装单{0}已经提交了
 DocType: Bank Reconciliation,Get Payment Entries,获取付款项
-DocType: Quotation Item,Against Docname,对文档名称
+DocType: Quotation Item,Against Docname,文档名称
 DocType: SMS Center,All Employee (Active),所有员工（活动）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即查看
 DocType: BOM,Raw Material Cost,原材料成本
 DocType: Woocommerce Settings,Woocommerce Server URL,Woocommerce服务器URL
-DocType: Item Reorder,Re-Order Level,再次订货级别
+DocType: Item Reorder,Re-Order Level,重订货水平
 DocType: Shopify Tax Account,Shopify Tax/Shipping Title,Shopify税/运输标题
 apps/erpnext/erpnext/projects/doctype/project/project.js +54,Gantt Chart,甘特图
 DocType: Crop Cycle,Cycle Type,循环类型
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +102,Part-time,兼任
-DocType: Employee,Applicable Holiday List,可申请假期列表
+DocType: Employee,Applicable Holiday List,适用于该员工的假期列表
 DocType: Employee,Cheque,支票
 DocType: Training Event,Employee Emails,员工电子邮件
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,系列已更新
-apps/erpnext/erpnext/accounts/doctype/account/account.py +161,Report Type is mandatory,报告类型是强制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +161,Report Type is mandatory,报表类型必填
 DocType: Item,Serial Number Series,序列号系列
-apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物件{0}必须指定仓库
+apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},行{1}中的物料{0}必须指定仓库
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
-DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
+DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组物料交叉显示
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财务年度开始日期和结束日期已经在财年{0}中设置
 DocType: Projects Settings,Ignore User Time Overlap,忽略用户时间重叠
 DocType: Accounting Period,Accounting Period,会计期间
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +113,Clearance Date updated,间隙更新日期
@@ -6329,39 +6320,39 @@
 apps/erpnext/erpnext/assets/doctype/asset/asset.py +60,Available for use date is required,需要使用可用日期
 DocType: Request for Quotation,Supplier Detail,供应商详细
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +175,Error in formula or condition: {0},公式或条件错误:{0}
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,已开票金额
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +112,Invoiced Amount,发票金额
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +47,Criteria weights must add up to 100%,标准重量必须达100％
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js +7,Attendance,考勤
 apps/erpnext/erpnext/public/js/pos/pos.html +115,Stock Items,库存产品
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未选中，此列表将需要手动添加到部门。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +646,Posting date and posting time is mandatory,发布日期和发布时间是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +646,Posting date and posting time is mandatory,记帐日期和记帐时间必填
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,采购业务的税项模板。
-,Item Prices,项目价格
+,Item Prices,物料价格
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,大写金额将在采购订单保存后显示。
 DocType: Holiday List,Add to Holidays,加入假期
 DocType: Woocommerce Settings,Endpoint,端点
-DocType: Period Closing Voucher,Period Closing Voucher,期末券
+DocType: Period Closing Voucher,Period Closing Voucher,期末结帐凭证
 DocType: Consultation,Review Details,评论细节
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +186,The shareholder does not belong to this company,股东不属于这家公司
 DocType: Dosage Form,Dosage Form,剂型
-apps/erpnext/erpnext/config/selling.py +67,Price List master.,主价格表。
+apps/erpnext/erpnext/config/selling.py +67,Price List master.,价格清单主数据。
 DocType: Task,Review Date,评论日期
-DocType: BOM,Allow Alternative Item,允许替代项目
-DocType: Company,Series for Asset Depreciation Entry (Journal Entry),资产折旧条目系列（期刊条目）
+DocType: BOM,Allow Alternative Item,允许替代物料
+DocType: Company,Series for Asset Depreciation Entry (Journal Entry),固定资产折旧凭证命名序列（手工凭证）
 DocType: Membership,Member Since,成员自
 DocType: Purchase Invoice,Advance Payments,预付款
 DocType: Purchase Taxes and Charges,On Net Total,基于净总计
-apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},为属性{0}值必须的范围内{1}到{2}中的增量{3}为项目{4}
+apps/erpnext/erpnext/controllers/item_variant.py +92,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},物料{4}的属性{0}其属性值必须{1}到{2}范围内，且增量{3}
 DocType: Restaurant Reservation,Waitlisted,轮候
 DocType: Employee Tax Exemption Declaration Category,Exemption Category,豁免类别
 apps/erpnext/erpnext/accounts/doctype/account/account.py +126,Currency can not be changed after making entries using some other currency,货币不能使用其他货币进行输入后更改
 DocType: Shipping Rule,Fixed,固定
 DocType: Vehicle Service,Clutch Plate,离合器压盘
-DocType: Company,Round Off Account,四舍五入账户
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Administrative Expenses,行政开支
+DocType: Company,Round Off Account,四舍五入科目
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Administrative Expenses,行政费用
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py +18,Consulting,咨询
-DocType: Customer Group,Parent Customer Group,母公司集团客户
+DocType: Customer Group,Parent Customer Group,父（上级）客户群组
 DocType: Vehicle Service,Change,变化
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +867,Subscription,订阅
 DocType: Purchase Invoice,Contact Email,联络人电邮
@@ -6373,32 +6364,32 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新销售人员的姓名
 DocType: Packing Slip,Gross Weight UOM,毛重计量单位
 DocType: Employee Transfer,Create New Employee Id,创建新的员工ID
-DocType: Travel Itinerary,Travel From,旅行从
+DocType: Travel Itinerary,Travel From,出差出发地
 DocType: Asset Maintenance Task,Preventive Maintenance,预防性的维护
-DocType: Delivery Note Item,Against Sales Invoice,对销售发票
+DocType: Delivery Note Item,Against Sales Invoice,销售发票
 DocType: Purchase Invoice,07-Others,07，其他
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +158,Please enter serial numbers for serialized item ,请输入序列号序列号
-DocType: Bin,Reserved Qty for Production,预留数量生产
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量，请不要选中。
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量，请不要选中。
+DocType: Bin,Reserved Qty for Production,生产预留数量
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果在创建基于组的课程时不考虑批（号），请不要勾选。
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果在创建基于组的课程时不考虑批（号），请不要勾选。
 DocType: Asset,Frequency of Depreciation (Months),折旧率（月）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +561,Credit Account,信用账户
-DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +561,Credit Account,贷方科目
+DocType: Landed Cost Item,Landed Cost Item,到岸成本物料
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,显示零值
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的物料数量
 DocType: Lab Test,Test Group,测试组
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
-DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
+DocType: Delivery Note Item,Against Sales Order Item,销售订单项
 DocType: Hub Settings,Company Logo,公司标志
 apps/erpnext/erpnext/stock/doctype/item/item.py +745,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item Default,Default Warehouse,默认仓库
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Budget cannot be assigned against Group Account {0},预算不能分派给群组类科目{0}
 DocType: Shopping Cart Settings,Show Price,显示价格
 DocType: Healthcare Settings,Patient Registration,病人登记
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Please enter parent cost center,请输入父成本中心
 DocType: Delivery Note,Print Without Amount,打印量不
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +65,Depreciation Date,折旧日期
-,Work Orders in Progress,工作订单正在进行中
+,Work Orders in Progress,工单正在进行中
 DocType: Issue,Support Team,支持团队
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),过期(按天计算)
 DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
@@ -6412,10 +6403,10 @@
 DocType: Room,Seating Capacity,座位数
 DocType: Issue,ISS-,ISS-
 DocType: Lab Test Groups,Lab Test Groups,实验室测试组
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py +151,Party Type and Party is mandatory for {0} account,{0}帐户必须使用派对类型和派对
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py +151,Party Type and Party is mandatory for {0} account,科目{0}业务伙伴类型及业务伙伴信息必填
 DocType: Project,Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）
 DocType: GST Settings,GST Summary,消费税总结
-apps/erpnext/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py +16,Please enable default incoming account before creating Daily Work Summary Group,请在创建日常工作摘要组之前启用默认传入帐户
+apps/erpnext/erpnext/hr/doctype/daily_work_summary_group/daily_work_summary_group.py +16,Please enable default incoming account before creating Daily Work Summary Group,请在创建每日工作总结组之前启用默认收件邮箱
 DocType: Assessment Result,Total Score,总得分
 DocType: Crop Cycle,ISO 8601 standard,ISO 8601标准
 DocType: Journal Entry,Debit Note,借项通知单
@@ -6427,7 +6418,7 @@
 DocType: Asset,Insurer,保险公司
 DocType: Batch,Source Document Type,源文档类型
 DocType: Batch,Source Document Type,源文档类型
-apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,按照课程时间表创建
+apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js +24,Following course schedules were created,按照课程工时单创建
 DocType: Employee Onboarding,Employee Onboarding,员工入职
 DocType: Journal Entry,Total Debit,总借方金额
 DocType: Travel Request Costing,Sponsored Amount,赞助金额
@@ -6445,72 +6436,72 @@
 DocType: Healthcare Settings,Consultations in valid days,有效日期的咨询
 DocType: Assessment Plan Criteria,Maximum Score,最大比分
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,创建规则，根据属性值来限制交易。
-DocType: Cash Flow Mapping Accounts,Cash Flow Mapping Accounts,现金流量映射账户
+DocType: Cash Flow Mapping Accounts,Cash Flow Mapping Accounts,现金流量表科目
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +49, Group Roll No,组卷号
 DocType: Batch,Manufacturing Date,生产日期
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule_list.js +9,Fee Creation Failed,费用创作失败
-DocType: Opening Invoice Creation Tool,Create Missing Party,创建失踪派对
-DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年制作学生团体，请留空
-DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年制作学生团体，请留空
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果勾选，工作日总数将包含假期，这将会降低“日工资”的值。
+DocType: Opening Invoice Creation Tool,Create Missing Party,创建往来单位（供应商或客户）
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年创建学生团体，请留空
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年创建学生团体，请留空
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果勾选，工作日总数将包含假期，“日工资”值会相应降低。
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js +25,"Apps using current key won't be able to access, are you sure?",使用当前密钥的应用程序将无法访问，您确定吗？
 DocType: Subscription Settings,Prorate,按比例分配
-DocType: Purchase Invoice,Total Advance,总垫款
+DocType: Purchase Invoice,Total Advance,总预收/付
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js +78,Change Template Code,更改模板代码
 apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,该期限结束日期不能超过期限开始日期。请更正日期，然后再试一次。
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,报价计数
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,报价计数
 DocType: Bank Statement Transaction Entry,Bank Statement,银行对帐单
 DocType: Employee Benefit Claim,Max Amount Eligible,最高金额合格
-,BOM Stock Report,BOM库存报告
+,BOM Stock Report,BOM库存报表
 DocType: Stock Reconciliation Item,Quantity Difference,数量差异
 DocType: Employee Advance,EA-,EA-
-DocType: Opportunity Item,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 +182,Set as Lost,设置为丧失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +182,Set as Lost,设置为输
 DocType: Timesheet,Total Billable Hours,总计费时间
 DocType: Subscription,Number of days that the subscriber has to pay invoices generated by this subscription,用户必须支付此订阅生成的发票的天数
-DocType: Employee Benefit Application Detail,Employee Benefit Application Detail,员工福利申请明细
+DocType: Employee Benefit Application Detail,Employee Benefit Application Detail,员工福利申请信息
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收据
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,这是基于对这个顾客的交易。详情请参阅以下时间表
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,本统计信息基于该客户的过往交易。详情请参阅表单下方的时间线记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +162,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}：分配金额{1}必须小于或等于输入付款金额{2}
 DocType: Program Enrollment Tool,New Academic Term,新学期
-,Course wise Assessment Report,课程明智的评估报告
+,Course wise Assessment Report,课程明智的评估报表
 DocType: Purchase Invoice,Availed ITC State/UT Tax,有效的ITC州/ UT税
 DocType: Tax Rule,Tax Rule,税务规则
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,在整个销售周期使用同一价格
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,规划工作站工作时间以外的时间日志。
-apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +117,Dr {0} does not have a Physician Schedule. Add it in Physician master,医生{0}没有医师时间表。将其添加到医师大师
+apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py +117,Dr {0} does not have a Physician Schedule. Add it in Physician master,医生{0}没有医师排班表。将其添加到医师主数据中
 apps/erpnext/erpnext/public/js/pos/pos.html +98,Customers in Queue,在排队的客户
 DocType: Driver,Issuing Date,发行日期
 DocType: Procedure Prescription,Appointment Booked,预约预约
 DocType: Student,Nationality,国籍
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js +109,Submit this Work Order for further processing.,提交此工单以进一步处理。
-,Items To Be Requested,要申请的项目
+,Items To Be Requested,待申请物料
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
 apps/erpnext/erpnext/accounts/page/pos/pos.js +1396,Select or add new customer,选择或添加新客户
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +177,Cost center is required to book an expense claim,成本中心需要预订费用报销
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,这是基于该员工的考勤
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,基于该员工的考勤
 DocType: Assessment Result,Summary,概要
-apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,出席人数
+apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js +112,Mark Attendance,考勤
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +555,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,年度起始日期
-DocType: Additional Salary,Employee Name,雇员姓名
+DocType: Additional Salary,Employee Name,员工姓名
 DocType: Restaurant Order Entry Item,Restaurant Order Entry Item,餐厅订单录入项目
-DocType: Purchase Invoice,Rounded Total (Company Currency),元整后金额（公司货币）
-apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是帐户类型。
+DocType: Purchase Invoice,Rounded Total (Company Currency),圆整后金额（公司货币）
+apps/erpnext/erpnext/accounts/doctype/account/account.py +98,Cannot covert to Group because Account Type is selected.,不能转换到组，因为你选择的是科目类型。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +267,{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/doctype/loyalty_program/loyalty_program.js +24,"If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.",如果忠诚度积分无限期到期，请将到期时间保持为空或0。
 DocType: Asset Maintenance Team,Maintenance Team Members,维护团队成员
-DocType: Loyalty Point Entry,Purchase Amount,购买金额
+DocType: Loyalty Point Entry,Purchase Amount,采购金额
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +261,Supplier Quotation {0} created,供应商报价{0}创建
 apps/erpnext/erpnext/accounts/report/financial_statements.py +104,End Year cannot be before Start Year,结束年份不能启动年前
 DocType: Employee Benefit Application,Employee Benefits,员工福利
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +266,Packed quantity must equal quantity for Item {0} in row {1},第{1}行的打包数量必须等于物料{0}数量
 DocType: Work Order,Manufactured Qty,已生产数量
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py +79,The shares don't exist with the {0},这些份额不存在{0}
 DocType: Sales Partner Type,Sales Partner Type,销售伙伴类型
@@ -6528,27 +6519,27 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +573,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
 DocType: Clinical Procedure Template,Medical Administrator,医疗管理员
 DocType: Assessment Plan,Schedule,计划任务
-DocType: Account,Parent Account,父帐户
+DocType: Account,Parent Account,父科目
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js +297,Available,可用的
-DocType: Quality Inspection Reading,Reading 3,阅读3
+DocType: Quality Inspection Reading,Reading 3,检验结果3
 DocType: Stock Entry,Source Warehouse Address,来源仓库地址
 DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1728,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1728,Price List not found or disabled,价格清单未找到或禁用
 DocType: Student Applicant,Approved,已批准
 apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +15,Price,价格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +337,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +337,Employee relieved on {0} must be set as 'Left',员工自{0}离职后，其状态必须设置为“已离职”
 DocType: Hub Settings,Last Sync On,上次同步开启
 DocType: Guardian,Guardian,监护人
-DocType: Salary Detail,Tax on additional salary,额外工资税
-DocType: Item Alternative,Item Alternative,项目选择
-DocType: Opening Invoice Creation Tool,Create missing customer or supplier.,创建缺少的客户或供应商。
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
+DocType: Salary Detail,Tax on additional salary,额外薪资税
+DocType: Item Alternative,Item Alternative,替换物料
+DocType: Opening Invoice Creation Tool,Create missing customer or supplier.,如果客户或供应商不存在，则创建对应主数据
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,员工{1}的限期评估{0}已经创建
 DocType: Academic Term,Education,教育
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js +593,Del,德尔
 DocType: Selling Settings,Campaign Naming By,活动命名：
-DocType: Employee,Current Address Is,当前地址是
+DocType: Employee,Current Address Is,当前地址性质
 apps/erpnext/erpnext/utilities/user_progress.py +51,Monthly Sales Target (,每月销售目标（
-DocType: Physician Service Unit Schedule,Physician Service Unit Schedule,医师服务单位时间表
+DocType: Physician Service Unit Schedule,Physician Service Unit Schedule,医师服务单位工时单
 apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,改性
 DocType: Travel Request,Identification Document Number,身份证明文件号码
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +41,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
@@ -6557,11 +6548,11 @@
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js +29,This is a root healthcare service unit and cannot be edited.,这是根医疗保健服务单位，不能编辑。
 DocType: Asset Repair,Repair Status,维修状态
 apps/erpnext/erpnext/config/accounts.py +67,Accounting journal entries.,会计记账分录。
-DocType: Travel Request,Travel Request,旅行要求
-DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
-apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,请选择员工记录第一。
-apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +52,Attendance not submitted for {0} as it is a Holiday.,由于是假期，因此未出席{0}的考勤。
-DocType: POS Profile,Account for Change Amount,帐户涨跌额
+DocType: Travel Request,Travel Request,出差申请
+DocType: Delivery Note Item,Available Qty at From Warehouse,源仓库可用数量
+apps/erpnext/erpnext/hr/doctype/department_approver/department_approver.py +17,Please select Employee Record first.,请先选择员工记录
+apps/erpnext/erpnext/hr/doctype/attendance_request/attendance_request.py +52,Attendance not submitted for {0} as it is a Holiday.,由于是假期，{0}的考勤未提交。
+DocType: POS Profile,Account for Change Amount,零钱科目
 DocType: Exchange Rate Revaluation,Total Gain/Loss,总收益/损失
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +1128,Invalid Company for Inter Company Invoice.,公司发票无效公司。
 DocType: Purchase Invoice,input service,输入服务
@@ -6570,21 +6561,21 @@
 DocType: Maintenance Team Member,Maintenance Team Member,维护团队成员
 DocType: Agriculture Analysis Criteria,Soil Analysis,土壤分析
 apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_assessment_report.html +13,Course Code: ,课程编号：
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,请输入您的费用帐户
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,Please enter Expense Account,请输入您的费用科目
 DocType: Account,Stock,库存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +1097,"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 +1097,"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 Group,Assessment Group,评估小组
 apps/erpnext/erpnext/config/stock.py +333,Batch Inventory,批号库存
 DocType: Procedure Prescription,Procedure Name,程序名称
 DocType: Employee,Contract End Date,合同结束日期
-DocType: Sales Order,Track this Sales Order against any Project,跟踪对任何项目这个销售订单
+DocType: Sales Order,Track this Sales Order against any Project,选择一个项目以追踪该销售订单
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,银行对账单交易分录
-DocType: Sales Invoice Item,Discount and Margin,折扣和保证金
+DocType: Sales Invoice Item,Discount and Margin,折扣与边际利润
 DocType: Lab Test,Prescription,处方
-DocType: Company,Default Deferred Revenue Account,默认递延收入账户
+DocType: Company,Default Deferred Revenue Account,默认递延收入科目
 DocType: Project,Second Email,第二封邮件
 DocType: Budget,Action if Annual Budget Exceeded on Actual,年度预算超出实际的行动
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js +126,Not Available,不可用
@@ -6593,18 +6584,18 @@
 DocType: Bank Statement Transaction Invoice Item,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,计划数量
 DocType: Company,Date of Incorporation,注册成立日期
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,总税收
-apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +40,Last Purchase Price,上次购买价格
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +246,For Quantity (Manufactured Qty) is mandatory,对于数量（制造数量）是强制性的
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +121,Total Tax,总税额
+apps/erpnext/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py +40,Last Purchase Price,上次采购价格
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +246,For Quantity (Manufactured Qty) is mandatory,数量（制造数量）字段必填
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
 apps/erpnext/erpnext/education/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/hr/doctype/leave_application/leave_application.py +285,{0} is not in Optional Holiday List,{0}不在可选节日列表中
-DocType: Notification Control,Purchase Receipt Message,外购入库单信息
-DocType: BOM,Scrap Items,废物品
+DocType: Notification Control,Purchase Receipt Message,采购收货单信息
+DocType: BOM,Scrap Items,废品
 DocType: Work Order,Actual Start Date,实际开始日期
-DocType: Sales Order,% of materials delivered against this Sales Order,此销售订单% 的材料已交货。
-apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Work Orders.,生成材料请求（MRP）和工作订单。
+DocType: Sales Order,% of materials delivered against this Sales Order,此销售订单% 的物料已交货。
+apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Work Orders.,生成物料申请（MRP）和工单。
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +62,Set default mode of payment,设置默认付款方式
 DocType: Grant Application,Withdrawn,取消
 DocType: Hub Settings,Hub Settings,Hub设置
@@ -6614,8 +6605,8 @@
 DocType: Support Search Source,Post Route Key List,发布路由密钥列表
 apps/erpnext/erpnext/accounts/party.py +271,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 DocType: Asset,Is Existing Asset,是对现有资产
-DocType: Salary Component,Statistical Component,统计组成部分
-DocType: Salary Component,Statistical Component,统计组成部分
+DocType: Salary Component,Statistical Component,统计项
+DocType: Salary Component,Statistical Component,统计项
 DocType: Warranty Claim,If different than customer address,如果客户地址不同的话
 DocType: Purchase Invoice,Without Payment of Tax,不缴纳税款
 DocType: BOM Operation,BOM Operation,BOM操作
@@ -6624,9 +6615,9 @@
 DocType: Item,Has Expiry Date,有过期日期
 apps/erpnext/erpnext/assets/doctype/asset/asset.js +338,Transfer Asset,转让资产
 DocType: POS Profile,POS Profile,POS简介
-DocType: Training Event,Event Name,事件名称
+DocType: Training Event,Event Name,培训名称
 DocType: Physician,Phone (Office),电话（办公室）
-apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +22,"Cannot Submit, Employees left to mark attendance",无法提交，雇员留下来标记出席
+apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py +22,"Cannot Submit, Employees left to mark attendance",无法提交，不能为已离职员工登记考勤
 apps/erpnext/erpnext/hooks.py +151,Admission,入场
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py +29,Admissions for {0},招生{0}
 apps/erpnext/erpnext/config/accounts.py +263,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
@@ -6637,21 +6628,21 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +20,Net pay cannot be negative,净支付金额不能为负数
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,销售订单超额生产百分比
-DocType: Item,Item Tax,项目税项
+DocType: Item,Item Tax,物料税项
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +907,Material to Supplier,材料到供应商
 DocType: Soil Texture,Loamy Sand,泥沙
-DocType: Production Plan,Material Request Planning,物料请求计划
+DocType: Production Plan,Material Request Planning,物料申请计划
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +700,Excise Invoice,消费税发票
 apps/erpnext/erpnext/education/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出现％不止一次
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.py +44,Customer isn't enrolled in this Loyalty Program,客户未加入此忠诚度计划
-DocType: Expense Claim,Employees Email Id,雇员的邮件地址
-DocType: Employee Attendance Tool,Marked Attendance,显着的出席
+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 +145,Current Liabilities,流动负债
 apps/erpnext/erpnext/public/js/projects/timer.js +138,Timer exceeded the given hours.,计时器超出了指定的小时数
 apps/erpnext/erpnext/config/selling.py +303,Send mass SMS to your contacts,向你的联系人群发短信。
 DocType: Patient,A Positive,积极的
 DocType: Program,Program Name,程序名称
-DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考虑税收或收费
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,用途
 DocType: Driver,Driving License Category,驾驶执照类别
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,实际数量是必须项
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +93,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.",{0}目前拥有{1}供应商记分卡，而采购订单应谨慎提供给供应商。
@@ -6660,22 +6651,22 @@
 DocType: Loan,Loan Type,贷款类型
 DocType: Scheduling Tool,Scheduling Tool,调度工具
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py +156,Credit Card,信用卡
-DocType: BOM,Item to be manufactured or repacked,要生产或者重新包装的项目
+DocType: BOM,Item to be manufactured or repacked,待生产或者重新包装的物料
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +742,Syntax error in condition: {0},条件中的语法错误：{0}
 DocType: Employee Education,Major/Optional Subjects,主修/选修科目
-apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +125,Please Set Supplier Group in Buying Settings.,请设置供应商组购买设置。
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py +125,Please Set Supplier Group in Buying Settings.,请设置供应商组采购设置。
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +44,"Total flexible benefit component amount {0} should not be less \
 				than max benefits {1}",灵活福利组件总额{0}不应低于最大福利{1}
 DocType: Sales Invoice Item,Drop Ship,由供应商交货（直接发运）
 DocType: Driver,Suspended,暂停
-DocType: Training Event,Attendees,与会者
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在这里，您可以维系家庭的详细信息，如姓名的父母，配偶和子女及职业
+DocType: Training Event,Attendees,受训学员
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",可以登记家庭详细信息，如姓名，父母、配偶及子女的职业等
 DocType: Academic Term,Term End Date,合同结束日期
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),已扣除税费（公司货币）
 DocType: Item Group,General Settings,常规设置
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,源货币和目标货币不能相同
-DocType: Taxable Salary Slab,Percent Deduction,扣除百分比
-DocType: Stock Entry,Repack,改装
+DocType: Taxable Salary Slab,Percent Deduction,税率（%）
+DocType: Stock Entry,Repack,包装
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,在继续之前，您必须保存表单
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +113,Please select the Company first,请先选择公司
 DocType: Item Attribute,Numeric Values,数字值
@@ -6684,8 +6675,8 @@
 DocType: Customer,Commission Rate,佣金率
 apps/erpnext/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py +239,Successfully created payment entries,成功创建付款条目
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +187,Created {0} scorecards for {1} between: ,为{1}创建{0}记分卡：
-apps/erpnext/erpnext/stock/doctype/item/item.js +559,Make Variant,在Variant
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +156,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
+apps/erpnext/erpnext/stock/doctype/item/item.js +559,Make Variant,创建物料变式
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +156,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须收、付或转
 DocType: Travel Itinerary,Preferred Area for Lodging,住宿的首选地区
 apps/erpnext/erpnext/config/selling.py +184,Analytics,Analytics（分析）
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +25,Cart is Empty,购物车是空的
@@ -6700,16 +6691,16 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,允许在假日生产
 DocType: Sales Invoice,Customer's Purchase Order Date,客户的采购订单日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +173,Capital Stock,股本
-DocType: Asset,Default Finance Book,默认金融书
+DocType: Asset,Default Finance Book,默认账簿
 DocType: Shopping Cart Settings,Show Public Attachments,显示公共附件
-DocType: Packing Slip,Package Weight Details,包装重量详情
-DocType: Leave Type,Is Compensatory,是有补偿的
+DocType: Packing Slip,Package Weight Details,包装重量信息
+DocType: Leave Type,Is Compensatory,补假？非工作日加班后，在工作日补休
 DocType: Restaurant Reservation,Reservation Time,预订时间
 DocType: Payment Gateway Account,Payment Gateway Account,支付网关账户
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后将用户转到所选网页。
 DocType: Company,Existing Company,现有的公司
 DocType: Healthcare Settings,Result Emailed,电子邮件结果
-apps/erpnext/erpnext/controllers/buying_controller.py +92,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",税项类别已更改为“合计”，因为所有物品均为非库存物品
+apps/erpnext/erpnext/controllers/buying_controller.py +92,"Tax Category has been changed to ""Total"" because all the Items are non-stock items",税项类别已更改为“合计”，因为所有物料均为非库存物料
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py +72,To date can not be equal or less than from date,迄今为止不能等于或少于日期
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js +118,Nothing to change,没什么可改变的
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,请选择一个csv文件
@@ -6726,28 +6717,28 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +563,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 DocType: Program,Program Code,程序代码
 DocType: Terms and Conditions,Terms and Conditions Help,条款和条件帮助
-,Item-wise Purchase Register,逐项采购记录
+,Item-wise Purchase Register,物料采购台帐
 DocType: Loyalty Point Entry,Expiry Date,到期时间
 DocType: Healthcare Settings,Employee name and designation in print,打印出来显示的员工姓名和职位
 ,accounts-browser,账户浏览器
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +370,Please select Category first,属性是相同的两个记录。
-apps/erpnext/erpnext/config/projects.py +13,Project master.,项目主。
-apps/erpnext/erpnext/controllers/status_updater.py +215,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允许对账单或过度订货，库存设置或更新项目“津贴”。
+apps/erpnext/erpnext/config/projects.py +13,Project master.,项目主数据。
+apps/erpnext/erpnext/controllers/status_updater.py +215,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允许超额开票或订货，请在库存设置或物料主数据中更新“允许的超额”。
 DocType: Contract,Contract Terms,合同条款
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py +86,Maximum benefit amount of component {0} exceeds {1},组件{0}的最大受益金额超过{1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +536, (Half Day),（半天）
 DocType: Payment Term,Credit Days,信用期
 apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.js +145,Please select Patient to get Lab Tests,请选择患者以获得实验室测试
-apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,让学生批
+apps/erpnext/erpnext/utilities/activation.py +128,Make Student Batch,创建学生批
 DocType: Fee Schedule,FRQ.,FRQ。
-DocType: Leave Type,Is Carry Forward,是否顺延假期
+DocType: Leave Type,Is Carry Forward,是结转？
 apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py +53,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
 					to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +909,Get Items from BOM,从物料清单获取物料
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
-DocType: Cash Flow Mapping,Is Income Tax Expense,是所得税费用
-apps/erpnext/erpnext/controllers/accounts_controller.py +653,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的购买日期{1}资产的{2}
+DocType: Cash Flow Mapping,Is Income Tax Expense,是所得税费用？
+apps/erpnext/erpnext/controllers/accounts_controller.py +653,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的采购日期{1}资产的{2}
 DocType: Program Enrollment,Check this if the Student is residing at the Institute's Hostel.,如果学生住在学院的旅馆，请检查。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +125,Please enter Sales Orders in the above table,请在上表中输入销售订单
 ,Stock Summary,库存摘要
@@ -6756,19 +6747,30 @@
 DocType: Employee Benefit Application,Remaining Benefits (Yearly),剩余福利（每年）
 apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清单
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：请为应收/应付科目输入{1}往来单位类型和往来单位
-DocType: Employee,Leave Policy,离开政策
+DocType: Employee,Leave Policy,休假政策
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,参考日期
 DocType: Employee,Reason for Leaving,离职原因
 DocType: BOM Operation,Operating Cost(Company Currency),营业成本（公司货币）
 DocType: Loan Application,Rate of Interest,利率
-DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
+DocType: Expense Claim Detail,Sanctioned Amount,已核准金额
 DocType: Item,Shelf Life In Days,保质期天数
-DocType: GL Entry,Is Opening,是否起始
+DocType: GL Entry,Is Opening,开帐分录？
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +206,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Department,Expense Approvers,费用审批人
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +228,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
-DocType: Journal Entry,Subscription Section,认购科
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +228,Row {0}: Debit entry can not be linked with a {1},行{0}：借记分录不能与连接的{1}
+DocType: Journal Entry,Subscription Section,重复
 apps/erpnext/erpnext/accounts/doctype/account/account.py +179,Account {0} does not exist,科目{0}不存在
 DocType: Training Event,Training Program,培训计划
 DocType: Account,Cash,现金
-DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
+DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介
+ : ,Tax Rate,税率
+ : ,Tax Amount,税额
+DocType: Lead, Ends On, 截止日期
+DocType: Contact,User ID,用户ID
+,Outstanding Amount, 未付金额
+,Group by Voucher,按凭证分组
+,Group by Account,按科目分组
+,Group by Party,按往来单位分组
+,Debit (CNY),借方(CNY)
+,Credit (CNY),贷方(CNY)
+,Balance (CNY),余额(CNY)
\ No newline at end of file