From 5a31e228923d3ec2fe387e3e83eca3920cee6da4 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 6 Nov 2019 17:03:12 +0530
Subject: [PATCH 001/193] chore: frappe.rename_doc update

---
 .../clinical_procedure_template.py                           | 3 ++-
 .../healthcare_service_unit_type.py                          | 3 ++-
 .../doctype/lab_test_template/lab_test_template.py           | 5 +++--
 erpnext/patches/v9_2/rename_translated_domains_in_en.py      | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
index 141329b3db1..a8a9037e4ae 100644
--- a/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
+++ b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import frappe, json
 from frappe import _
 from frappe.model.document import Document
+from frappe.model.rename_doc import rename_doc
 from frappe.utils import nowdate
 
 class ClinicalProcedureTemplate(Document):
@@ -115,7 +116,7 @@ def change_item_code_from_template(item_code, doc):
 		"item_code": item_code})):
 		frappe.throw(_("Code {0} already exist").format(item_code))
 	else:
-		frappe.rename_doc("Item", doc.item_code, item_code, ignore_permissions = True)
+		rename_doc("Item", doc.item_code, item_code, ignore_permissions=True)
 		frappe.db.set_value("Clinical Procedure Template", doc.name, "item_code", item_code)
 	return
 
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
index 650499454b9..43f01c86b94 100644
--- 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
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.model.rename_doc import rename_doc
 
 class HealthcareServiceUnitType(Document):
 	def validate(self):
@@ -107,7 +108,7 @@ def change_item_code(item, item_code, doc_name):
 	if(item_exist):
 		frappe.throw(_("Code {0} already exist").format(item_code))
 	else:
-		frappe.rename_doc("Item", item, item_code, ignore_permissions = True)
+		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()
diff --git a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py
index 101e143c123..91488e35333 100644
--- a/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py
+++ b/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 import frappe, json
 from frappe.model.document import Document
+from frappe.model.rename_doc import rename_doc
 from frappe import _
 
 class LabTestTemplate(Document):
@@ -112,9 +113,9 @@ def change_test_code_from_template(lab_test_code, doc):
 	if(item_exist):
 		frappe.throw(_("Code {0} already exist").format(lab_test_code))
 	else:
-		frappe.rename_doc("Item", doc.name, lab_test_code, ignore_permissions = True)
+		rename_doc("Item", doc.name, lab_test_code, ignore_permissions=True)
 		frappe.db.set_value("Lab Test Template",doc.name,"lab_test_code",lab_test_code)
-		frappe.rename_doc("Lab Test Template", doc.name, lab_test_code, ignore_permissions = True)
+		rename_doc("Lab Test Template", doc.name, lab_test_code, ignore_permissions=True)
 	return lab_test_code
 
 @frappe.whitelist()
diff --git a/erpnext/patches/v9_2/rename_translated_domains_in_en.py b/erpnext/patches/v9_2/rename_translated_domains_in_en.py
index aec5d438ec8..e5a9e2461fa 100644
--- a/erpnext/patches/v9_2/rename_translated_domains_in_en.py
+++ b/erpnext/patches/v9_2/rename_translated_domains_in_en.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.model.rename_doc import rename_doc
 
 def execute():
 	frappe.reload_doc('stock', 'doctype', 'item')
@@ -20,11 +21,11 @@ def execute():
 			if frappe.db.exists("Domain", domain):
 				merge=True
 
-			frappe.rename_doc("Domain", translated_domain, domain, ignore_permissions=True, merge=merge)
+			rename_doc("Domain", translated_domain, domain, ignore_permissions=True, merge=merge)
 
 	domain_settings = frappe.get_single("Domain Settings")
 	active_domains = [d.domain for d in domain_settings.active_domains]
-	
+
 	try:
 		for domain in active_domains:
 			domain = frappe.get_doc("Domain", domain)

From c7cfc726d7ba28cc2d78668de7e019222a1882c9 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Wed, 27 Nov 2019 16:58:06 +0530
Subject: [PATCH 002/193] feat: navigate to stock ledger from batch report

---
 .../batch_wise_balance_history.js             |  25 +++-
 .../batch_wise_balance_history.py             |  37 +++---
 .../stock/report/stock_ledger/stock_ledger.js |  10 +-
 .../stock/report/stock_ledger/stock_ledger.py | 110 +++++++++++++-----
 4 files changed, 133 insertions(+), 49 deletions(-)

diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
index b23c908e07a..23700c94ee5 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
@@ -16,6 +16,29 @@ frappe.query_reports["Batch-Wise Balance History"] = {
 			"fieldtype": "Date",
 			"width": "80",
 			"default": frappe.datetime.get_today()
+		},
+		{
+			"fieldname": "item",
+			"label": __("Item"),
+			"fieldtype": "Link",
+			"options": "Item",
+			"width": "80"
 		}
-	]
+	],
+	"formatter": function (value, row, column, data, default_formatter) {
+		if (column.fieldname == "Batch" && data && !!data["Batch"]) {
+			value = data["Batch"];
+			column.link_onclick = "frappe.query_reports['Batch-Wise Balance History'].set_batch_route_to_stock_ledger(" + JSON.stringify(data) + ")";
+		}
+
+		value = default_formatter(value, row, column, data);
+		return value;
+	},
+	"set_batch_route_to_stock_ledger": function (data) {
+		frappe.route_options = {
+			"batch_no": data["Batch"]
+		};
+
+		frappe.set_route("query-report", "Stock Ledger");
+	}
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
index 7f7835f74ee..2c95084b813 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@@ -2,9 +2,11 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
+
 import frappe
 from frappe import _
-from frappe.utils import flt, cint, getdate
+from frappe.utils import cint, flt, getdate
+
 
 def execute(filters=None):
 	if not filters: filters = {}
@@ -17,29 +19,31 @@ def execute(filters=None):
 
 	data = []
 	for item in sorted(iwb_map):
-		for wh in sorted(iwb_map[item]):
-			for batch in sorted(iwb_map[item][wh]):
-				qty_dict = iwb_map[item][wh][batch]
-				if qty_dict.opening_qty or qty_dict.in_qty or qty_dict.out_qty or qty_dict.bal_qty:
-					data.append([item, item_map[item]["item_name"], item_map[item]["description"], wh, batch,
-						flt(qty_dict.opening_qty, float_precision), flt(qty_dict.in_qty, float_precision),
-						flt(qty_dict.out_qty, float_precision), flt(qty_dict.bal_qty, float_precision),
-						 item_map[item]["stock_uom"]
-					])
+		if not filters.get("item") or filters.get("item") == item:
+			for wh in sorted(iwb_map[item]):
+				for batch in sorted(iwb_map[item][wh]):
+					qty_dict = iwb_map[item][wh][batch]
+					if qty_dict.opening_qty or qty_dict.in_qty or qty_dict.out_qty or qty_dict.bal_qty:
+						data.append([item, item_map[item]["item_name"], item_map[item]["description"], wh, batch,
+							flt(qty_dict.opening_qty, float_precision), flt(qty_dict.in_qty, float_precision),
+							flt(qty_dict.out_qty, float_precision), flt(qty_dict.bal_qty, float_precision),
+							item_map[item]["stock_uom"]
+						])
 
 	return columns, data
 
+
 def get_columns(filters):
 	"""return columns based on filters"""
 
 	columns = [_("Item") + ":Link/Item:100"] + [_("Item Name") + "::150"] + [_("Description") + "::150"] + \
-	[_("Warehouse") + ":Link/Warehouse:100"] + [_("Batch") + ":Link/Batch:100"] + [_("Opening Qty") + ":Float:90"] + \
-	[_("In Qty") + ":Float:80"] + [_("Out Qty") + ":Float:80"] + [_("Balance Qty") + ":Float:90"] + \
-	[_("UOM") + "::90"]
-
+		[_("Warehouse") + ":Link/Warehouse:100"] + [_("Batch") + ":Link/Batch:100"] + [_("Opening Qty") + ":Float:90"] + \
+		[_("In Qty") + ":Float:80"] + [_("Out Qty") + ":Float:80"] + [_("Balance Qty") + ":Float:90"] + \
+		[_("UOM") + "::90"]
 
 	return columns
 
+
 def get_conditions(filters):
 	conditions = ""
 	if not filters.get("from_date"):
@@ -52,7 +56,8 @@ def get_conditions(filters):
 
 	return conditions
 
-#get all details
+
+# get all details
 def get_stock_ledger_entries(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""
@@ -63,6 +68,7 @@ def get_stock_ledger_entries(filters):
 		order by item_code, warehouse""" %
 		conditions, as_dict=1)
 
+
 def get_item_warehouse_batch_map(filters, float_precision):
 	sle = get_stock_ledger_entries(filters)
 	iwb_map = {}
@@ -90,6 +96,7 @@ def get_item_warehouse_batch_map(filters, float_precision):
 
 	return iwb_map
 
+
 def get_item_details(filters):
 	item_map = {}
 	for d in frappe.db.sql("select name, item_name, description, stock_uom from tabItem", as_dict=1):
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.js b/erpnext/stock/report/stock_ledger/stock_ledger.js
index 3fab3273b9e..df3bba5e406 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.js
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.js
@@ -77,7 +77,15 @@ frappe.query_reports["Stock Ledger"] = {
 			"fieldtype": "Link",
 			"options": "UOM"
 		}
-	]
+	],
+	"formatter": function (value, row, column, data, default_formatter) {
+		value = default_formatter(value, row, column, data);
+		if (column.fieldname == "out_qty" && data.out_qty < 0) {
+			value = "<span style='color:red'>" + value + "</span>";
+		}
+
+		return value;
+	},
 }
 
 // $(function() {
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index db7f6ad1b9c..dd53a006b52 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -2,9 +2,11 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
+
 import frappe
-from frappe import _
 from erpnext.stock.utils import update_included_uom_in_report
+from frappe import _
+
 
 def execute(filters=None):
 	include_uom = filters.get("include_uom")
@@ -36,7 +38,22 @@ def execute(filters=None):
 
 			sle.update({
 				"qty_after_transaction": actual_qty,
-				"stock_value": stock_value
+				"stock_value": stock_value,
+				"in_qty": max(sle.actual_qty, 0),
+				"out_qty": min(sle.actual_qty, 0)
+			})
+
+		# get the name of the item that was produced using this item
+		if sle.voucher_type == "Stock Entry":
+			purpose, work_order, fg_completed_qty = frappe.db.get_value(sle.voucher_type, sle.voucher_no, ["purpose", "work_order", "fg_completed_qty"])
+
+			if purpose == "Manufacture" and work_order:
+				finished_product = frappe.db.get_value("Work Order", work_order, "item_name")
+				finished_qty = fg_completed_qty
+
+			sle.update({
+				"finished_product": finished_product,
+				"finished_qty": finished_qty,
 			})
 
 		data.append(sle)
@@ -47,53 +64,74 @@ def execute(filters=None):
 	update_included_uom_in_report(columns, data, include_uom, conversion_factors)
 	return columns, data
 
+
 def get_columns():
 	columns = [
-		{"label": _("Date"), "fieldname": "date", "fieldtype": "Datetime", "width": 95},
-		{"label": _("Item"), "fieldname": "item_code", "fieldtype": "Link", "options": "Item", "width": 130},
+		{"label": _("Date"), "fieldname": "date", "fieldtype": "Datetime", "width": 150},
+		{"label": _("Item"), "fieldname": "item_code", "fieldtype": "Link", "options": "Item", "width": 100},
 		{"label": _("Item Name"), "fieldname": "item_name", "width": 100},
+		{"label": _("Stock UOM"), "fieldname": "stock_uom", "fieldtype": "Link", "options": "UOM", "width": 90},
+		{"label": _("In Qty"), "fieldname": "in_qty", "fieldtype": "Float", "width": 80, "convertible": "qty"},
+		{"label": _("Out Qty"), "fieldname": "out_qty", "fieldtype": "Float", "width": 80, "convertible": "qty"},
+		{"label": _("Balance Qty"), "fieldname": "qty_after_transaction", "fieldtype": "Float", "width": 100, "convertible": "qty"},
+		{"label": _("Finished Product"), "fieldname": "finished_product", "width": 100},
+		{"label": _("Finished Qty"), "fieldname": "finished_qty", "fieldtype": "Float", "width": 100, "convertible": "qty"},
+		{"label": _("Voucher #"), "fieldname": "voucher_no", "fieldtype": "Dynamic Link", "options": "voucher_type", "width": 150},
+		{"label": _("Warehouse"), "fieldname": "warehouse", "fieldtype": "Link", "options": "Warehouse", "width": 150},
 		{"label": _("Item Group"), "fieldname": "item_group", "fieldtype": "Link", "options": "Item Group", "width": 100},
 		{"label": _("Brand"), "fieldname": "brand", "fieldtype": "Link", "options": "Brand", "width": 100},
 		{"label": _("Description"), "fieldname": "description", "width": 200},
-		{"label": _("Warehouse"), "fieldname": "warehouse", "fieldtype": "Link", "options": "Warehouse", "width": 100},
-		{"label": _("Stock UOM"), "fieldname": "stock_uom", "fieldtype": "Link", "options": "UOM", "width": 100},
-		{"label": _("Qty"), "fieldname": "actual_qty", "fieldtype": "Float", "width": 50, "convertible": "qty"},
-		{"label": _("Balance Qty"), "fieldname": "qty_after_transaction", "fieldtype": "Float", "width": 100, "convertible": "qty"},
-		{"label": _("Incoming Rate"), "fieldname": "incoming_rate", "fieldtype": "Currency", "width": 110,
-			"options": "Company:company:default_currency", "convertible": "rate"},
-		{"label": _("Valuation Rate"), "fieldname": "valuation_rate", "fieldtype": "Currency", "width": 110,
-			"options": "Company:company:default_currency", "convertible": "rate"},
-		{"label": _("Balance Value"), "fieldname": "stock_value", "fieldtype": "Currency", "width": 110,
-			"options": "Company:company:default_currency"},
+		{"label": _("Incoming Rate"), "fieldname": "incoming_rate", "fieldtype": "Currency", "width": 110, "options": "Company:company:default_currency", "convertible": "rate"},
+		{"label": _("Valuation Rate"), "fieldname": "valuation_rate", "fieldtype": "Currency", "width": 110, "options": "Company:company:default_currency", "convertible": "rate"},
+		{"label": _("Balance Value"), "fieldname": "stock_value", "fieldtype": "Currency", "width": 110, "options": "Company:company:default_currency"},
 		{"label": _("Voucher Type"), "fieldname": "voucher_type", "width": 110},
 		{"label": _("Voucher #"), "fieldname": "voucher_no", "fieldtype": "Dynamic Link", "options": "voucher_type", "width": 100},
 		{"label": _("Batch"), "fieldname": "batch_no", "fieldtype": "Link", "options": "Batch", "width": 100},
-		{"label": _("Serial #"), "fieldname": "serial_no", "width": 100},
+		{"label": _("Serial #"), "fieldname": "serial_no", "fieldtype": "Link", "options": "Serial No", "width": 100},
 		{"label": _("Project"), "fieldname": "project", "fieldtype": "Link", "options": "Project", "width": 100},
 		{"label": _("Company"), "fieldname": "company", "fieldtype": "Link", "options": "Company", "width": 110}
 	]
 
 	return columns
 
+
 def get_stock_ledger_entries(filters, items):
 	item_conditions_sql = ''
 	if items:
 		item_conditions_sql = 'and sle.item_code in ({})'\
 			.format(', '.join([frappe.db.escape(i) for i in items]))
 
-	return frappe.db.sql("""select concat_ws(" ", posting_date, posting_time) as date,
-			item_code, warehouse, actual_qty, qty_after_transaction, incoming_rate, valuation_rate,
-			stock_value, voucher_type, voucher_no, batch_no, serial_no, company, project, stock_value_difference
-		from `tabStock Ledger Entry` sle
-		where company = %(company)s and
-			posting_date between %(from_date)s and %(to_date)s
-			{sle_conditions}
-			{item_conditions_sql}
-			order by posting_date asc, posting_time asc, creation asc"""\
-		.format(
-			sle_conditions=get_sle_conditions(filters),
-			item_conditions_sql = item_conditions_sql
-		), filters, as_dict=1)
+	sl_entries = frappe.db.sql("""
+		SELECT
+			concat_ws(" ", posting_date, posting_time) AS date,
+			item_code,
+			warehouse,
+			actual_qty,
+			qty_after_transaction,
+			incoming_rate,
+			valuation_rate,
+			stock_value,
+			voucher_type,
+			voucher_no,
+			batch_no,
+			serial_no,
+			company,
+			project,
+			stock_value_difference
+		FROM
+			`tabStock Ledger Entry` sle
+		WHERE
+			company = %(company)s
+				AND posting_date BETWEEN %(from_date)s AND %(to_date)s
+				{sle_conditions}
+				{item_conditions_sql}
+		ORDER BY
+			posting_date asc, posting_time asc, creation asc
+		""".format(sle_conditions=get_sle_conditions(filters), item_conditions_sql=item_conditions_sql),
+		filters, as_dict=1)
+
+	return sl_entries
+
 
 def get_items(filters):
 	conditions = []
@@ -111,6 +149,7 @@ def get_items(filters):
 			.format(" and ".join(conditions)), filters)
 	return items
 
+
 def get_item_details(items, sl_entries, include_uom):
 	item_details = {}
 	if not items:
@@ -140,6 +179,7 @@ def get_item_details(items, sl_entries, include_uom):
 
 	return item_details
 
+
 def get_sle_conditions(filters):
 	conditions = []
 	if filters.get("warehouse"):
@@ -155,6 +195,7 @@ def get_sle_conditions(filters):
 
 	return "and {}".format(" and ".join(conditions)) if conditions else ""
 
+
 def get_opening_balance(filters, columns):
 	if not (filters.item_code and filters.warehouse and filters.from_date):
 		return
@@ -166,13 +207,17 @@ def get_opening_balance(filters, columns):
 		"posting_date": filters.from_date,
 		"posting_time": "00:00:00"
 	})
-	row = {}
-	row["item_code"] = _("'Opening'")
-	for dummy, v in ((9, 'qty_after_transaction'), (11, 'valuation_rate'), (12, 'stock_value')):
-			row[v] = last_entry.get(v, 0)
+
+	row = {
+		"item_code": _("'Opening'"),
+		"qty_after_transaction": last_entry.get("qty_after_transaction", 0),
+		"valuation_rate": last_entry.get("valuation_rate", 0),
+		"stock_value": last_entry.get("stock_value", 0)
+	}
 
 	return row
 
+
 def get_warehouse_condition(warehouse):
 	warehouse_details = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"], as_dict=1)
 	if warehouse_details:
@@ -182,6 +227,7 @@ def get_warehouse_condition(warehouse):
 
 	return ''
 
+
 def get_item_group_condition(item_group):
 	item_group_details = frappe.db.get_value("Item Group", item_group, ["lft", "rgt"], as_dict=1)
 	if item_group_details:

From 312210c2b0bf2dff44c006b26ca1866ae2fe2b5b Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Tue, 13 Aug 2019 17:15:44 +0530
Subject: [PATCH 003/193] feat: create address and contact after lead creation

---
 erpnext/crm/doctype/lead/lead.js   |  55 +++++++-------
 erpnext/crm/doctype/lead/lead.json |  95 +++++++++++++++++-------
 erpnext/crm/doctype/lead/lead.py   | 115 +++++++++++++++++++++++------
 3 files changed, 187 insertions(+), 78 deletions(-)

diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index 122e2b4eee8..0c88d2826f7 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
 frappe.provide("erpnext");
@@ -7,57 +7,54 @@ cur_frm.email_field = "email_id";
 erpnext.LeadController = frappe.ui.form.Controller.extend({
 	setup: function () {
 		this.frm.make_methods = {
+			'Customer': this.make_customer,
 			'Quotation': this.make_quotation,
-			'Opportunity': this.create_opportunity
-		}
-
-		this.frm.fields_dict.customer.get_query = function (doc, cdt, cdn) {
-			return { query: "erpnext.controllers.queries.customer_query" }
-		}
+			'Opportunity': this.make_opportunity
+		};
 
 		this.frm.toggle_reqd("lead_name", !this.frm.doc.organization_lead);
 	},
 
 	onload: function () {
-		if (cur_frm.fields_dict.lead_owner.df.options.match(/^User/)) {
-			cur_frm.fields_dict.lead_owner.get_query = function (doc, cdt, cdn) {
-				return { query: "frappe.core.doctype.user.user.user_query" }
-			}
-		}
+		this.frm.set_query("customer", function (doc, cdt, cdn) {
+			return { query: "erpnext.controllers.queries.customer_query" }
+		});
 
-		if (cur_frm.fields_dict.contact_by.df.options.match(/^User/)) {
-			cur_frm.fields_dict.contact_by.get_query = function (doc, cdt, cdn) {
-				return { query: "frappe.core.doctype.user.user.user_query" }
-			}
-		}
+		this.frm.set_query("lead_owner", function (doc, cdt, cdn) {
+			return { query: "frappe.core.doctype.user.user.user_query" }
+		});
+
+		this.frm.set_query("contact_by", function (doc, cdt, cdn) {
+			return { query: "frappe.core.doctype.user.user.user_query" }
+		});
 	},
 
 	refresh: function () {
-		var doc = this.frm.doc;
+		let doc = this.frm.doc;
 		erpnext.toggle_naming_series();
 		frappe.dynamic_link = { doc: doc, fieldname: 'name', doctype: 'Lead' }
 
-		if(!doc.__islocal && doc.__onload && !doc.__onload.is_customer) {
-			this.frm.add_custom_button(__("Customer"), this.create_customer, __('Create'));
-			this.frm.add_custom_button(__("Opportunity"), this.create_opportunity, __('Create'));
-			this.frm.add_custom_button(__("Quotation"), this.make_quotation, __('Create'));
+		if (!this.frm.is_new() && doc.__onload && !doc.__onload.is_customer) {
+			this.frm.add_custom_button(__("Customer"), this.make_customer, __("Create"));
+			this.frm.add_custom_button(__("Opportunity"), this.make_opportunity, __("Create"));
+			this.frm.add_custom_button(__("Quotation"), this.make_quotation, __("Create"));
 		}
 
-		if (!this.frm.doc.__islocal) {
-			frappe.contacts.render_address_and_contact(cur_frm);
+		if (!this.frm.is_new()) {
+			frappe.contacts.render_address_and_contact(this.frm);
 		} else {
-			frappe.contacts.clear_address_and_contact(cur_frm);
+			frappe.contacts.clear_address_and_contact(this.frm);
 		}
 	},
 
-	create_customer: function () {
+	make_customer: function () {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.crm.doctype.lead.lead.make_customer",
 			frm: cur_frm
 		})
 	},
 
-	create_opportunity: function () {
+	make_opportunity: function () {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.crm.doctype.lead.lead.make_opportunity",
 			frm: cur_frm
@@ -77,7 +74,7 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({
 	},
 
 	company_name: function () {
-		if (this.frm.doc.organization_lead == 1) {
+		if (this.frm.doc.organization_lead && !this.frm.doc.lead_name) {
 			this.frm.set_value("lead_name", this.frm.doc.company_name);
 		}
 	},
@@ -85,7 +82,7 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({
 	contact_date: function () {
 		if (this.frm.doc.contact_date) {
 			let d = moment(this.frm.doc.contact_date);
-			d.add(1, "hours");
+			d.add(1, "day");
 			this.frm.set_value("ends_on", d.format(frappe.defaultDatetimeFormat));
 		}
 	}
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index eb68c679ba5..d2a98b609ac 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -16,6 +16,7 @@
   "col_break123",
   "lead_owner",
   "status",
+  "salutation",
   "gender",
   "source",
   "customer",
@@ -29,16 +30,20 @@
   "notes_section",
   "notes",
   "contact_info",
-  "address_desc",
   "address_html",
+  "address_title",
+  "address_line1",
+  "address_line2",
+  "city",
+  "county",
+  "state",
+  "country",
+  "pincode",
   "column_break2",
   "contact_html",
   "phone",
-  "salutation",
   "mobile_no",
   "fax",
-  "website",
-  "territory",
   "more_info",
   "type",
   "market_segment",
@@ -46,6 +51,8 @@
   "request_type",
   "column_break3",
   "company",
+  "website",
+  "territory",
   "unsubscribed",
   "blog_subscriber"
  ],
@@ -73,7 +80,6 @@
    "set_only_once": 1
   },
   {
-   "depends_on": "eval:!doc.organization_lead",
    "fieldname": "lead_name",
    "fieldtype": "Data",
    "in_global_search": 1,
@@ -130,7 +136,6 @@
    "search_index": 1
   },
   {
-   "depends_on": "eval:!doc.organization_lead",
    "fieldname": "gender",
    "fieldtype": "Link",
    "label": "Gender",
@@ -218,19 +223,13 @@
   },
   {
    "collapsible": 1,
+   "collapsible_depends_on": "eval: doc.__islocal",
    "fieldname": "contact_info",
    "fieldtype": "Section Break",
    "label": "Address & Contact",
    "oldfieldtype": "Column Break",
    "options": "fa fa-map-marker"
   },
-  {
-   "depends_on": "eval:doc.__islocal",
-   "fieldname": "address_desc",
-   "fieldtype": "HTML",
-   "label": "Address Desc",
-   "print_hide": 1
-  },
   {
    "fieldname": "address_html",
    "fieldtype": "HTML",
@@ -242,14 +241,13 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval:doc.organization_lead",
    "fieldname": "contact_html",
    "fieldtype": "HTML",
    "label": "Contact HTML",
    "read_only": 1
   },
   {
-   "depends_on": "eval:!doc.organization_lead",
+   "depends_on": "eval: doc.__islocal",
    "fieldname": "phone",
    "fieldtype": "Data",
    "label": "Phone",
@@ -257,14 +255,14 @@
    "oldfieldtype": "Data"
   },
   {
-   "depends_on": "eval:!doc.organization_lead",
+   "depends_on": "eval: doc.__islocal",
    "fieldname": "salutation",
    "fieldtype": "Link",
    "label": "Salutation",
    "options": "Salutation"
   },
   {
-   "depends_on": "eval:!doc.organization_lead",
+   "depends_on": "eval: doc.__islocal",
    "fieldname": "mobile_no",
    "fieldtype": "Data",
    "label": "Mobile No.",
@@ -272,7 +270,7 @@
    "oldfieldtype": "Data"
   },
   {
-   "depends_on": "eval:!doc.organization_lead",
+   "depends_on": "eval: doc.__islocal",
    "fieldname": "fax",
    "fieldtype": "Data",
    "label": "Fax",
@@ -361,12 +359,62 @@
    "fieldname": "blog_subscriber",
    "fieldtype": "Check",
    "label": "Blog Subscriber"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_title",
+   "fieldtype": "Data",
+   "label": "Address Title"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_line1",
+   "fieldtype": "Data",
+   "label": "Address Line 1"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_line2",
+   "fieldtype": "Data",
+   "label": "Address Line 2"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "city",
+   "fieldtype": "Data",
+   "label": "City/Town"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "county",
+   "fieldtype": "Data",
+   "label": "County"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "state",
+   "fieldtype": "Data",
+   "label": "State"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "country",
+   "fieldtype": "Link",
+   "label": "Country",
+   "options": "Country"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "pincode",
+   "fieldtype": "Data",
+   "label": "Postal Code",
+   "options": "Country"
   }
  ],
  "icon": "fa fa-user",
  "idx": 5,
  "image_field": "image",
- "modified": "2019-09-19 12:49:02.536647",
+ "modified": "2019-09-20 12:49:02.536647",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Lead",
@@ -423,15 +471,6 @@
    "read": 1,
    "report": 1,
    "role": "Sales User"
-  },
-  {
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Guest",
-   "share": 1
   }
  ],
  "search_fields": "lead_name,lead_owner,status",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 1dae4b9fc1c..cc2badf9848 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -2,18 +2,19 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.utils import (cstr, validate_email_address, cint, comma_and, has_gravatar, now, getdate, nowdate)
-from frappe.model.mapper import get_mapped_doc
 
-from erpnext.controllers.selling_controller import SellingController
-from frappe.contacts.address_and_contact import load_address_and_contact
+import frappe
 from erpnext.accounts.party import set_taxes
+from erpnext.controllers.selling_controller import SellingController
+from frappe import _
+from frappe.contacts.address_and_contact import load_address_and_contact
 from frappe.email.inbox import link_communication_to_document
+from frappe.model.mapper import get_mapped_doc
+from frappe.utils import cint, comma_and, cstr, getdate, has_gravatar, nowdate, validate_email_address
 
 sender_field = "email_id"
 
+
 class Lead(SellingController):
 	def get_feed(self):
 		return '{0}: {1}'.format(_(self.status), self.lead_name)
@@ -23,15 +24,22 @@ class Lead(SellingController):
 		self.get("__onload").is_customer = customer
 		load_address_and_contact(self)
 
+	def before_insert(self):
+		self.address_doc = self.create_address()
+		self.contact_doc = self.create_contact()
+
+	def after_insert(self):
+		self.update_links()
+		# after the address and contact are created, flush the field values
+		# to avoid inconsistent reporting in case the documents are changed
+		self.flush_address_and_contact_fields()
+
 	def validate(self):
 		self.set_lead_name()
 		self._prev = frappe._dict({
-			"contact_date": frappe.db.get_value("Lead", self.name, "contact_date") if \
-				(not cint(self.get("__islocal"))) else None,
-			"ends_on": frappe.db.get_value("Lead", self.name, "ends_on") if \
-				(not cint(self.get("__islocal"))) else None,
-			"contact_by": frappe.db.get_value("Lead", self.name, "contact_by") if \
-				(not cint(self.get("__islocal"))) else None,
+			"contact_date": frappe.db.get_value("Lead", self.name, "contact_date") if (not cint(self.is_new())) else None,
+			"ends_on": frappe.db.get_value("Lead", self.name, "ends_on") if (not cint(self.is_new())) else None,
+			"contact_by": frappe.db.get_value("Lead", self.name, "contact_by") if (not cint(self.is_new())) else None,
 		})
 
 		self.set_status()
@@ -39,7 +47,7 @@ class Lead(SellingController):
 
 		if self.email_id:
 			if not self.flags.ignore_email_validation:
-				validate_email_address(self.email_id, True)
+				validate_email_address(self.email_id, throw=True)
 
 			if self.email_id == self.lead_owner:
 				frappe.throw(_("Lead Owner cannot be same as the Lead"))
@@ -53,8 +61,7 @@ class Lead(SellingController):
 		if self.contact_date and getdate(self.contact_date) < getdate(nowdate()):
 			frappe.throw(_("Next Contact Date cannot be in the past"))
 
-		if self.ends_on and self.contact_date and\
-			(self.ends_on < self.contact_date):
+		if self.ends_on and self.contact_date and (self.ends_on < self.contact_date):
 			frappe.throw(_("Ends On date cannot be before Next Contact Date."))
 
 	def on_update(self):
@@ -66,8 +73,7 @@ class Lead(SellingController):
 			"starts_on": self.contact_date,
 			"ends_on": self.ends_on or "",
 			"subject": ('Contact ' + cstr(self.lead_name)),
-			"description": ('Contact ' + cstr(self.lead_name)) + \
-				(self.contact_by and ('. By : ' + cstr(self.contact_by)) or '')
+			"description": ('Contact ' + cstr(self.lead_name)) + (self.contact_by and ('. By : ' + cstr(self.contact_by)) or '')
 		}, force)
 
 	def check_email_id_is_unique(self):
@@ -81,8 +87,7 @@ class Lead(SellingController):
 					.format(comma_and(duplicate_leads)), frappe.DuplicateEntryError)
 
 	def on_trash(self):
-		frappe.db.sql("""update `tabIssue` set lead='' where lead=%s""",
-			self.name)
+		frappe.db.sql("""update `tabIssue` set lead='' where lead=%s""", self.name)
 
 		self.delete_events()
 
@@ -115,10 +120,74 @@ class Lead(SellingController):
 
 			self.lead_name = self.company_name
 
+	def create_address(self):
+		address_fields = ["address_title", "address_line1", "address_line2",
+			"city", "county", "state", "country", "pincode"]
+		info_fields = ["email_id", "phone", "fax"]
+
+		# do not create an address if no fields are available,
+		# skipping country since the system auto-sets it from system defaults
+		if not any([self.get(field) for field in address_fields if field != "country"]):
+			return
+
+		address = frappe.new_doc("Address")
+		address.update({addr_field: self.get(addr_field) for addr_field in address_fields})
+		address.update({info_field: self.get(info_field) for info_field in info_fields})
+		address.insert()
+
+		return address
+
+	def create_contact(self):
+		names = self.lead_name.split(" ")
+		if len(names) > 1:
+			first_name, last_name = names[0], " ".join(names[1:])
+		else:
+			first_name, last_name = self.lead_name, None
+
+		contact_fields = ["email_id", "salutation", "gender", "phone", "mobile_no"]
+
+		contact = frappe.new_doc("Contact")
+		contact.update({contact_field: self.get(contact_field) for contact_field in contact_fields})
+		contact.update({
+			"first_name": first_name,
+			"last_name": last_name
+		})
+		contact.insert()
+
+		return contact
+
+	def update_links(self):
+		# update address links
+		if self.address_doc:
+			self.address_doc.append("links", {
+				"link_doctype": "Lead",
+				"link_name": self.name,
+				"link_title": self.lead_name
+			})
+			self.address_doc.save()
+
+		# update contact links
+		if self.contact_doc:
+			self.contact_doc.append("links", {
+				"link_doctype": "Lead",
+				"link_name": self.name,
+				"link_title": self.lead_name
+			})
+			self.contact_doc.save()
+
+	def flush_address_and_contact_fields(self):
+		fields = ['address_line1', 'address_line2', 'address_title', 'city', 'country',
+			'county', 'fax', 'mobile_no', 'phone', 'pincode', 'salutation', 'state']
+
+		for field in fields:
+			self.set(field, None)
+
+
 @frappe.whitelist()
 def make_customer(source_name, target_doc=None):
 	return _make_customer(source_name, target_doc)
 
+
 def _make_customer(source_name, target_doc=None, ignore_permissions=False):
 	def set_missing_values(source, target):
 		if source.company_name:
@@ -143,6 +212,7 @@ def _make_customer(source_name, target_doc=None, ignore_permissions=False):
 
 	return doclist
 
+
 @frappe.whitelist()
 def make_opportunity(source_name, target_doc=None):
 	def set_missing_values(source, target):
@@ -164,6 +234,7 @@ def make_opportunity(source_name, target_doc=None):
 
 	return target_doc
 
+
 @frappe.whitelist()
 def make_quotation(source_name, target_doc=None):
 	def set_missing_values(source, target):
@@ -205,7 +276,8 @@ def _set_missing_values(source, target):
 
 @frappe.whitelist()
 def get_lead_details(lead, posting_date=None, company=None):
-	if not lead: return {}
+	if not lead:
+		return {}
 
 	from erpnext.accounts.party import set_address_details
 	out = frappe._dict()
@@ -231,6 +303,7 @@ def get_lead_details(lead, posting_date=None, company=None):
 
 	return out
 
+
 @frappe.whitelist()
 def make_lead_from_communication(communication, ignore_communication_links=False):
 	""" raise a issue from email """
@@ -267,4 +340,4 @@ def get_lead_with_phone_number(number):
 
 	lead = leads[0].name if leads else None
 
-	return lead
\ No newline at end of file
+	return lead

From f9e2bfcc2940c90868941cfd84548f8e301c4d49 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Thu, 22 Aug 2019 15:03:34 +0530
Subject: [PATCH 004/193] fix: conditionally set lead title as organization or
 person

---
 erpnext/crm/doctype/lead/lead.json | 12 ++++++++++--
 erpnext/crm/doctype/lead/lead.py   |  7 +++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index d2a98b609ac..88a562f720b 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -54,7 +54,8 @@
   "website",
   "territory",
   "unsubscribed",
-  "blog_subscriber"
+  "blog_subscriber",
+  "title"
  ],
  "fields": [
   {
@@ -409,6 +410,13 @@
    "fieldtype": "Data",
    "label": "Postal Code",
    "options": "Country"
+  },
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Title",
+   "print_hide": 1
   }
  ],
  "icon": "fa fa-user",
@@ -477,5 +485,5 @@
  "show_name_in_global_search": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "title_field": "lead_name"
+ "title_field": "title"
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index cc2badf9848..9e5fdc0e120 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -36,6 +36,7 @@ class Lead(SellingController):
 
 	def validate(self):
 		self.set_lead_name()
+		self.set_title()
 		self._prev = frappe._dict({
 			"contact_date": frappe.db.get_value("Lead", self.name, "contact_date") if (not cint(self.is_new())) else None,
 			"ends_on": frappe.db.get_value("Lead", self.name, "ends_on") if (not cint(self.is_new())) else None,
@@ -120,6 +121,12 @@ class Lead(SellingController):
 
 			self.lead_name = self.company_name
 
+	def set_title(self):
+		if self.organization_lead:
+			self.title = self.company_name
+		else:
+			self.title = self.lead_name
+
 	def create_address(self):
 		address_fields = ["address_title", "address_line1", "address_line2",
 			"city", "county", "state", "country", "pincode"]

From 75da5af900cb49e509a63433e89830cbb58bd561 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Thu, 22 Aug 2019 15:38:44 +0530
Subject: [PATCH 005/193] fix: set missing values

---
 erpnext/crm/doctype/lead/lead.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 9e5fdc0e120..bd0c742aa2d 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -145,6 +145,9 @@ class Lead(SellingController):
 		return address
 
 	def create_contact(self):
+		if not self.lead_name:
+			self.set_lead_name()
+
 		names = self.lead_name.split(" ")
 		if len(names) > 1:
 			first_name, last_name = names[0], " ".join(names[1:])

From 69e3868a9dfcaf02c61defac58df8d39cbf1cb51 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Fri, 6 Sep 2019 13:38:15 +0530
Subject: [PATCH 006/193] patch: set title for old leads

---
 erpnext/patches.txt                           |  3 ++-
 erpnext/patches/v12_0/set_lead_title_field.py | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 erpnext/patches/v12_0/set_lead_title_field.py

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 07b646b0f82..0495c027523 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -646,4 +646,5 @@ erpnext.patches.v12_0.set_payment_entry_status
 erpnext.patches.v12_0.update_owner_fields_in_acc_dimension_custom_fields
 erpnext.patches.v12_0.set_default_for_add_taxes_from_item_tax_template
 erpnext.patches.v12_0.remove_denied_leaves_from_leave_ledger
-erpnext.patches.v12_0.update_price_or_product_discount
\ No newline at end of file
+erpnext.patches.v12_0.update_price_or_product_discount
+erpnext.patches.v12_0.set_lead_title_field
diff --git a/erpnext/patches/v12_0/set_lead_title_field.py b/erpnext/patches/v12_0/set_lead_title_field.py
new file mode 100644
index 00000000000..86e00038f6c
--- /dev/null
+++ b/erpnext/patches/v12_0/set_lead_title_field.py
@@ -0,0 +1,11 @@
+import frappe
+
+
+def execute():
+	frappe.reload_doc("crm", "doctype", "lead")
+	frappe.db.sql("""
+		UPDATE
+			`tabLead`
+		SET
+			title = IF(organization_lead = 1, company_name, lead_name)
+	""")

From fd46fef857b578515db6d12245d8f01895dc00b1 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Fri, 6 Sep 2019 14:10:20 +0530
Subject: [PATCH 007/193] fix: add designation to Lead

---
 erpnext/crm/doctype/lead/lead.json | 153 +++++++++++++++--------------
 erpnext/crm/doctype/lead/lead.py   |   4 +-
 2 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 88a562f720b..c8e9fbc463e 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -17,6 +17,7 @@
   "lead_owner",
   "status",
   "salutation",
+  "designation",
   "gender",
   "source",
   "customer",
@@ -136,6 +137,13 @@
    "reqd": 1,
    "search_index": 1
   },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "salutation",
+   "fieldtype": "Link",
+   "label": "Salutation",
+   "options": "Salutation"
+  },
   {
    "fieldname": "gender",
    "fieldtype": "Link",
@@ -237,6 +245,56 @@
    "label": "Address HTML",
    "read_only": 1
   },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_title",
+   "fieldtype": "Data",
+   "label": "Address Title"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_line1",
+   "fieldtype": "Data",
+   "label": "Address Line 1"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "address_line2",
+   "fieldtype": "Data",
+   "label": "Address Line 2"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "city",
+   "fieldtype": "Data",
+   "label": "City/Town"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "county",
+   "fieldtype": "Data",
+   "label": "County"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "state",
+   "fieldtype": "Data",
+   "label": "State"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "country",
+   "fieldtype": "Link",
+   "label": "Country",
+   "options": "Country"
+  },
+  {
+   "depends_on": "eval: doc.__islocal",
+   "fieldname": "pincode",
+   "fieldtype": "Data",
+   "label": "Postal Code",
+   "options": "Country"
+  },
   {
    "fieldname": "column_break2",
    "fieldtype": "Column Break"
@@ -255,13 +313,6 @@
    "oldfieldname": "contact_no",
    "oldfieldtype": "Data"
   },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "salutation",
-   "fieldtype": "Link",
-   "label": "Salutation",
-   "options": "Salutation"
-  },
   {
    "depends_on": "eval: doc.__islocal",
    "fieldname": "mobile_no",
@@ -278,22 +329,6 @@
    "oldfieldname": "fax",
    "oldfieldtype": "Data"
   },
-  {
-   "fieldname": "website",
-   "fieldtype": "Data",
-   "label": "Website",
-   "oldfieldname": "website",
-   "oldfieldtype": "Data"
-  },
-  {
-   "fieldname": "territory",
-   "fieldtype": "Link",
-   "label": "Territory",
-   "oldfieldname": "territory",
-   "oldfieldtype": "Link",
-   "options": "Territory",
-   "print_hide": 1
-  },
   {
    "collapsible": 1,
    "fieldname": "more_info",
@@ -349,6 +384,22 @@
    "options": "Company",
    "remember_last_selected_value": 1
   },
+  {
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "label": "Website",
+   "oldfieldname": "website",
+   "oldfieldtype": "Data"
+  },
+  {
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "label": "Territory",
+   "oldfieldname": "territory",
+   "oldfieldtype": "Link",
+   "options": "Territory",
+   "print_hide": 1
+  },
   {
    "default": "0",
    "fieldname": "unsubscribed",
@@ -361,62 +412,18 @@
    "fieldtype": "Check",
    "label": "Blog Subscriber"
   },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "address_title",
-   "fieldtype": "Data",
-   "label": "Address Title"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "address_line1",
-   "fieldtype": "Data",
-   "label": "Address Line 1"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "address_line2",
-   "fieldtype": "Data",
-   "label": "Address Line 2"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "city",
-   "fieldtype": "Data",
-   "label": "City/Town"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "county",
-   "fieldtype": "Data",
-   "label": "County"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "state",
-   "fieldtype": "Data",
-   "label": "State"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "country",
-   "fieldtype": "Link",
-   "label": "Country",
-   "options": "Country"
-  },
-  {
-   "depends_on": "eval: doc.__islocal",
-   "fieldname": "pincode",
-   "fieldtype": "Data",
-   "label": "Postal Code",
-   "options": "Country"
-  },
   {
    "fieldname": "title",
    "fieldtype": "Data",
    "hidden": 1,
    "label": "Title",
    "print_hide": 1
+  },
+  {
+   "fieldname": "designation",
+   "fieldtype": "Link",
+   "label": "Designation",
+   "options": "Designation"
   }
  ],
  "icon": "fa fa-user",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index bd0c742aa2d..c0416092b1a 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -154,7 +154,7 @@ class Lead(SellingController):
 		else:
 			first_name, last_name = self.lead_name, None
 
-		contact_fields = ["email_id", "salutation", "gender", "phone", "mobile_no"]
+		contact_fields = ["email_id", "salutation", "gender", "designation", "phone", "mobile_no"]
 
 		contact = frappe.new_doc("Contact")
 		contact.update({contact_field: self.get(contact_field) for contact_field in contact_fields})
@@ -187,7 +187,7 @@ class Lead(SellingController):
 
 	def flush_address_and_contact_fields(self):
 		fields = ['address_line1', 'address_line2', 'address_title', 'city', 'country',
-			'county', 'fax', 'mobile_no', 'phone', 'pincode', 'salutation', 'state']
+			'county', 'fax', 'mobile_no', 'phone', 'pincode', 'state']
 
 		for field in fields:
 			self.set(field, None)

From c59ac36378fb720b6bd8562c004ae53fbed1beb7 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Wed, 18 Sep 2019 13:46:22 +0530
Subject: [PATCH 008/193] fix: use new Contact schema

---
 erpnext/crm/doctype/lead/lead.json |  9 +++++++++
 erpnext/crm/doctype/lead/lead.py   | 31 ++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index c8e9fbc463e..2219307caf4 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -486,6 +486,15 @@
    "read": 1,
    "report": 1,
    "role": "Sales User"
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Guest",
+   "share": 1
   }
  ],
  "search_fields": "lead_name,lead_owner,status",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index c0416092b1a..6645c4d0019 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -80,8 +80,8 @@ class Lead(SellingController):
 	def check_email_id_is_unique(self):
 		if self.email_id:
 			# validate email is unique
-			duplicate_leads = frappe.db.sql_list("""select name from tabLead
-				where email_id=%s and name!=%s""", (self.email_id, self.name))
+			duplicate_leads = frappe.get_all("Lead", filters={"email_id": self.email_id, "name": ["!=", self.name]})
+			duplicate_leads = [lead.name for lead in duplicate_leads]
 
 			if duplicate_leads:
 				frappe.throw(_("Email Address must be unique, already exists for {0}")
@@ -154,13 +154,28 @@ class Lead(SellingController):
 		else:
 			first_name, last_name = self.lead_name, None
 
-		contact_fields = ["email_id", "salutation", "gender", "designation", "phone", "mobile_no"]
-
 		contact = frappe.new_doc("Contact")
-		contact.update({contact_field: self.get(contact_field) for contact_field in contact_fields})
 		contact.update({
 			"first_name": first_name,
-			"last_name": last_name
+			"last_name": last_name,
+			"salutation": self.salutation,
+			"gender": self.gender,
+			"designation": self.designation,
+			"email_ids": [
+				{
+					"email_id": self.email_id,
+					"is_primary": 1
+				}
+			],
+			"phone_nos": [
+				{
+					"phone": self.phone,
+					"is_primary": 1
+				},
+				{
+					"phone": self.mobile_no,
+				}
+			]
 		})
 		contact.insert()
 
@@ -186,8 +201,8 @@ class Lead(SellingController):
 			self.contact_doc.save()
 
 	def flush_address_and_contact_fields(self):
-		fields = ['address_line1', 'address_line2', 'address_title', 'city', 'country',
-			'county', 'fax', 'mobile_no', 'phone', 'pincode', 'state']
+		fields = ['address_line1', 'address_line2', 'address_title',
+			'city', 'county', 'country', 'fax', 'pincode', 'state']
 
 		for field in fields:
 			self.set(field, None)

From 236140d94ccf4b836933b88023f3c3b70535349b Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Thu, 28 Nov 2019 16:36:24 +0530
Subject: [PATCH 009/193] fix: Division by zero error in Stock Entry

---
 erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index f81fa683ba5..2b99f72565c 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -657,7 +657,7 @@ class StockEntry(StockController):
 					item_account_wise_additional_cost.setdefault((d.item_code, d.name), {})
 					item_account_wise_additional_cost[(d.item_code, d.name)].setdefault(t.expense_account, 0.0)
 					item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account] += \
-						(t.amount * d.basic_amount) / total_basic_amount
+						(t.amount * d.basic_amount) / total_basic_amount if total_basic_amount else 0
 
 		if item_account_wise_additional_cost:
 			for d in self.get("items"):

From 8287c3d05a67065c1e494d3679fc2e9c6ab13cb0 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 29 Nov 2019 15:52:29 +0530
Subject: [PATCH 010/193] feat(marketplace): unpublish item from hub

---
 erpnext/hub_node/api.py              | 19 ++++++++++++++++++-
 erpnext/public/js/hub/pages/Item.vue | 16 +++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
index 0d01c67650b..b0b00b2b469 100644
--- a/erpnext/hub_node/api.py
+++ b/erpnext/hub_node/api.py
@@ -70,7 +70,7 @@ def map_fields(items):
 	field_mappings = get_field_mappings()
 	table_fields = [d.fieldname for d in frappe.get_meta('Item').get_table_fields()]
 
-	hub_seller_name = frappe.db.get_value('Marketplace Settings' , 'Marketplace Settings', 'hub_seller_name')
+	hub_seller_name = frappe.db.get_value('Marketplace Settings', 'Marketplace Settings', 'hub_seller_name')
 
 	for item in items:
 		for fieldname in table_fields:
@@ -147,6 +147,23 @@ def publish_selected_items(items_to_publish):
 	except Exception as e:
 		frappe.log_error(message=e, title='Hub Sync Error')
 
+@frappe.whitelist()
+def unpublish_item(item):
+	''' Remove item listing from the marketplace '''
+	item = json.loads(item)
+
+	item_code = item.get('item_code')
+	frappe.db.set_value('Item', item_code, 'publish_in_hub', 0)
+
+	item = map_fields([item])[0]
+
+	try:
+		connection = get_hub_connection()
+		connection.set_value('Hub Item', item.get('name'), 'published', 0)
+
+	except Exception as e:
+		frappe.log_error(message=e, title='Hub Sync Error')
+
 @frappe.whitelist()
 def get_unregistered_users():
 	settings = frappe.get_single('Marketplace Settings')
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
index 841d0046db8..285f6969268 100644
--- a/erpnext/public/js/hub/pages/Item.vue
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -300,7 +300,21 @@ export default {
 		},
 
 		unpublish_item() {
-			frappe.msgprint(__('This feature is under development...'));
+			let me = this;
+			frappe.confirm(__(`Unpublish ${this.item.item_name}?`), function () {
+				frappe.call(
+					'erpnext.hub_node.api.unpublish_item',
+					{
+						item: me.item
+					}
+				)
+				.then((r) => {
+					frappe.set_route(`marketplace/home`);
+					frappe.show_alert(__('Item listing removed'))
+
+				})
+				
+			})
 		}
 	}
 }

From c131bd1b257ddd13fef98ef0527da63ae86e1255 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 2 Dec 2019 01:09:59 +0530
Subject: [PATCH 011/193] feat(marketplace): edit item dialog

---
 .../js/hub/components/edit_details_dialog.js  | 45 +++++++++++++++++++
 erpnext/public/js/hub/pages/Item.vue          | 37 ++++++++++++++-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 erpnext/public/js/hub/components/edit_details_dialog.js

diff --git a/erpnext/public/js/hub/components/edit_details_dialog.js b/erpnext/public/js/hub/components/edit_details_dialog.js
new file mode 100644
index 00000000000..b341901fece
--- /dev/null
+++ b/erpnext/public/js/hub/components/edit_details_dialog.js
@@ -0,0 +1,45 @@
+function EditDetailsDialog(primary_action, defaults) {
+	let dialog = new frappe.ui.Dialog({
+		title: __('Update Details'),
+		fields: [
+			{
+				"label": "Item Name",
+				"fieldname": "item_name",
+				"fieldtype": "Data",
+				"default": defaults.item_name,
+				"reqd": 1
+			},
+			{
+				"label": "Hub Category",
+				"fieldname": "hub_category",
+				"fieldtype": "Autocomplete",
+				"default": defaults.hub_category,
+				"options": [],
+				"reqd": 1
+			},
+			{
+				"label": "Description",
+				"fieldname": "description",
+				"fieldtype": "Text",
+				"default": defaults.description,
+				"options": [],
+				"reqd": 1
+			}
+		],
+		primary_action_label: primary_action.label || __('Update Details'),
+		primary_action: primary_action.fn,
+	});
+
+	hub.call('get_categories')
+		.then(categories => {
+			categories = categories.map(d => d.name);
+			dialog.fields_dict.hub_category.df.options = categories;
+			dialog.fields_dict.hub_category.set_options();
+		});
+
+	return dialog;
+}
+
+export {
+	EditDetailsDialog
+};
\ No newline at end of file
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
index 841d0046db8..b8399e30d6d 100644
--- a/erpnext/public/js/hub/pages/Item.vue
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -35,6 +35,7 @@
 <script>
 import ReviewArea from '../components/ReviewArea.vue';
 import { get_rating_html } from '../components/reviews';
+import { EditDetailsDialog } from '../components/edit_details_dialog';
 
 export default {
 	name: 'item-page',
@@ -200,6 +201,7 @@ export default {
 		make_dialogs() {
 			this.make_contact_seller_dialog();
 			this.make_report_item_dialog();
+			this.make_editing_dialog();
 		},
 
 		add_to_saved_items() {
@@ -284,6 +286,36 @@ export default {
 			});
 		},
 
+		make_editing_dialog() {
+			this.edit_details_dialog = EditDetailsDialog(
+				{
+					fn: (values) => {
+						this.update_details(values);
+						this.edit_details_dialog.hide();
+					}
+				}, {
+						'item_name': this.item.item_name,
+						'hub_category': this.item.hub_category,
+						'description': this.item.description,
+				}
+			);
+		},
+
+		update_details(values) {
+			frappe.call(
+				'erpnext.hub_node.api.update_item',
+				{
+					ref_doctype: 'Hub Item',
+					ref_doc: this.item.name,
+					data: values
+				}
+			)
+			.then((r) => {
+				this.get_item_details();
+				frappe.show_alert(__(`${this.item.item_name} Updated`));
+			})
+		},
+
 		contact_seller() {
 			this.contact_seller_dialog.show();
 		},
@@ -296,7 +328,10 @@ export default {
 		},
 
 		edit_details() {
-			frappe.msgprint(__('This feature is under development...'));
+			if (!hub.is_seller_registered()) {
+				frappe.throw(__('Please login as a Marketplace User to edit this item.'));
+			}
+			this.edit_details_dialog.show();
 		},
 
 		unpublish_item() {

From fa170e3c8455b16fc8aac02a8d7adbd742378cf8 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 4 Dec 2019 15:59:17 +0530
Subject: [PATCH 012/193] fix(marketplace): add watcher for route change to
 fetch new items

---
 erpnext/public/js/hub/pages/Home.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/erpnext/public/js/hub/pages/Home.vue b/erpnext/public/js/hub/pages/Home.vue
index 353656957df..84a42367b22 100644
--- a/erpnext/public/js/hub/pages/Home.vue
+++ b/erpnext/public/js/hub/pages/Home.vue
@@ -58,6 +58,11 @@ export default {
 		this.search_value = '';
 		this.get_items();
 	},
+	watch:{
+		$route (to, from){
+			this.get_items()
+		}
+	},
 	methods: {
 		get_items() {
 			hub.call('get_data_for_homepage', frappe.defaults ? {

From 6d4f4bef7ebd44d8579f9915de6a6f74e1802408 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 5 Dec 2019 01:01:01 +0530
Subject: [PATCH 013/193] fix(marketplace): autocomplete hub category

---
 erpnext/public/js/hub/components/item_publish_dialog.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/public/js/hub/components/item_publish_dialog.js b/erpnext/public/js/hub/components/item_publish_dialog.js
index e49ba539185..05eaffd1c53 100644
--- a/erpnext/public/js/hub/components/item_publish_dialog.js
+++ b/erpnext/public/js/hub/components/item_publish_dialog.js
@@ -31,7 +31,8 @@ function ItemPublishDialog(primary_action, secondary_action) {
 	hub.call('get_categories')
 		.then(categories => {
 			categories = categories.map(d => d.name);
-			dialog.fields_dict.hub_category.set_data(categories);
+			dialog.fields_dict.hub_category.df.options = categories;
+			dialog.fields_dict.hub_category.set_options();
 		});
 
 	return dialog;

From 015038236c0e2e96486eb315862c9e865075900c Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 5 Dec 2019 02:10:57 +0530
Subject: [PATCH 014/193] fix: update hub item document

---
 erpnext/hub_node/api.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
index 0d01c67650b..602d65e81a1 100644
--- a/erpnext/hub_node/api.py
+++ b/erpnext/hub_node/api.py
@@ -115,6 +115,16 @@ def get_valid_items(search_value=''):
 
 	return valid_items
 
+@frappe.whitelist()
+def update_item(ref_doctype, ref_doc, data):
+	data = json.loads(data)
+
+	data.update(dict(doctype=ref_doctype, name=ref_doc))
+	try:
+		connection = get_hub_connection()
+		connection.update(data)
+	except Exception as e:
+		frappe.log_error(message=e, title='Hub Sync Error')
 
 @frappe.whitelist()
 def publish_selected_items(items_to_publish):

From d249d4c94789416ad6999af7c95906ec983146b7 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 9 Dec 2019 15:44:31 +0530
Subject: [PATCH 015/193] style: change formatting

---
 .../js/hub/components/item_publish_dialog.js  |  42 ++---
 erpnext/public/js/hub/pages/Item.vue          | 169 +++++++++---------
 2 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/erpnext/public/js/hub/components/item_publish_dialog.js b/erpnext/public/js/hub/components/item_publish_dialog.js
index 05eaffd1c53..08de5b30b6c 100644
--- a/erpnext/public/js/hub/components/item_publish_dialog.js
+++ b/erpnext/public/js/hub/components/item_publish_dialog.js
@@ -3,24 +3,24 @@ function ItemPublishDialog(primary_action, secondary_action) {
 		title: __('Edit Publishing Details'),
 		fields: [
 			{
-				"label": "Item Code",
-				"fieldname": "item_code",
-				"fieldtype": "Data",
-				"read_only": 1
+				label: __('Item Code'),
+				fieldname: 'item_code',
+				fieldtype: 'Data',
+				read_only: 1
 			},
 			{
-				"label": "Hub Category",
-				"fieldname": "hub_category",
-				"fieldtype": "Autocomplete",
-				"options": [],
-				"reqd": 1
+				label: __('Hub Category'),
+				fieldname: 'hub_category',
+				fieldtype: 'Autocomplete',
+				options: [],
+				reqd: 1
 			},
 			{
-				"label": "Images",
-				"fieldname": "image_list",
-				"fieldtype": "MultiSelect",
-				"options": [],
-				"reqd": 1
+				label: __('Images'),
+				fieldname: 'image_list',
+				fieldtype: 'MultiSelect',
+				options: [],
+				reqd: 1
 			}
 		],
 		primary_action_label: primary_action.label || __('Set Details'),
@@ -28,16 +28,12 @@ function ItemPublishDialog(primary_action, secondary_action) {
 		secondary_action: secondary_action.fn
 	});
 
-	hub.call('get_categories')
-		.then(categories => {
-			categories = categories.map(d => d.name);
-			dialog.fields_dict.hub_category.df.options = categories;
-			dialog.fields_dict.hub_category.set_options();
-		});
+	hub.call('get_categories').then(categories => {
+		categories = categories.map(d => d.name);
+		dialog.fields_dict.hub_category.set_data(categories);
+	});
 
 	return dialog;
 }
 
-export {
-	ItemPublishDialog
-}
+export { ItemPublishDialog };
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
index 285f6969268..e4b0eeaecb5 100644
--- a/erpnext/public/js/hub/pages/Item.vue
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -1,10 +1,5 @@
 <template>
-	<div
-		class="marketplace-page"
-		:data-page-name="page_name"
-		v-if="init || item"
-	>
-
+	<div class="marketplace-page" :data-page-name="page_name" v-if="init || item">
 		<detail-view
 			:title="title"
 			:image="image"
@@ -12,20 +7,15 @@
 			:menu_items="menu_items"
 			:show_skeleton="init"
 		>
-			<detail-header-item slot="detail-header-item"
-				:value="item_subtitle"
-			></detail-header-item>
-			<detail-header-item slot="detail-header-item"
-				:value="item_views_and_ratings"
-			></detail-header-item>
+			<detail-header-item slot="detail-header-item" :value="item_subtitle"></detail-header-item>
+			<detail-header-item slot="detail-header-item" :value="item_views_and_ratings"></detail-header-item>
 
-			<button v-if="primary_action" slot="detail-header-item"
+			<button
+				v-if="primary_action"
+				slot="detail-header-item"
 				class="btn btn-primary btn-sm margin-top"
 				@click="primary_action.action"
-			>
-				{{ primary_action.label }}
-			</button>
-
+			>{{ primary_action.label }}</button>
 		</detail-view>
 
 		<review-area v-if="!init" :hub_item_name="hub_item_name"></review-area>
@@ -51,21 +41,20 @@ export default {
 			item: null,
 			title: null,
 			image: null,
-			sections: [],
-
+			sections: []
 		};
 	},
 	computed: {
 		is_own_item() {
 			let is_own_item = false;
-			if(this.item) {
-				if(this.item.hub_seller === hub.settings.hub_seller_name) {
+			if (this.item) {
+				if (this.item.hub_seller === hub.settings.hub_seller_name) {
 					is_own_item = true;
 				}
 			}
 			return is_own_item;
 		},
-		menu_items(){
+		menu_items() {
 			return [
 				{
 					label: __('Save Item'),
@@ -92,11 +81,11 @@ export default {
 					condition: hub.is_user_registered() && this.is_own_item,
 					action: this.unpublish_item
 				}
-			]
+			];
 		},
 
 		item_subtitle() {
-			if(!this.item) {
+			if (!this.item) {
 				return '';
 			}
 
@@ -105,25 +94,31 @@ export default {
 			const rating = this.item.average_rating;
 
 			if (rating > 0) {
-				subtitle_items.push(rating + `<i class='fa fa-fw fa-star-o'></i>`)
+				subtitle_items.push(rating + `<i class='fa fa-fw fa-star-o'></i>`);
 			}
 
-			subtitle_items.push({value:this.item.company,on_click:this.go_to_seller_profile_page});
+			subtitle_items.push({
+				value: this.item.company,
+				on_click: this.go_to_seller_profile_page
+			});
 
 			return subtitle_items;
 		},
 
 		item_views_and_ratings() {
-			if(!this.item) {
+			if (!this.item) {
 				return '';
 			}
 
 			let stats = __('No views yet');
-			if(this.item.view_count) {
+			if (this.item.view_count) {
 				const views_message = __(`${this.item.view_count} Views`);
 
 				const rating_html = get_rating_html(this.item.average_rating);
-				const rating_count = this.item.no_of_ratings > 0 ? `${this.item.no_of_ratings} reviews` : __('No reviews yet');
+				const rating_count =
+					this.item.no_of_ratings > 0
+						? `${this.item.no_of_ratings} reviews`
+						: __('No reviews yet');
 
 				stats = [views_message, rating_html, rating_count];
 			}
@@ -136,7 +131,7 @@ export default {
 				return {
 					label: __('Contact Seller'),
 					action: this.contact_seller.bind(this)
-				}
+				};
 			} else {
 				return undefined;
 			}
@@ -156,7 +151,7 @@ export default {
 			setTimeout(() => {
 				hub.call('add_item_view', {
 					hub_item_name: this.hub_item_name
-				})
+				});
 				// .then(() => {
 				// 	erpnext.hub.item_view_cache.push(this.hub_item_name);
 				// });
@@ -165,14 +160,15 @@ export default {
 	},
 	methods: {
 		get_item_details() {
-			this.item_received = hub.call('get_item_details', { hub_item_name: this.hub_item_name })
+			this.item_received = hub
+				.call('get_item_details', { hub_item_name: this.hub_item_name })
 				.then(item => {
-				this.init = false;
-				this.item = item;
+					this.init = false;
+					this.item = item;
 
-				this.build_data();
-				this.make_dialogs();
-			});
+					this.build_data();
+					this.make_dialogs();
+				});
 		},
 		go_to_seller_profile_page(seller_name) {
 			frappe.set_route(`marketplace/seller/${seller_name}`);
@@ -203,33 +199,39 @@ export default {
 		},
 
 		add_to_saved_items() {
-			hub.call('add_item_to_user_saved_items', {
-				hub_item_name: this.hub_item_name,
-				hub_user: frappe.session.user
-			})
-			.then(() => {
-				const saved_items_link = `<b><a href="#marketplace/saved-items">${__('Saved')}</a></b>`
-				frappe.show_alert(saved_items_link);
-				erpnext.hub.trigger('action:item_save');
-			})
-			.catch(e => {
-				console.error(e);
-			});
+			hub
+				.call('add_item_to_user_saved_items', {
+					hub_item_name: this.hub_item_name,
+					hub_user: frappe.session.user
+				})
+				.then(() => {
+					const saved_items_link = `<b><a href="#marketplace/saved-items">${__(
+						'Saved'
+					)}</a></b>`;
+					frappe.show_alert(saved_items_link);
+					erpnext.hub.trigger('action:item_save');
+				})
+				.catch(e => {
+					console.error(e);
+				});
 		},
 
 		add_to_featured_items() {
-			hub.call('add_item_to_seller_featured_items', {
-				hub_item_name: this.hub_item_name,
-				hub_user: frappe.session.user
-			},)
-			.then(() => {
-				const featured_items_link = `<b><a href="#marketplace/featured-items">${__('Added to Featured Items')}</a></b>`
-				frappe.show_alert(featured_items_link);
-				erpnext.hub.trigger('action:item_feature');
-			})
-			.catch(e => {
-				console.error(e);
-			});
+			hub
+				.call('add_item_to_seller_featured_items', {
+					hub_item_name: this.hub_item_name,
+					hub_user: frappe.session.user
+				})
+				.then(() => {
+					const featured_items_link = `<b><a href="#marketplace/featured-items">${__(
+						'Added to Featured Items'
+					)}</a></b>`;
+					frappe.show_alert(featured_items_link);
+					erpnext.hub.trigger('action:item_feature');
+				})
+				.catch(e => {
+					console.error(e);
+				});
 		},
 
 		make_contact_seller_dialog() {
@@ -251,14 +253,15 @@ export default {
 				primary_action: ({ message }) => {
 					if (!message) return;
 
-					hub.call('send_message', {
-						hub_item: this.item.name,
-						message
-					})
+					hub
+						.call('send_message', {
+							hub_item: this.item.name,
+							message
+						})
 						.then(() => {
 							this.contact_seller_dialog.hide();
 							frappe.set_route('marketplace', 'buying', this.item.name);
-							erpnext.hub.trigger('action:send_message')
+							erpnext.hub.trigger('action:send_message');
 						});
 				}
 			});
@@ -275,7 +278,11 @@ export default {
 					}
 				],
 				primary_action: ({ message }) => {
-					hub.call('add_reported_item', { hub_item_name: this.item.name, message })
+					hub
+						.call('add_reported_item', {
+							hub_item_name: this.item.name,
+							message
+						})
 						.then(() => {
 							d.hide();
 							frappe.show_alert(__('Item Reported'));
@@ -290,7 +297,9 @@ export default {
 
 		report_item() {
 			if (!hub.is_seller_registered()) {
-				frappe.throw(__('Please login as a Marketplace User to report this item.'));
+				frappe.throw(
+					__('Please login as a Marketplace User to report this item.')
+				);
 			}
 			this.report_item_dialog.show();
 		},
@@ -301,23 +310,19 @@ export default {
 
 		unpublish_item() {
 			let me = this;
-			frappe.confirm(__(`Unpublish ${this.item.item_name}?`), function () {
-				frappe.call(
-					'erpnext.hub_node.api.unpublish_item',
-					{
+			frappe.confirm(__(`Unpublish ${this.item.item_name}?`), function() {
+				frappe
+					.call('erpnext.hub_node.api.unpublish_item', {
 						item: me.item
-					}
-				)
-				.then((r) => {
-					frappe.set_route(`marketplace/home`);
-					frappe.show_alert(__('Item listing removed'))
-
-				})
-				
-			})
+					})
+					.then(r => {
+						frappe.set_route(`marketplace/home`);
+						frappe.show_alert(__('Item listing removed'));
+					});
+			});
 		}
 	}
-}
+};
 </script>
 
 <style scoped></style>

From ba48546678245b28d48880add9062494c8c3b8ed Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 9 Dec 2019 16:31:14 +0530
Subject: [PATCH 016/193] fix: display new item value

---
 .../js/hub/components/edit_details_dialog.js  | 50 +++++++++----------
 erpnext/public/js/hub/pages/Item.vue          |  4 +-
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/erpnext/public/js/hub/components/edit_details_dialog.js b/erpnext/public/js/hub/components/edit_details_dialog.js
index b341901fece..e249ca5d7a4 100644
--- a/erpnext/public/js/hub/components/edit_details_dialog.js
+++ b/erpnext/public/js/hub/components/edit_details_dialog.js
@@ -3,43 +3,39 @@ function EditDetailsDialog(primary_action, defaults) {
 		title: __('Update Details'),
 		fields: [
 			{
-				"label": "Item Name",
-				"fieldname": "item_name",
-				"fieldtype": "Data",
-				"default": defaults.item_name,
-				"reqd": 1
+				label: 'Item Name',
+				fieldname: 'item_name',
+				fieldtype: 'Data',
+				default: defaults.item_name,
+				reqd: 1
 			},
 			{
-				"label": "Hub Category",
-				"fieldname": "hub_category",
-				"fieldtype": "Autocomplete",
-				"default": defaults.hub_category,
-				"options": [],
-				"reqd": 1
+				label: 'Hub Category',
+				fieldname: 'hub_category',
+				fieldtype: 'Autocomplete',
+				default: defaults.hub_category,
+				options: [],
+				reqd: 1
 			},
 			{
-				"label": "Description",
-				"fieldname": "description",
-				"fieldtype": "Text",
-				"default": defaults.description,
-				"options": [],
-				"reqd": 1
+				label: 'Description',
+				fieldname: 'description',
+				fieldtype: 'Text',
+				default: defaults.description,
+				options: [],
+				reqd: 1
 			}
 		],
 		primary_action_label: primary_action.label || __('Update Details'),
-		primary_action: primary_action.fn,
+		primary_action: primary_action.fn
 	});
 
-	hub.call('get_categories')
-		.then(categories => {
-			categories = categories.map(d => d.name);
-			dialog.fields_dict.hub_category.df.options = categories;
-			dialog.fields_dict.hub_category.set_options();
-		});
+	hub.call('get_categories').then(categories => {
+		categories = categories.map(d => d.name);
+		dialog.fields_dict.hub_category.set_data(categories);
+	});
 
 	return dialog;
 }
 
-export {
-	EditDetailsDialog
-};
\ No newline at end of file
+export { EditDetailsDialog };
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
index b8399e30d6d..31cc8d5c8cf 100644
--- a/erpnext/public/js/hub/pages/Item.vue
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -311,7 +311,9 @@ export default {
 				}
 			)
 			.then((r) => {
-				this.get_item_details();
+				return this.get_item_details();
+			})
+			.then(() => {
 				frappe.show_alert(__(`${this.item.item_name} Updated`));
 			})
 		},

From 2944301c87a8726d039a5f9fa38a1e9139d2a369 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Mon, 9 Dec 2019 16:35:54 +0530
Subject: [PATCH 017/193] fix: website showing disabled items in list of
 products

---
 erpnext/portal/product_configurator/utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/erpnext/portal/product_configurator/utils.py b/erpnext/portal/product_configurator/utils.py
index 3a373a4ab19..9c0120d4168 100644
--- a/erpnext/portal/product_configurator/utils.py
+++ b/erpnext/portal/product_configurator/utils.py
@@ -52,7 +52,6 @@ def get_attribute_filter_data():
 
 
 def get_products_for_website(field_filters=None, attribute_filters=None, search=None):
-
 	if attribute_filters:
 		item_codes = get_item_codes_by_attributes(attribute_filters)
 		items_by_attributes = get_items([['name', 'in', item_codes]])
@@ -336,7 +335,9 @@ def get_items(filters=None, search=None):
 
 	filter_condition = get_conditions(filters, 'and')
 
-	where_conditions = ' and '.join(
+	where_conditions = 'disabled = 0 and '
+
+	where_conditions += ' and '.join(
 		[condition for condition in [show_in_website_condition, search_condition, filter_condition] if condition]
 	)
 

From 0cb2783f8039592b2c334da2ba708a63e61ee1e0 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 9 Dec 2019 19:24:29 +0530
Subject: [PATCH 018/193] fix: create unpublish log on the hub

---
 erpnext/hub_node/api.py              | 20 ++++++++------------
 erpnext/public/js/hub/pages/Home.vue |  8 ++++----
 erpnext/public/js/hub/pages/Item.vue |  6 +++---
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
index b0b00b2b469..3a5b06fdc4b 100644
--- a/erpnext/hub_node/api.py
+++ b/erpnext/hub_node/api.py
@@ -148,21 +148,17 @@ def publish_selected_items(items_to_publish):
 		frappe.log_error(message=e, title='Hub Sync Error')
 
 @frappe.whitelist()
-def unpublish_item(item):
+def unpublish_item(item_code, hub_item_name):
 	''' Remove item listing from the marketplace '''
-	item = json.loads(item)
 
-	item_code = item.get('item_code')
-	frappe.db.set_value('Item', item_code, 'publish_in_hub', 0)
+	response = call_hub_method('unpublish_item', {
+		'hub_item_name': hub_item_name
+	})
 
-	item = map_fields([item])[0]
-
-	try:
-		connection = get_hub_connection()
-		connection.set_value('Hub Item', item.get('name'), 'published', 0)
-
-	except Exception as e:
-		frappe.log_error(message=e, title='Hub Sync Error')
+	if response:
+		frappe.db.set_value('Item', item_code, 'publish_in_hub', 0)
+	else:
+		frappe.throw(_('Unable to update remote activity'))
 
 @frappe.whitelist()
 def get_unregistered_users():
diff --git a/erpnext/public/js/hub/pages/Home.vue b/erpnext/public/js/hub/pages/Home.vue
index 84a42367b22..79cfe46e158 100644
--- a/erpnext/public/js/hub/pages/Home.vue
+++ b/erpnext/public/js/hub/pages/Home.vue
@@ -58,10 +58,10 @@ export default {
 		this.search_value = '';
 		this.get_items();
 	},
-	watch:{
-		$route (to, from){
-			this.get_items()
-		}
+	mounted() {
+		frappe.route.on('change', () => {
+			this.get_items();
+		})
 	},
 	methods: {
 		get_items() {
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
index e4b0eeaecb5..d0c0ebe603e 100644
--- a/erpnext/public/js/hub/pages/Item.vue
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -309,11 +309,11 @@ export default {
 		},
 
 		unpublish_item() {
-			let me = this;
-			frappe.confirm(__(`Unpublish ${this.item.item_name}?`), function() {
+			frappe.confirm(__(`Unpublish ${this.item.item_name}?`), () => {
 				frappe
 					.call('erpnext.hub_node.api.unpublish_item', {
-						item: me.item
+						item_code: this.item.item_code,
+						hub_item_name: this.hub_item_name
 					})
 					.then(r => {
 						frappe.set_route(`marketplace/home`);

From 214acc9a42a202f652d33f4b1c9197ac48eb681d Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Mon, 9 Dec 2019 20:26:50 +0530
Subject: [PATCH 019/193] fix: Changed check condition and added test

---
 .../stock/doctype/stock_entry/stock_entry.js  |  2 +-
 .../stock/doctype/stock_entry/stock_entry.py  |  9 ++++++-
 .../doctype/stock_entry/test_stock_entry.py   | 27 +++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index d9c94fced7d..ca480f969d8 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -536,7 +536,7 @@ frappe.ui.form.on('Stock Entry Detail', {
 					if(r.message) {
 						var d = locals[cdt][cdn];
 						$.each(r.message, function(k, v) {
-							d[k] = v;
+							frappe.model.set_value(cdt, cdn, k, v); // qty and it's subsequent fields weren't triggered
 						});
 						refresh_field("items");
 						erpnext.stock.select_batch_and_serial_no(frm, d);
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 2b99f72565c..913656ad020 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -27,6 +27,7 @@ class IncorrectValuationRateError(frappe.ValidationError): pass
 class DuplicateEntryForWorkOrderError(frappe.ValidationError): pass
 class OperationsNotCompleteError(frappe.ValidationError): pass
 class MaxSampleAlreadyRetainedError(frappe.ValidationError): pass
+class TotalBasicAmountZeroError(frappe.ValidationError): pass
 
 from erpnext.controllers.stock_controller import StockController
 
@@ -649,6 +650,12 @@ class StockEntry(StockController):
 		gl_entries = super(StockEntry, self).get_gl_entries(warehouse_account)
 
 		total_basic_amount = sum([flt(t.basic_amount) for t in self.get("items") if t.t_warehouse])
+
+		if self.get("additional_costs") and not total_basic_amount:
+			#If additional costs table is populated and total basic amount is
+			#somehow 0, interrupt transaction.
+			frappe.throw(_("Total Basic Amount in Items Table cannot be 0"), TotalBasicAmountZeroError)
+
 		item_account_wise_additional_cost = {}
 
 		for t in self.get("additional_costs"):
@@ -657,7 +664,7 @@ class StockEntry(StockController):
 					item_account_wise_additional_cost.setdefault((d.item_code, d.name), {})
 					item_account_wise_additional_cost[(d.item_code, d.name)].setdefault(t.expense_account, 0.0)
 					item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account] += \
-						(t.amount * d.basic_amount) / total_basic_amount if total_basic_amount else 0
+						(t.amount * d.basic_amount) / total_basic_amount
 
 		if item_account_wise_additional_cost:
 			for d in self.get("items"):
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index eddab5d79dc..c5e67092d3d 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -16,6 +16,7 @@ from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse, make_stock_in_entry
 from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import OpeningEntryAccountError
+from erpnext.stock.doctype.stock_entry.stock_entry import TotalBasicAmountZeroError
 from six import iteritems
 
 def get_sle(**args):
@@ -790,6 +791,32 @@ class TestStockEntry(unittest.TestCase):
 			filters={"voucher_type": "Stock Entry", "voucher_no": mr.name}, fieldname="is_opening")
 		self.assertEqual(is_opening, "Yes")
 
+	def test_total_basic_amount_zero(self):
+		se = frappe.get_doc({"doctype":"Stock Entry",
+		"purpose":"Material Receipt",
+		"stock_entry_type":"Material Receipt",
+		"posting_date": nowdate(),
+		"company":"_Test Company with perpetual inventory",
+		"items":[
+			{"item_code":"Basil Leaves",
+			"description":"Basil Leaves",
+			 "qty": 1,
+			 "basic_rate": 0,
+			 "uom":"Nos",
+			 "t_warehouse": "Stores - TCP1",
+			 "allow_zero_valuation_rate": 1,
+			 "cost_center": "Main - TCP1"}
+			 ],
+		"additional_costs":[
+			{"expense_account":"Miscellaneous Expenses - TCP1",
+			"amount":100,
+			"description": "miscellanous"}
+			]
+		})
+
+		se.insert()
+		self.assertRaises(TotalBasicAmountZeroError, se.submit)
+
 def make_serialized_item(item_code=None, serial_no=None, target_warehouse=None):
 	se = frappe.copy_doc(test_records[0])
 	se.get("items")[0].item_code = item_code or "_Test Serialized Item With Series"

From d3605d235400813ae62ef2b346f8e83bcbf7445f Mon Sep 17 00:00:00 2001
From: 0Pranav <prnvnachnekar@gmail.com>
Date: Wed, 11 Dec 2019 15:02:23 +0530
Subject: [PATCH 020/193] fix: issue in javascript timezones

---
 erpnext/www/book_appointment/index.js | 2 +-
 erpnext/www/book_appointment/index.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/www/book_appointment/index.js b/erpnext/www/book_appointment/index.js
index c8dd5013d5c..5a814c6381e 100644
--- a/erpnext/www/book_appointment/index.js
+++ b/erpnext/www/book_appointment/index.js
@@ -114,7 +114,7 @@ function get_timeslot_div_layout(timeslot) {
         timeslot_div.classList.add('unavailable')
     }
     timeslot_div.innerHTML = get_slot_layout(start_time);
-    timeslot_div.id = timeslot.time.substr(11, 20);
+    timeslot_div.id = timeslot.time.substring(11, 19);
     timeslot_div.addEventListener('click', select_time);
     return timeslot_div
 }
diff --git a/erpnext/www/book_appointment/index.py b/erpnext/www/book_appointment/index.py
index 5b60dd5e7b7..e4af7e8e436 100644
--- a/erpnext/www/book_appointment/index.py
+++ b/erpnext/www/book_appointment/index.py
@@ -90,7 +90,7 @@ def get_available_slots_between(query_start_time, query_end_time, settings):
 
 @frappe.whitelist(allow_guest=True)
 def create_appointment(date, time, tz, contact):
-	format_string = '%Y-%m-%d %H:%M:%S%z'
+	format_string = '%Y-%m-%d %H:%M:%S'
 	scheduled_time = datetime.datetime.strptime(date + " " + time, format_string)
 	# Strip tzinfo from datetime objects since it's handled by the doctype
 	scheduled_time = scheduled_time.replace(tzinfo = None)

From 5b622eace1d0c3602ecb820cccf6d0c769560e8f Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Wed, 11 Dec 2019 16:08:31 +0530
Subject: [PATCH 021/193] fix: handle scenario with no condition

---
 erpnext/portal/product_configurator/utils.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/erpnext/portal/product_configurator/utils.py b/erpnext/portal/product_configurator/utils.py
index 9c0120d4168..22208921187 100644
--- a/erpnext/portal/product_configurator/utils.py
+++ b/erpnext/portal/product_configurator/utils.py
@@ -335,11 +335,13 @@ def get_items(filters=None, search=None):
 
 	filter_condition = get_conditions(filters, 'and')
 
-	where_conditions = 'disabled = 0 and '
-
-	where_conditions += ' and '.join(
+	where_conditions = ' and '.join(
 		[condition for condition in [show_in_website_condition, search_condition, filter_condition] if condition]
 	)
+	if where_conditions:
+		where_conditions += ' and disabled = 0'
+	else:
+		where_conditions += 'disabled = 0'
 
 	left_joins = []
 	for f in filters:

From c6599fd1e21ec04dc11a80a8bd1d7b97bd3a6a33 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 11 Dec 2019 17:29:04 +0530
Subject: [PATCH 022/193] fix: add publihed in hub track item

---
 .../hub_tracked_item/hub_tracked_item.json    | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/erpnext/hub_node/doctype/hub_tracked_item/hub_tracked_item.json b/erpnext/hub_node/doctype/hub_tracked_item/hub_tracked_item.json
index 2e89887dacf..7d07ba40938 100644
--- a/erpnext/hub_node/doctype/hub_tracked_item/hub_tracked_item.json
+++ b/erpnext/hub_node/doctype/hub_tracked_item/hub_tracked_item.json
@@ -77,6 +77,38 @@
    "translatable": 0, 
    "unique": 0
   }, 
+  {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fieldname": "published",
+    "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": "Published",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_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, 
@@ -120,7 +152,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-09-10 11:37:35.951019", 
+ "modified": "2019-12-10 11:37:35.951019", 
  "modified_by": "Administrator", 
  "module": "Hub Node", 
  "name": "Hub Tracked Item", 

From 894c2100272d7d7c9c3b95cdd17978e8f77afd93 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Wed, 11 Dec 2019 17:43:04 +0530
Subject: [PATCH 023/193] fix: enable address without checkout feature * fix
 add address form country link field

---
 .../templates/includes/cart/cart_address.html | 39 ++++++++++++-------
 erpnext/templates/pages/cart.html             |  2 -
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index fe53f34dba5..f7f35483208 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -64,16 +64,6 @@ frappe.ready(() => {
 					fieldtype: 'Data',
 					reqd: 1
 				},
-				{
-					label: __('Address Type'),
-					fieldname: 'address_type',
-					fieldtype: 'Select',
-					options: [
-						'Billing',
-						'Shipping'
-					],
-					reqd: 1
-				},
 				{
 					label: __('Address Line 1'),
 					fieldname: 'address_line1',
@@ -96,16 +86,37 @@ frappe.ready(() => {
 					fieldname: 'state',
 					fieldtype: 'Data'
 				},
+				{
+					label: __('Country'),
+					fieldname: 'country',
+					fieldtype: 'Link',
+					options: 'Country',
+					reqd: 1
+				},
+				{
+					fieldname: "column_break0",
+					fieldtype: "Column Break",
+					width: "50%"
+				},
+				{
+					label: __('Address Type'),
+					fieldname: 'address_type',
+					fieldtype: 'Select',
+					options: [
+						'Billing',
+						'Shipping'
+					],
+					reqd: 1
+				},
 				{
 					label: __('Pin Code'),
 					fieldname: 'pincode',
 					fieldtype: 'Data'
 				},
 				{
-					label: __('Country'),
-					fieldname: 'country',
-					fieldtype: 'Link',
-					reqd: 1
+					fieldname: "phone",
+					fieldtype: "Data",
+					label: "Phone"
 				},
 			],
 			primary_action_label: __('Save'),
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index b301fc0665a..912702e386d 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -83,12 +83,10 @@
 		</div>
 	{% endif %}
 
-	{% if cart_settings.enable_checkout %}
 	<div class="cart-addresses mt-5">
 	{% include "templates/includes/cart/cart_address.html" %}
 	</div>
 	{% endif %}
-	{% endif %}
 </div>
 
 <div class="row mt-5">

From 107989316c7301c9475329f9a9eac81712743f2f Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Wed, 11 Dec 2019 18:15:54 +0530
Subject: [PATCH 024/193] fix: additional notes from Quotations not saved in SO

---
 .../sales_order_item/sales_order_item.json    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 86b09c28148..aad37d321e9 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -77,10 +77,12 @@
   "ordered_qty",
   "planned_qty",
   "column_break_69",
-  "delivered_qty",
   "work_order_qty",
+  "delivered_qty",
   "produced_qty",
   "returned_qty",
+  "shopping_cart_section",
+  "additional_notes",
   "section_break_63",
   "page_break",
   "item_tax_rate",
@@ -746,15 +748,20 @@
    "label": "Image"
   },
   {
-   "default": "0",
-   "fieldname": "against_blanket_order",
-   "fieldtype": "Check",
-   "label": "Against Blanket Order"
+   "collapsible": 1,
+   "fieldname": "shopping_cart_section",
+   "fieldtype": "Section Break",
+   "label": "Shopping Cart"
+  },
+  {
+   "fieldname": "additional_notes",
+   "fieldtype": "Text",
+   "label": "Additional Notes"
   }
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-11-19 14:19:29.491945",
+ "modified": "2019-12-11 18:06:26.238169",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order Item",

From f95267041da8b4c6ebda77ab9ffaa1d70e8dba23 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 12 Dec 2019 13:06:17 +0530
Subject: [PATCH 025/193] fix: Financial statement report

- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
---
 .../accounts/report/financial_statements.html | 34 +++++++++++--------
 .../accounts/report/financial_statements.py   |  4 +--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/erpnext/accounts/report/financial_statements.html b/erpnext/accounts/report/financial_statements.html
index 4081723bf0f..50947ecf5ef 100644
--- a/erpnext/accounts/report/financial_statements.html
+++ b/erpnext/accounts/report/financial_statements.html
@@ -1,5 +1,6 @@
 {%
 	var report_columns = report.get_columns_for_print();
+	report_columns = report_columns.filter(col => !col.hidden);
 
 	if (report_columns.length > 8) {
 		frappe.throw(__("Too many columns. Export the report and print it using a spreadsheet application."));
@@ -15,34 +16,35 @@
 		height: 37px;
 	}
 </style>
-{% var letterhead= filters.letter_head || (frappe.get_doc(":Company", filters.company) && frappe.get_doc(":Company", filters.company).default_letter_head) %}
-{% if(letterhead) { %}
-<div style="margin-bottom: 7px;" class="text-center">
-	{%= frappe.boot.letter_heads[letterhead].header %}
-</div>
-{% } %}
+
 <h2 class="text-center">{%= __(report.report_name) %}</h2>
 <h3 class="text-center">{%= filters.company %}</h3>
+
 {% if 'cost_center' in filters %}
 	<h3 class="text-center">{%= filters.cost_center %}</h3>
 {% endif %}
+
 <h3 class="text-center">{%= filters.fiscal_year %}</h3>
-<h5 class="text-center">{%=  __("Currency") %} : {%= filters.presentation_currency || erpnext.get_currency(filters.company) %} </h4>
+<h5 class="text-center">
+	{%=  __("Currency") %} : {%= filters.presentation_currency || erpnext.get_currency(filters.company) %}
+</h5>
 {% if (filters.from_date) { %}
-	<h4 class="text-center">{%= frappe.datetime.str_to_user(filters.from_date) %} - {%= frappe.datetime.str_to_user(filters.to_date) %}</h3>
+	<h5 class="text-center">
+		{%= frappe.datetime.str_to_user(filters.from_date) %} - {%= frappe.datetime.str_to_user(filters.to_date) %}
+	</h5>
 {% } %}
 <hr>
 <table class="table table-bordered">
 	<thead>
 		<tr>
-			<th style="width: {%= 100 - (report_columns.length - 2) * 13 %}%"></th>
-			{% for(var i=2, l=report_columns.length; i<l; i++) { %}
+			<th style="width: {%= 100 - (report_columns.length - 1) * 13 %}%"></th>
+			{% for (let i=1, l=report_columns.length; i<l; i++) { %}
 				<th class="text-right">{%= report_columns[i].label %}</th>
 			{% } %}
 		</tr>
 	</thead>
 	<tbody>
-		{% for(var j=0, k=data.length-1; j<k; j++) { %}
+		{% for(let j=0, k=data.length-1; j<k; j++) { %}
 			{%
 				var row = data[j];
 				var row_class = data[j].parent_account ? "" : "financial-statements-important";
@@ -52,11 +54,11 @@
 				<td>
 					<span style="padding-left: {%= cint(data[j].indent) * 2 %}em">{%= row.account_name %}</span>
 				</td>
-				{% for(var i=2, l=report_columns.length; i<l; i++) { %}
+				{% for(let i=1, l=report_columns.length; i<l; i++) { %}
 					<td class="text-right">
-						{% var fieldname = report_columns[i].fieldname; %}
+						{% const fieldname = report_columns[i].fieldname; %}
 						{% if (!is_null(row[fieldname])) { %}
-							{%= format_currency(row[fieldname], filters.presentation_currency) %}
+							{%= frappe.format(row[fieldname], report_columns[i], {}, row) %}
 						{% } %}
 					</td>
 				{% } %}
@@ -64,4 +66,6 @@
 		{% } %}
 	</tbody>
 </table>
-<p class="text-right text-muted">Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}</p>
+<p class="text-right text-muted">
+	Printed On {%= frappe.datetime.str_to_user(frappe.datetime.get_datetime_as_string()) %}
+</p>
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 3c8de6026a6..40d5682726d 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -264,8 +264,8 @@ def filter_out_zero_value_rows(data, parent_children_map, show_zero_values=False
 
 def add_total_row(out, root_type, balance_must_be, period_list, company_currency):
 	total_row = {
-		"account_name": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'",
-		"account": "'" + _("Total {0} ({1})").format(_(root_type), _(balance_must_be)) + "'",
+		"account_name": _("Total {0} ({1})").format(_(root_type), _(balance_must_be)),
+		"account": _("Total {0} ({1})").format(_(root_type), _(balance_must_be)),
 		"currency": company_currency
 	}
 

From 0e33f792d3aae99c781e804b5fc27ceb497ad5eb Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Thu, 12 Dec 2019 16:34:41 +0530
Subject: [PATCH 026/193] fix: Distribute charges based on quantity if Total
 Basic Amount is Zero.

---
 .../stock/doctype/stock_entry/stock_entry.py  | 12 +++---
 .../doctype/stock_entry/test_stock_entry.py   | 39 +++++++++++++------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 913656ad020..00d27ef232b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -27,7 +27,6 @@ class IncorrectValuationRateError(frappe.ValidationError): pass
 class DuplicateEntryForWorkOrderError(frappe.ValidationError): pass
 class OperationsNotCompleteError(frappe.ValidationError): pass
 class MaxSampleAlreadyRetainedError(frappe.ValidationError): pass
-class TotalBasicAmountZeroError(frappe.ValidationError): pass
 
 from erpnext.controllers.stock_controller import StockController
 
@@ -650,11 +649,11 @@ class StockEntry(StockController):
 		gl_entries = super(StockEntry, self).get_gl_entries(warehouse_account)
 
 		total_basic_amount = sum([flt(t.basic_amount) for t in self.get("items") if t.t_warehouse])
+		divide_based_on = total_basic_amount
 
 		if self.get("additional_costs") and not total_basic_amount:
-			#If additional costs table is populated and total basic amount is
-			#somehow 0, interrupt transaction.
-			frappe.throw(_("Total Basic Amount in Items Table cannot be 0"), TotalBasicAmountZeroError)
+			# if total_basic_amount is 0, distribute additional charges based on qty
+			divide_based_on = sum(item.qty for item in list(self.get("items")))
 
 		item_account_wise_additional_cost = {}
 
@@ -663,8 +662,11 @@ class StockEntry(StockController):
 				if d.t_warehouse:
 					item_account_wise_additional_cost.setdefault((d.item_code, d.name), {})
 					item_account_wise_additional_cost[(d.item_code, d.name)].setdefault(t.expense_account, 0.0)
+
+					multiply_based_on = d.basic_amount if total_basic_amount else d.qty
+
 					item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account] += \
-						(t.amount * d.basic_amount) / total_basic_amount
+						(t.amount * multiply_based_on) / divide_based_on
 
 		if item_account_wise_additional_cost:
 			for d in self.get("items"):
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index c5e67092d3d..ee5f2370987 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -16,7 +16,6 @@ from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse, make_stock_in_entry
 from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import OpeningEntryAccountError
-from erpnext.stock.doctype.stock_entry.stock_entry import TotalBasicAmountZeroError
 from six import iteritems
 
 def get_sle(**args):
@@ -798,14 +797,26 @@ class TestStockEntry(unittest.TestCase):
 		"posting_date": nowdate(),
 		"company":"_Test Company with perpetual inventory",
 		"items":[
-			{"item_code":"Basil Leaves",
-			"description":"Basil Leaves",
-			 "qty": 1,
-			 "basic_rate": 0,
-			 "uom":"Nos",
-			 "t_warehouse": "Stores - TCP1",
-			 "allow_zero_valuation_rate": 1,
-			 "cost_center": "Main - TCP1"}
+			{
+				"item_code":"Basil Leaves",
+				"description":"Basil Leaves",
+				"qty": 1,
+				"basic_rate": 0,
+				"uom":"Nos",
+				"t_warehouse": "Stores - TCP1",
+				"allow_zero_valuation_rate": 1,
+				"cost_center": "Main - TCP1"
+			 },
+			 {
+				"item_code":"Basil Leaves",
+				"description":"Basil Leaves",
+				"qty": 2,
+				"basic_rate": 0,
+				"uom":"Nos",
+				"t_warehouse": "Stores - TCP1",
+				"allow_zero_valuation_rate": 1,
+				"cost_center": "Main - TCP1"
+			 },
 			 ],
 		"additional_costs":[
 			{"expense_account":"Miscellaneous Expenses - TCP1",
@@ -813,9 +824,15 @@ class TestStockEntry(unittest.TestCase):
 			"description": "miscellanous"}
 			]
 		})
-
 		se.insert()
-		self.assertRaises(TotalBasicAmountZeroError, se.submit)
+		se.submit()
+
+		self.check_gl_entries("Stock Entry", se.name,
+			sorted([
+				["Stock Adjustment - TCP1", 100.0, 0.0],
+				["Miscellaneous Expenses - TCP1", 0.0, 100.0]
+			])
+		)
 
 def make_serialized_item(item_code=None, serial_no=None, target_warehouse=None):
 	se = frappe.copy_doc(test_records[0])

From 81990aee9ff7fc385e3a6eb5a2e124f081d19829 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Fri, 13 Dec 2019 13:12:10 +0530
Subject: [PATCH 027/193] fix: Removed 'manufacturers' table from Item Master

---
 erpnext/stock/doctype/item/item.json | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index a2aab3f69ee..af8e13288a9 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -135,8 +135,7 @@
   "publish_in_hub",
   "hub_category_to_publish",
   "hub_warehouse",
-  "synced_with_hub",
-  "manufacturers"
+  "synced_with_hub"
  ],
  "fields": [
   {
@@ -1016,12 +1015,6 @@
    "label": "Synced With Hub",
    "read_only": 1
   },
-  {
-   "fieldname": "manufacturers",
-   "fieldtype": "Table",
-   "label": "Manufacturers",
-   "options": "Item Manufacturer"
-  },
   {
    "depends_on": "eval:!doc.__islocal",
    "fieldname": "over_delivery_receipt_allowance",
@@ -1049,7 +1042,7 @@
  "idx": 2,
  "image_field": "image",
  "max_attachments": 1,
- "modified": "2019-10-09 17:05:59.576119",
+ "modified": "2019-12-13 12:15:56.197246",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",

From 8c9c6ec919570ce73432286b563e2f930b4f3212 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Fri, 13 Dec 2019 13:47:15 +0530
Subject: [PATCH 028/193] fix: Price rule filtering fix

---
 erpnext/accounts/doctype/pricing_rule/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 637e503e658..7af6748254f 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -284,7 +284,7 @@ def filter_pricing_rules_for_qty_amount(qty, rate, pricing_rules, args=None):
 			status = True
 
 		# if user has created item price against the transaction UOM
-		if rule.get("uom") == args.get("uom"):
+		if args and rule.get("uom") == args.get("uom"):
 			conversion_factor = 1.0
 
 		if status and (flt(rate) >= (flt(rule.min_amt) * conversion_factor)

From 4bea44b9c93df4aa42d7362bac912b91489a777e Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 13 Dec 2019 15:05:43 +0530
Subject: [PATCH 029/193] fix: update already existing items

---
 erpnext/hub_node/api.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
index 3a5b06fdc4b..06ad2220345 100644
--- a/erpnext/hub_node/api.py
+++ b/erpnext/hub_node/api.py
@@ -119,6 +119,7 @@ def get_valid_items(search_value=''):
 @frappe.whitelist()
 def publish_selected_items(items_to_publish):
 	items_to_publish = json.loads(items_to_publish)
+	items_to_update = []
 	if not len(items_to_publish):
 		frappe.throw(_('No items to publish'))
 
@@ -126,14 +127,24 @@ def publish_selected_items(items_to_publish):
 		item_code = item.get('item_code')
 		frappe.db.set_value('Item', item_code, 'publish_in_hub', 1)
 
-		frappe.get_doc({
+		hub_dict = {
 			'doctype': 'Hub Tracked Item',
 			'item_code': item_code,
+			'published': 1,
 			'hub_category': item.get('hub_category'),
 			'image_list': item.get('image_list')
-		}).insert(ignore_if_duplicate=True)
+		}
+		if frappe.db.exists('Hub Tracked Item', item_code):
+			items_to_update.append(item)
+			hub_tracked_item = frappe.get_doc('Hub Tracked Item', item_code)
+			hub_tracked_item.update(hub_dict)
+			hub_tracked_items.save()
+		else:
+			frappe.get_doc(hub_dict).insert(ignore_if_duplicate=True)
 
-	items = map_fields(items_to_publish)
+	items_to_publish = list(filter(lambda x: x not in items_to_update, items_to_publish))
+	new_items = map_fields(items_to_publish)
+	existing_items = map_fields(items_to_update)
 
 	try:
 		item_sync_preprocess(len(items))
@@ -141,7 +152,8 @@ def publish_selected_items(items_to_publish):
 
 		# TODO: Publish Progress
 		connection = get_hub_connection()
-		connection.insert_many(items)
+		connection.insert_many(new_items)
+		connection.bulk_update(existing_items)
 
 		item_sync_postprocess()
 	except Exception as e:

From bfc43d3b15d3dba788eeef5ad7d98777b0717a0b Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Fri, 13 Dec 2019 15:09:51 +0530
Subject: [PATCH 030/193] fix: gl entries doesn't filter based on debit
 precision

---
 erpnext/accounts/general_ledger.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index feb598a2e51..bb1b7e392dc 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -90,8 +90,12 @@ def merge_similar_entries(gl_map):
 		else:
 			merged_gl_map.append(entry)
 
+	company = gl_map[0].company if gl_map else erpnext.get_default_company()
+	company_currency = erpnext.get_company_currency(company)
+	precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"), company_currency)
+
 	# filter zero debit and credit entries
-	merged_gl_map = filter(lambda x: flt(x.debit, 9)!=0 or flt(x.credit, 9)!=0, merged_gl_map)
+	merged_gl_map = filter(lambda x: flt(x.debit, precision)!=0 or flt(x.credit, precision)!=0, merged_gl_map)
 	merged_gl_map = list(merged_gl_map)
 
 	return merged_gl_map

From 5da7e729a59db35c3616a56b7fc833d595cb6169 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Fri, 13 Dec 2019 15:44:39 +0530
Subject: [PATCH 031/193] fix: remove mandatory purchase reference for existing
 asset

---
 erpnext/assets/doctype/asset/asset.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 6b3f2c777cf..f6a7fa20d08 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -144,6 +144,10 @@ frappe.ui.form.on('Asset', {
 			frm.set_df_property('purchase_invoice', 'read_only', 1);
 			frm.set_df_property('purchase_receipt', 'read_only', 1);
 		}
+		else if (frm.doc.is_existing_asset) {
+			frm.toggle_reqd('purchase_receipt', 0);
+			frm.toggle_reqd('purchase_invoice', 0);
+		}
 		else if (frm.doc.purchase_receipt) {
 			// if purchase receipt link is set then set PI disabled
 			frm.toggle_reqd('purchase_invoice', 0);
@@ -256,6 +260,7 @@ frappe.ui.form.on('Asset', {
 	},
 
 	is_existing_asset: function(frm) {
+		frm.trigger("toggle_reference_doc");
 		// frm.toggle_reqd("next_depreciation_date", (!frm.doc.is_existing_asset && frm.doc.calculate_depreciation));
 	},
 

From 94ff8058acf448f4f7f60f8ea1535c1408676c4d Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Sat, 14 Dec 2019 21:25:30 +0530
Subject: [PATCH 032/193] fix: Add missing import

---
 erpnext/patches/v12_0/set_gst_category.py | 2 ++
 erpnext/setup/doctype/company/company.py  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/erpnext/patches/v12_0/set_gst_category.py b/erpnext/patches/v12_0/set_gst_category.py
index 54bc5b3c74f..55bbdee7edf 100644
--- a/erpnext/patches/v12_0/set_gst_category.py
+++ b/erpnext/patches/v12_0/set_gst_category.py
@@ -7,6 +7,8 @@ def execute():
 	if not company:
 		return
 
+	frappe.reload_doc('accounts', 'doctype', 'Tax Category')
+
 	make_custom_fields()
 
 	for doctype in ['Sales Invoice', 'Purchase Invoice']:
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 2eee919b530..ff3515485c4 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -14,6 +14,7 @@ from frappe.model.document import Document
 from frappe.contacts.address_and_contact import load_address_and_contact
 from frappe.utils.nestedset import NestedSet
 
+from past.builtins import cmp
 import functools
 
 class Company(NestedSet):

From 40b7ac4987cfd76e8226e924a8bf098592262662 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Sun, 15 Dec 2019 21:20:55 +0530
Subject: [PATCH 033/193] fix: Minor filter fix in expense claim type

---
 erpnext/hr/doctype/expense_claim/expense_claim.js           | 6 +++---
 erpnext/hr/doctype/expense_claim/expense_claim.json         | 5 ++++-
 erpnext/hr/doctype/expense_claim_type/expense_claim_type.js | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 570f2ef4c77..e0bfc83a9bc 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -243,11 +243,11 @@ frappe.ui.form.on("Expense Claim", {
 
 	update_employee_advance_claimed_amount: function(frm) {
 		let amount_to_be_allocated = frm.doc.grand_total;
-		$.each(frm.doc.advances || [], function(i, advance){
-			if (amount_to_be_allocated >= advance.unclaimed_amount){
+		$.each(frm.doc.advances || [], function(i, advance) {
+			if (amount_to_be_allocated >= advance.unclaimed_amount) {
 				frm.doc.advances[i].allocated_amount = frm.doc.advances[i].unclaimed_amount;
 				amount_to_be_allocated -= advance.allocated_amount;
-			} else{
+			} else {
 				frm.doc.advances[i].allocated_amount = amount_to_be_allocated;
 				amount_to_be_allocated = 0;
 			}
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index b5b6823e1ce..96baaab5950 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2013-01-10 16:34:14",
@@ -43,6 +44,7 @@
   "accounting_dimensions_section",
   "project",
   "dimension_col_break",
+  "cost_center",
   "more_details",
   "status",
   "amended_from",
@@ -365,7 +367,8 @@
  "icon": "fa fa-money",
  "idx": 1,
  "is_submittable": 1,
- "modified": "2019-11-09 14:13:08.964547",
+ "links": [],
+ "modified": "2019-12-14 23:52:05.388458",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Expense Claim",
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
index c4877976775..d007e1a6c23 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.js
@@ -2,10 +2,10 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Expense Claim Type", {
-	refresh: function(frm){
-		frm.fields_dict["accounts"].grid.get_field("default_account").get_query = function(frm, cdt, cdn){
+	refresh: function(frm) {
+		frm.fields_dict["accounts"].grid.get_field("default_account").get_query = function(doc, cdt, cdn) {
 			var d = locals[cdt][cdn];
-			return{
+			return {
 				filters: {
 					"is_group": 0,
 					"root_type": frm.doc.deferred_expense_account ? "Asset" : "Expense",

From b223dd95e2ce03af052dc4b954a2070312de30bf Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Sun, 15 Dec 2019 21:21:31 +0530
Subject: [PATCH 034/193] fix: Dashboard for employee advance doctype

---
 .../employee_advance_dashboard.py             | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 erpnext/hr/doctype/employee_advance/employee_advance_dashboard.py

diff --git a/erpnext/hr/doctype/employee_advance/employee_advance_dashboard.py b/erpnext/hr/doctype/employee_advance/employee_advance_dashboard.py
new file mode 100644
index 00000000000..c3b4a3a8894
--- /dev/null
+++ b/erpnext/hr/doctype/employee_advance/employee_advance_dashboard.py
@@ -0,0 +1,19 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'employee_advance',
+        'non_standard_fieldnames': {
+            'Payment Entry': 'reference_name',
+            'Journal Entry': 'reference_name'
+        },
+		'transactions': [
+			{
+				'items': ['Expense Claim']
+			},
+			{
+				'items': ['Payment Entry', 'Journal Entry']
+			}
+		]
+	}

From c05bd1964f066cc965a1d2facb1228bd8f618263 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Sun, 15 Dec 2019 21:22:28 +0530
Subject: [PATCH 035/193] feat: Capture return amount against Employee advance
 via Journal Entry

---
 .../doctype/journal_entry/journal_entry.js    |   1 -
 .../employee_advance/employee_advance.js      |   2 +-
 .../employee_advance/employee_advance.json    | 890 ++++--------------
 .../employee_advance/employee_advance.py      |  14 +
 .../hr/doctype/expense_claim/expense_claim.py |   2 +-
 5 files changed, 199 insertions(+), 710 deletions(-)

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index d6236cdb04f..3604b60b751 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -190,7 +190,6 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
 			if(jvd.reference_type==="Employee Advance") {
 				return {
 					filters: {
-						'status': ['=', 'Unpaid'],
 						'docstatus': 1
 					}
 				};
diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.js b/erpnext/hr/doctype/employee_advance/employee_advance.js
index 77a2bbcbc07..69915fa6e98 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.js
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.js
@@ -34,7 +34,7 @@ frappe.ui.form.on('Employee Advance', {
 		}
 		else if (
 			frm.doc.docstatus === 1
-			&& flt(frm.doc.claimed_amount) < flt(frm.doc.paid_amount)
+			&& flt(frm.doc.claimed_amount) < flt(frm.doc.paid_amount) - flt(frm.doc.return_amount)
 			&& frappe.model.can_create("Expense Claim")
 		) {
 			frm.add_custom_button(
diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.json b/erpnext/hr/doctype/employee_advance/employee_advance.json
index 3597e76f1e6..a4e46765470 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.json
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.json
@@ -1,737 +1,213 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2017-10-09 14:26:29.612365", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2017-10-09 14:26:29.612365",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "naming_series",
+  "employee",
+  "employee_name",
+  "column_break_4",
+  "posting_date",
+  "department",
+  "section_break_8",
+  "purpose",
+  "column_break_11",
+  "advance_amount",
+  "paid_amount",
+  "due_advance_amount",
+  "claimed_amount",
+  "return_amount",
+  "section_break_7",
+  "status",
+  "company",
+  "amended_from",
+  "column_break_18",
+  "advance_account",
+  "mode_of_payment"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "HR-EAD-.YYYY.-", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "options": "HR-EAD-.YYYY.-"
+  },
   {
-   "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": 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
-  }, 
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Employee",
+   "options": "Employee",
+   "reqd": 1
+  },
   {
-   "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": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Employee Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Read Only",
+   "label": "Employee Name"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "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", 
-   "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": "Posting Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Today",
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Posting Date",
+   "reqd": 1
+  },
   {
-   "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
-  }, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "label": "Department",
+   "options": "Department",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_8",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "purpose", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Purpose", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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
-  }, 
+   "fieldname": "purpose",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Purpose",
+   "reqd": 1
+  },
   {
-   "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
-  }, 
+   "fieldname": "column_break_11",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "advance_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": "Advance Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "advance_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Advance Amount",
+   "options": "Company:company:default_currency",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "paid_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": "Paid Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "paid_amount",
+   "fieldtype": "Currency",
+   "label": "Paid Amount",
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:cur_frm.doc.employee", 
-   "fieldname": "due_advance_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": "Due Advance Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:cur_frm.doc.employee",
+   "fieldname": "due_advance_amount",
+   "fieldtype": "Currency",
+   "label": "Due Advance Amount",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "claimed_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": "Claimed Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "claimed_amount",
+   "fieldtype": "Currency",
+   "label": "Claimed Amount",
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_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
-  }, 
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break"
+  },
   {
-   "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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Draft\nPaid\nUnpaid\nClaimed\nCancelled", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "label": "Status",
+   "no_copy": 1,
+   "options": "Draft\nPaid\nUnpaid\nClaimed\nCancelled",
+   "read_only": 1
+  },
   {
-   "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, 
-   "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
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "reqd": 1
+  },
   {
-   "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": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Employee Advance", 
-   "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
-  }, 
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Employee Advance",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_18", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_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
-  }, 
+   "fieldname": "column_break_18",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "advance_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": "Advance Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "advance_account",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Advance Account",
+   "options": "Account",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "mode_of_payment", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Mode of Payment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Mode of Payment", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "mode_of_payment",
+   "fieldtype": "Link",
+   "label": "Mode of Payment",
+   "options": "Mode of Payment"
+  },
+  {
+   "fieldname": "return_amount",
+   "fieldtype": "Currency",
+   "label": "Return Amount",
+   "options": "Company:company:default_currency",
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-01-30 11:28:15.529649", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Employee Advance", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-15 19:04:07.044505",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employee Advance",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Employee", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Employee",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Expense Approver", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Expense Approver",
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "employee,employee_name", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "search_fields": "employee,employee_name",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.py b/erpnext/hr/doctype/employee_advance/employee_advance.py
index 7813da78ca4..674e46438bf 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.py
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.py
@@ -53,11 +53,25 @@ class EmployeeAdvance(Document):
 				and party = %s
 		""", (self.name, self.employee), as_dict=1)[0].paid_amount
 
+		return_amount = frappe.db.sql("""
+			select name, ifnull(sum(credit_in_account_currency), 0) as return_amount
+			from `tabGL Entry`
+			where against_voucher_type = 'Employee Advance'
+				and voucher_type != 'Expense Claim'
+				and against_voucher = %s
+				and party_type = 'Employee'
+				and party = %s
+		""", (self.name, self.employee), as_dict=1)[0].return_amount
+
 		if flt(paid_amount) > self.advance_amount:
 			frappe.throw(_("Row {0}# Paid Amount cannot be greater than requested advance amount"),
 				EmployeeAdvanceOverPayment)
 
+		if flt(return_amount) > self.paid_amount - self.claimed_amount:
+			frappe.throw(_("Return amount cannot be greater unclaimed amount"))
+
 		self.db_set("paid_amount", paid_amount)
+		self.db_set("return_amount", return_amount)
 		self.set_status()
 		frappe.db.set_value("Employee Advance", self.name , "status", self.status)
 
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py
index dfb0bb96d82..9aeb7e8498e 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.py
@@ -322,7 +322,7 @@ def get_expense_claim_account(expense_claim_type, company):
 @frappe.whitelist()
 def get_advances(employee, advance_id=None):
 	if not advance_id:
-		condition = 'docstatus=1 and employee={0} and paid_amount > 0 and paid_amount > claimed_amount'.format(frappe.db.escape(employee))
+		condition = 'docstatus=1 and employee={0} and paid_amount > 0 and paid_amount > claimed_amount + return_amount'.format(frappe.db.escape(employee))
 	else:
 		condition = 'name={0}'.format(frappe.db.escape(advance_id))
 

From 21fe97e72373cfae21572de39fa37a39732679c5 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 13 Dec 2019 16:18:38 +0530
Subject: [PATCH 036/193] fix: pricing rule not working for production discount

---
 .../doctype/pricing_rule/pricing_rule.json    |  9 ++-
 .../doctype/pricing_rule/pricing_rule.py      | 12 ++--
 .../accounts/doctype/pricing_rule/utils.py    | 57 +++++++++++++------
 erpnext/controllers/accounts_controller.py    |  4 +-
 erpnext/controllers/buying_controller.py      |  8 +--
 erpnext/public/js/controllers/transaction.js  | 18 ++++++
 6 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 971d308368a..f73fb10d320 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:title",
@@ -439,19 +440,20 @@
   },
   {
    "default": "0",
-   "depends_on": "eval:!doc.mixed_conditions",
+   "depends_on": "eval:!doc.mixed_conditions && doc.price_or_product_discount == 'Price'",
    "fieldname": "same_item",
    "fieldtype": "Check",
    "label": "Same Item"
   },
   {
-   "depends_on": "eval:!doc.same_item || doc.mixed_conditions",
+   "depends_on": "eval:(!doc.same_item || doc.apply_on == 'Transaction') || doc.mixed_conditions",
    "fieldname": "free_item",
    "fieldtype": "Link",
    "label": "Free Item",
    "options": "Item"
   },
   {
+   "default": "0",
    "fieldname": "free_qty",
    "fieldtype": "Float",
    "label": "Qty"
@@ -554,7 +556,8 @@
  ],
  "icon": "fa fa-gift",
  "idx": 1,
- "modified": "2019-10-15 12:39:40.399792",
+ "links": [],
+ "modified": "2019-12-13 15:48:48.331495",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule",
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index e871d98af6a..af6e4c87afc 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -182,7 +182,7 @@ def get_serial_no_for_item(args):
 
 def get_pricing_rule_for_item(args, price_list_rate=0, doc=None, for_validate=False):
 	from erpnext.accounts.doctype.pricing_rule.utils import (get_pricing_rules,
-		get_applied_pricing_rules, get_pricing_rule_items)
+		get_applied_pricing_rules, get_pricing_rule_items, get_product_discount_rule)
 
 	if isinstance(doc, string_types):
 		doc = json.loads(doc)
@@ -241,9 +241,11 @@ def get_pricing_rule_for_item(args, price_list_rate=0, doc=None, for_validate=Fa
 			if pricing_rule.coupon_code_based==1 and args.coupon_code==None:
 				return item_details
 				
-			if (not pricing_rule.validate_applied_rule and
-				pricing_rule.price_or_product_discount == "Price"):
-				apply_price_discount_pricing_rule(pricing_rule, item_details, args)
+			if not pricing_rule.validate_applied_rule:
+				if pricing_rule.price_or_product_discount == "Price":
+					apply_price_discount_rule(pricing_rule, item_details, args)
+				else:
+					get_product_discount_rule(pricing_rule, item_details)
 
 		item_details.has_pricing_rule = 1
 
@@ -293,7 +295,7 @@ def get_pricing_rule_details(args, pricing_rule):
 		'child_docname': args.get('child_docname')
 	})
 
-def apply_price_discount_pricing_rule(pricing_rule, item_details, args):
+def apply_price_discount_rule(pricing_rule, item_details, args):
 	item_details.pricing_rule_for = pricing_rule.rate_or_discount
 
 	if ((pricing_rule.margin_type == 'Amount' and pricing_rule.currency == args.currency)
diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 637e503e658..346eba259bd 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -7,7 +7,7 @@ from __future__ import unicode_literals
 import frappe, copy, json
 from frappe import throw, _
 from six import string_types
-from frappe.utils import flt, cint, get_datetime
+from frappe.utils import flt, cint, get_datetime, get_link_to_form
 from erpnext.setup.doctype.item_group.item_group import get_child_item_groups
 from erpnext.stock.doctype.warehouse.warehouse import get_child_warehouses
 from erpnext.stock.get_item_details import get_conversion_factor
@@ -408,7 +408,8 @@ def apply_pricing_rule_on_transaction(doc):
 	conditions = get_other_conditions(conditions, values, doc)
 
 	pricing_rules = frappe.db.sql(""" Select `tabPricing Rule`.* from `tabPricing Rule`
-		where {conditions} """.format(conditions = conditions), values, as_dict=1)
+		where  {conditions} and `tabPricing Rule`.disable = 0
+	""".format(conditions = conditions), values, as_dict=1)
 
 	if pricing_rules:
 		pricing_rules = filter_pricing_rules_for_qty_amount(doc.total_qty,
@@ -420,39 +421,59 @@ def apply_pricing_rule_on_transaction(doc):
 					doc.set('apply_discount_on', d.apply_discount_on)
 
 				for field in ['additional_discount_percentage', 'discount_amount']:
-					if not d.get(field): continue
-
 					pr_field = ('discount_percentage'
 						if field == 'additional_discount_percentage' else field)
 
+					if not d.get(pr_field): continue
+
 					if d.validate_applied_rule and doc.get(field) < d.get(pr_field):
 						frappe.msgprint(_("User has not applied rule on the invoice {0}")
 							.format(doc.name))
 					else:
 						doc.set(field, d.get(pr_field))
+
+				doc.calculate_taxes_and_totals()
 			elif d.price_or_product_discount == 'Product':
-				apply_pricing_rule_for_free_items(doc, d)
+				item_details = frappe._dict()
+				get_product_discount_rule(d, item_details)
+				apply_pricing_rule_for_free_items(doc, item_details.free_item_data)
+				doc.set_missing_values()
 
 def get_applied_pricing_rules(item_row):
 	return (item_row.get("pricing_rules").split(',')
 		if item_row.get("pricing_rules") else [])
 
-def apply_pricing_rule_for_free_items(doc, pricing_rule):
-	if pricing_rule.get('free_item'):
+def get_product_discount_rule(pricing_rule, item_details):
+	free_item = (pricing_rule.free_item
+		if not pricing_rule.same_item or pricing_rule.apply_on == 'Transaction' else item_details.item_code)
+
+	if not free_item:
+		frappe.throw(_("Free item not set in the pricing rule {0}")
+			.format(get_link_to_form("Pricing Rule", pricing_rule.name)))
+
+	item_details.free_item_data = {
+		'item_code': free_item,
+		'qty': pricing_rule.free_qty or 1,
+		'rate': pricing_rule.free_item_rate or 0,
+		'price_list_rate': pricing_rule.free_item_rate or 0,
+		'is_free_item': 1
+	}
+
+	item_data = frappe.get_cached_value('Item', free_item, ['item_name',
+		'description', 'stock_uom'], as_dict=1)
+
+	item_details.free_item_data.update(item_data)
+	item_details.free_item_data['uom'] = pricing_rule.free_item_uom or item_data.stock_uom
+	item_details.free_item_data['conversion_factor'] = get_conversion_factor(free_item, 
+		item_details.free_item_data['uom']).get("conversion_factor", 1)
+
+def apply_pricing_rule_for_free_items(doc, pricing_rule_args, set_missing_values=False):
+	if pricing_rule_args.get('item_code'):
 		items = [d.item_code for d in doc.items
-			if d.item_code == (d.item_code
-			if pricing_rule.get('same_item') else pricing_rule.get('free_item')) and d.is_free_item]
+			if d.item_code == (pricing_rule_args.get("item_code")) and d.is_free_item]
 
 		if not items:
-			doc.append('items', {
-				'item_code': pricing_rule.get('free_item'),
-				'qty': pricing_rule.get('free_qty'),
-				'uom': pricing_rule.get('free_item_uom'),
-				'rate': pricing_rule.get('free_item_rate') or 0,
-				'is_free_item': 1
-			})
-
-			doc.set_missing_values()
+			doc.append('items', pricing_rule_args)
 
 def get_pricing_rule_items(pr_doc):
 	apply_on_data = []
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 75564afe59e..6150516ac8c 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -319,8 +319,8 @@ class AccountsController(TransactionBase):
 					if item.get('discount_amount'):
 						item.rate = item.price_list_rate - item.discount_amount
 
-			elif pricing_rule_args.get('free_item'):
-				apply_pricing_rule_for_free_items(self, pricing_rule_args)
+			elif pricing_rule_args.get('free_item_data'):
+				apply_pricing_rule_for_free_items(self, pricing_rule_args.get('free_item_data'))
 
 		elif pricing_rule_args.get("validate_applied_rule"):
 			for pricing_rule in get_applied_pricing_rules(item):
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 3ec7aff9cbb..17fba8ec4ff 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -735,10 +735,6 @@ class BuyingController(StockController):
 		if not self.get("items"):
 			return
 
-		earliest_schedule_date = min([d.schedule_date for d in self.get("items")])
-		if earliest_schedule_date:
-			self.schedule_date = earliest_schedule_date
-
 		if self.schedule_date:
 			for d in self.get('items'):
 				if not d.schedule_date:
@@ -750,6 +746,10 @@ class BuyingController(StockController):
 		else:
 			frappe.throw(_("Please enter Reqd by Date"))
 
+		earliest_schedule_date = min([d.schedule_date for d in self.get("items")])
+		if earliest_schedule_date:
+			self.schedule_date = earliest_schedule_date
+
 	def validate_items(self):
 		# validate items to see if they have is_purchase_item or is_subcontracted_item enabled
 		if self.doctype=="Material Request": return
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 46a58fba7cc..1be4f27289e 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1305,6 +1305,10 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 				me.remove_pricing_rule(frappe.get_doc(d.doctype, d.name));
 			}
 
+			if (d.free_item_data) {
+				me.apply_product_discount(d.free_item_data);
+			}
+
 			if (d.apply_rule_on_other_items) {
 				items_rule_dict[d.name] = d;
 			}
@@ -1334,6 +1338,20 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		}
 	},
 
+	apply_product_discount: function(free_item_data) {
+		const items = this.frm.doc.items.filter(d => (d.item_code == free_item_data.item_code
+			&& d.is_free_item)) || [];
+
+		if (!items.length) {
+			let row_to_modify = frappe.model.add_child(this.frm.doc,
+				this.frm.doc.doctype + ' Item', 'items');
+
+			for (let key in free_item_data) {
+				row_to_modify[key] = free_item_data[key];
+			}
+		}
+	},
+
 	apply_price_list: function(item, reset_plc_conversion) {
 		// We need to reset plc_conversion_rate sometimes because the call to
 		// `erpnext.stock.get_item_details.apply_price_list` is sensitive to its value

From 5ab823beab4d3b7e1f7093ec696984cf98d651ca Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Mon, 16 Dec 2019 12:08:41 +0530
Subject: [PATCH 037/193] fix: Removed validation from non existent
 manufacturers table

---
 erpnext/stock/doctype/item/item.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 189261cb2de..151be110fca 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -125,7 +125,6 @@ class Item(WebsiteGenerator):
 		self.validate_auto_reorder_enabled_in_stock_settings()
 		self.cant_change()
 		self.update_show_in_website()
-		self.validate_manufacturer()
 
 		if not self.get("__islocal"):
 			self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")
@@ -145,13 +144,6 @@ class Item(WebsiteGenerator):
 		if cint(frappe.db.get_single_value('Stock Settings', 'clean_description_html')):
 			self.description = clean_html(self.description)
 
-	def validate_manufacturer(self):
-		list_man = [(x.manufacturer, x.manufacturer_part_no) for x in self.get('manufacturers')]
-		set_man = set(list_man)
-
-		if len(list_man) != len(set_man):
-			frappe.throw(_("Duplicate entry in Manufacturers table"))
-
 	def validate_customer_provided_part(self):
 		if self.is_customer_provided_item:
 			if self.is_purchase_item:

From 8bd84b28cae9cd513b3374dadad3c82202c12591 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Mon, 16 Dec 2019 12:29:07 +0530
Subject: [PATCH 038/193] fix: schedule date

---
 .../accounts/doctype/pricing_rule/pricing_rule.py  |  2 +-
 erpnext/accounts/doctype/pricing_rule/utils.py     | 14 ++++++++++----
 erpnext/controllers/buying_controller.py           |  8 ++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index af6e4c87afc..b99c07e6367 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -245,7 +245,7 @@ def get_pricing_rule_for_item(args, price_list_rate=0, doc=None, for_validate=Fa
 				if pricing_rule.price_or_product_discount == "Price":
 					apply_price_discount_rule(pricing_rule, item_details, args)
 				else:
-					get_product_discount_rule(pricing_rule, item_details)
+					get_product_discount_rule(pricing_rule, item_details, doc)
 
 		item_details.has_pricing_rule = 1
 
diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 346eba259bd..bd5a14971c1 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -7,7 +7,7 @@ from __future__ import unicode_literals
 import frappe, copy, json
 from frappe import throw, _
 from six import string_types
-from frappe.utils import flt, cint, get_datetime, get_link_to_form
+from frappe.utils import flt, cint, get_datetime, get_link_to_form, today
 from erpnext.setup.doctype.item_group.item_group import get_child_item_groups
 from erpnext.stock.doctype.warehouse.warehouse import get_child_warehouses
 from erpnext.stock.get_item_details import get_conversion_factor
@@ -434,8 +434,8 @@ def apply_pricing_rule_on_transaction(doc):
 
 				doc.calculate_taxes_and_totals()
 			elif d.price_or_product_discount == 'Product':
-				item_details = frappe._dict()
-				get_product_discount_rule(d, item_details)
+				item_details = frappe._dict({'parenttype': doc.doctype})
+				get_product_discount_rule(d, item_details, doc)
 				apply_pricing_rule_for_free_items(doc, item_details.free_item_data)
 				doc.set_missing_values()
 
@@ -443,7 +443,7 @@ def get_applied_pricing_rules(item_row):
 	return (item_row.get("pricing_rules").split(',')
 		if item_row.get("pricing_rules") else [])
 
-def get_product_discount_rule(pricing_rule, item_details):
+def get_product_discount_rule(pricing_rule, item_details, doc=None):
 	free_item = (pricing_rule.free_item
 		if not pricing_rule.same_item or pricing_rule.apply_on == 'Transaction' else item_details.item_code)
 
@@ -467,6 +467,12 @@ def get_product_discount_rule(pricing_rule, item_details):
 	item_details.free_item_data['conversion_factor'] = get_conversion_factor(free_item, 
 		item_details.free_item_data['uom']).get("conversion_factor", 1)
 
+	if item_details.get("parenttype") == 'Purchase Order':
+		item_details.free_item_data['schedule_date'] = doc.schedule_date if doc else today()
+
+	if item_details.get("parenttype") == 'Sales Order':
+		item_details.free_item_data['delivery_date'] = doc.delivery_date if doc else today()
+
 def apply_pricing_rule_for_free_items(doc, pricing_rule_args, set_missing_values=False):
 	if pricing_rule_args.get('item_code'):
 		items = [d.item_code for d in doc.items
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 17fba8ec4ff..3ec7aff9cbb 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -735,6 +735,10 @@ class BuyingController(StockController):
 		if not self.get("items"):
 			return
 
+		earliest_schedule_date = min([d.schedule_date for d in self.get("items")])
+		if earliest_schedule_date:
+			self.schedule_date = earliest_schedule_date
+
 		if self.schedule_date:
 			for d in self.get('items'):
 				if not d.schedule_date:
@@ -746,10 +750,6 @@ class BuyingController(StockController):
 		else:
 			frappe.throw(_("Please enter Reqd by Date"))
 
-		earliest_schedule_date = min([d.schedule_date for d in self.get("items")])
-		if earliest_schedule_date:
-			self.schedule_date = earliest_schedule_date
-
 	def validate_items(self):
 		# validate items to see if they have is_purchase_item or is_subcontracted_item enabled
 		if self.doctype=="Material Request": return

From e9c9cbd2fe981bd68d9a9fc36ce458b17e156821 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Mon, 16 Dec 2019 14:49:59 +0530
Subject: [PATCH 039/193] fix: display serial no selection on adding items to
 cart

---
 erpnext/selling/page/point_of_sale/point_of_sale.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index b213a29ae7e..33fbc229b6e 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -286,14 +286,14 @@ erpnext.pos.PointOfSale = class PointOfSale {
 		if (in_list(['serial_no', 'batch_no'], field)) {
 			args[field] = value;
 		}
-
+		
 		// add to cur_frm
 		const item = this.frm.add_child('items', args);
 		frappe.flags.hide_serial_batch_dialog = true;
 
 		frappe.run_serially([
 			() => {
-				this.frm.script_manager.trigger('item_code', item.doctype, item.name)
+				return this.frm.script_manager.trigger('item_code', item.doctype, item.name)
 					.then(() => {
 						this.frm.script_manager.trigger('qty', item.doctype, item.name)
 							.then(() => {

From f195ccd85ff7ca7b859c6606bb4f5476429fc884 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Mon, 16 Dec 2019 15:03:27 +0530
Subject: [PATCH 040/193] fix: review changes

---
 erpnext/portal/product_configurator/utils.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/erpnext/portal/product_configurator/utils.py b/erpnext/portal/product_configurator/utils.py
index 22208921187..0993e69e042 100644
--- a/erpnext/portal/product_configurator/utils.py
+++ b/erpnext/portal/product_configurator/utils.py
@@ -301,6 +301,8 @@ def get_items(filters=None, search=None):
 	if isinstance(filters, dict):
 		filters = [['Item', fieldname, '=', value] for fieldname, value in filters.items()]
 
+	enabled_items_filter = get_conditions({ 'disabled': 0 }, 'and')
+
 	show_in_website_condition = ''
 	if products_settings.hide_variants:
 		show_in_website_condition = get_conditions({'show_in_website': 1 }, 'and')
@@ -336,12 +338,9 @@ def get_items(filters=None, search=None):
 	filter_condition = get_conditions(filters, 'and')
 
 	where_conditions = ' and '.join(
-		[condition for condition in [show_in_website_condition, search_condition, filter_condition] if condition]
+		[condition for condition in [enabled_items_filter, show_in_website_condition, \
+			search_condition, filter_condition] if condition]
 	)
-	if where_conditions:
-		where_conditions += ' and disabled = 0'
-	else:
-		where_conditions += 'disabled = 0'
 
 	left_joins = []
 	for f in filters:

From 197a99ee354a1a67f4cb2fbc1d80ba4f40f61318 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Mon, 16 Dec 2019 16:18:33 +0530
Subject: [PATCH 041/193] fix: incorrect children boms fetched

---
 erpnext/manufacturing/doctype/bom/bom.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index e3ece569641..f8146bb01e0 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -65,6 +65,7 @@ class BOM(WebsiteGenerator):
 		context.parents = [{'name': 'boms', 'title': _('All BOMs') }]
 
 	def on_update(self):
+		frappe.cache().hdel('bom_children', self.name)
 		self.check_recursion()
 		self.update_stock_qty()
 		self.update_exploded_items()

From b5bf22a821fc84923a7bd3fa33496c880716e4c2 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Mon, 16 Dec 2019 16:53:00 +0530
Subject: [PATCH 042/193] fix: now allow to over production against work order

---
 erpnext/manufacturing/doctype/work_order/work_order.js | 2 ++
 erpnext/manufacturing/doctype/work_order/work_order.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index 8ca89171b66..176ca2e4f52 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -605,6 +605,8 @@ erpnext.work_order = {
 				description: __('Max: {0}', [max]),
 				default: max
 			}, data => {
+				max += (max * (frm.doc.__onload.overproduction_percentage || 0.0)) / 100;
+
 				if (data.qty > max) {
 					frappe.msgprint(__('Quantity must not be more than {0}', [max]));
 					reject();
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 227ef787cac..2b936be7985 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -38,7 +38,7 @@ class WorkOrder(Document):
 		ms = frappe.get_doc("Manufacturing Settings")
 		self.set_onload("material_consumption", ms.material_consumption)
 		self.set_onload("backflush_raw_materials_based_on", ms.backflush_raw_materials_based_on)
-
+		self.set_onload("overproduction_percentage", ms.overproduction_percentage_for_work_order)
 
 	def validate(self):
 		self.validate_production_item()

From 83ecaefd4cd5a8de24ebc1a6dd8fedd82b0a8e58 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Tue, 17 Dec 2019 11:03:22 +0530
Subject: [PATCH 043/193] feat: Custom button to create return entry from
 Employee Advance

---
 .../employee_advance/employee_advance.js      | 27 +++++++++++++++
 .../employee_advance/employee_advance.py      | 33 +++++++++++++++++--
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.js b/erpnext/hr/doctype/employee_advance/employee_advance.js
index 69915fa6e98..54a75925daa 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.js
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.js
@@ -45,6 +45,15 @@ frappe.ui.form.on('Employee Advance', {
 				__('Create')
 			);
 		}
+
+		if (frm.doc.docstatus === 1 
+			&& (flt(frm.doc.claimed_amount) < flt(frm.doc.paid_amount))
+			&& frappe.model.can_create("Journal Entry")) {
+	
+			frm.add_custom_button(__("Return"),  function() {
+				frm.trigger('make_return_entry');
+			}, __('Create'));
+		}
 	},
 
 	make_payment_entry: function(frm) {
@@ -83,6 +92,24 @@ frappe.ui.form.on('Employee Advance', {
 		});
 	},
 
+	make_return_entry: function(frm) {
+		frappe.call({
+			method: 'erpnext.hr.doctype.employee_advance.employee_advance.make_return_entry',
+			args: {
+				'employee_name': frm.doc.employee,
+				'company': frm.doc.company,
+				'employee_advance_name': frm.doc.name,
+				'return_amount': flt(frm.doc.paid_amount - frm.doc.claimed_amount),
+				'mode_of_payment': frm.doc.mode_of_payment,
+				'advance_account': frm.doc.advance_account
+			},
+			callback: function(r) {
+				const doclist = frappe.model.sync(r.message);
+				frappe.set_route('Form', doclist[0].doctype, doclist[0].name);
+			}
+		})
+	},
+
 	employee: function (frm) {
 		if (frm.doc.employee) {
 			return frappe.call({
diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.py b/erpnext/hr/doctype/employee_advance/employee_advance.py
index 674e46438bf..7fe2ebc79e0 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.py
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.py
@@ -7,6 +7,7 @@ import frappe, erpnext
 from frappe import _
 from frappe.model.document import Document
 from frappe.utils import flt, nowdate
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
 
 class EmployeeAdvanceOverPayment(frappe.ValidationError):
 	pass
@@ -102,8 +103,6 @@ def get_due_advance_amount(employee, posting_date):
 
 @frappe.whitelist()
 def make_bank_entry(dt, dn):
-	from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
-
 	doc = frappe.get_doc(dt, dn)
 	payment_account = get_default_bank_cash_account(doc.company, account_type="Cash",
 		mode_of_payment=doc.mode_of_payment)
@@ -132,3 +131,33 @@ def make_bank_entry(dt, dn):
 	})
 
 	return je.as_dict()
+
+@frappe.whitelist()
+def make_return_entry(employee_name, company, employee_advance_name, return_amount, mode_of_payment, advance_account):
+	return_account = get_default_bank_cash_account(company, account_type='Cash', mode_of_payment = mode_of_payment)
+	je = frappe.new_doc('Journal Entry')
+	je.posting_date = nowdate()
+	je.voucher_type = 'Bank Entry'
+	je.company = company
+	je.remark = 'Return against Employee Advance: ' + employee_advance_name
+
+	je.append('accounts', {
+		'account': advance_account,
+		'credit_in_account_currency': return_amount,
+		'reference_type': 'Employee Advance',
+		'reference_name': employee_advance_name,
+		'party_type': 'Employee',
+		'party': employee_name,
+		'is_advance': 'Yes'
+	})
+
+	je.append("accounts", {
+		"account": return_account.account,
+		"debit_in_account_currency": return_amount,
+		"account_currency": return_account.account_currency,
+		"account_type": return_account.account_type
+	})
+
+	return je.as_dict()
+	
+

From 0f583b8c5a3c284d8029bcb7589e041e8e2f49a0 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Tue, 17 Dec 2019 12:44:19 +0530
Subject: [PATCH 044/193] fix: incorrect outstanding amount shwoing in the
 AP/AR report

---
 .../accounts/report/accounts_receivable/accounts_receivable.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 2c53f6e9971..c70a2cd1a74 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -171,7 +171,7 @@ class ReceivablePayableReport(object):
 			row.outstanding = flt(row.invoiced - row.paid - row.credit_note, self.currency_precision)
 			row.invoice_grand_total = row.invoiced
 
-			if abs(row.outstanding) > 0.1/10 ** self.currency_precision:
+			if abs(row.outstanding) > 1.0/10 ** self.currency_precision:
 				# non-zero oustanding, we must consider this row
 
 				if self.is_invoice(row) and self.filters.based_on_payment_terms:

From e65ada28077e980d6a58a168a0bd58f013e10b60 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Tue, 17 Dec 2019 17:54:34 +0530
Subject: [PATCH 045/193] feat: Dynamic filters for dimensions in budget
 variance report

---
 .../budget_variance_report.js                 | 21 ++++++---
 .../budget_variance_report.py                 | 43 +++++++++----------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
index 24511871fdb..3ec4d306c35 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
@@ -46,13 +46,24 @@ frappe.query_reports["Budget Variance Report"] = {
 			fieldtype: "Select",
 			options: ["Cost Center", "Project"],
 			default: "Cost Center",
-			reqd: 1
+			reqd: 1,
+			on_change: function() {
+				frappe.query_report.set_filter_value("budget_against_filter", []);
+				frappe.query_report.refresh();
+			}
 		},
 		{
-			fieldname: "cost_center",
-			label: __("Cost Center"),
-			fieldtype: "Link",
-			options: "Cost Center"
+			fieldname:"budget_against_filter",
+			label: __('Dimension Filter'),
+			fieldtype: "MultiSelectList",
+			get_data: function(txt) {
+				if (!frappe.query_report.filters) return;
+
+				let budget_against = frappe.query_report.get_filter_value('budget_against');
+				if (!budget_against) return;
+
+				return frappe.db.get_link_options(budget_against, txt);
+			}
 		},
 		{
 			fieldname:"show_cumulative",
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
index 8d65ac87148..39e218bfad2 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -12,22 +12,22 @@ from six import iteritems
 from pprint import pprint
 def execute(filters=None):
 	if not filters: filters = {}
-	validate_filters(filters)
+
 	columns = get_columns(filters)
-	if filters.get("cost_center"):
-		cost_centers = [filters.get("cost_center")]
+	if filters.get("budget_against_filter"):
+		dimensions = filters.get("budget_against_filter")
 	else:
-		cost_centers = get_cost_centers(filters)
+		dimensions = get_cost_centers(filters)
 
 	period_month_ranges = get_period_month_ranges(filters["period"], filters["from_fiscal_year"])
-	cam_map = get_cost_center_account_month_map(filters)
+	cam_map = get_dimension_account_month_map(filters)
 
 	data = []
-	for cost_center in cost_centers:
-		cost_center_items = cam_map.get(cost_center)
-		if cost_center_items:
-			for account, monthwise_data in iteritems(cost_center_items):
-				row = [cost_center, account]
+	for dimension in dimensions:
+		dimension_items = cam_map.get(dimension)
+		if dimension_items:
+			for account, monthwise_data in iteritems(dimension_items):
+				row = [dimension, account]
 				totals = [0, 0, 0]
 				for year in get_fiscal_years(filters):
 					last_total = 0
@@ -55,10 +55,6 @@ def execute(filters=None):
 
 	return columns, data
 
-def validate_filters(filters):
-	if filters.get("budget_against") != "Cost Center" and filters.get("cost_center"):
-		frappe.throw(_("Filter based on Cost Center is only applicable if Budget Against is selected as Cost Center"))
-
 def get_columns(filters):
 	columns = [_(filters.get("budget_against")) + ":Link/%s:150"%(filters.get("budget_against")), _("Account") + ":Link/Account:150"]
 
@@ -98,11 +94,12 @@ def get_cost_centers(filters):
 	else:
 		return frappe.db.sql_list("""select name from `tab{tab}`""".format(tab=filters.get("budget_against"))) #nosec
 
-#Get cost center & target details
-def get_cost_center_target_details(filters):
+#Get dimension & target details
+def get_dimension_target_details(filters):
 	cond = ""
-	if filters.get("cost_center"):
-		cond += " and b.cost_center=%s" % frappe.db.escape(filters.get("cost_center"))
+	if filters.get("budget_against_filter"):
+		cond += " and b.{budget_against} in (%s)".format(budget_against = \
+			frappe.scrub(filters.get('budget_against'))) % ', '.join(['%s']* len(filters.get('budget_against_filter')))
 
 	return frappe.db.sql("""
 			select b.{budget_against} as budget_against, b.monthly_distribution, ba.account, ba.budget_amount,b.fiscal_year
@@ -110,8 +107,8 @@ def get_cost_center_target_details(filters):
 			where b.name=ba.parent and b.docstatus = 1 and b.fiscal_year between %s and %s
 			and b.budget_against = %s and b.company=%s {cond} order by b.fiscal_year
 		""".format(budget_against=filters.get("budget_against").replace(" ", "_").lower(), cond=cond),
-		(filters.from_fiscal_year,filters.to_fiscal_year,filters.budget_against, filters.company), as_dict=True)
-
+		tuple([filters.from_fiscal_year,filters.to_fiscal_year,filters.budget_against, filters.company] + filters.get('budget_against_filter')), 
+		as_dict=True)
 
 
 #Get target distribution details of accounts of cost center
@@ -153,14 +150,14 @@ def get_actual_details(name, filters):
 
 	return cc_actual_details
 
-def get_cost_center_account_month_map(filters):
+def get_dimension_account_month_map(filters):
 	import datetime
-	cost_center_target_details = get_cost_center_target_details(filters)
+	dimension_target_details = get_dimension_target_details(filters)
 	tdd = get_target_distribution_details(filters)
 
 	cam_map = {}
 
-	for ccd in cost_center_target_details:
+	for ccd in dimension_target_details:
 		actual_details = get_actual_details(ccd.budget_against, filters)
 
 		for month_id in range(1, 13):

From b695fd31d633ea18d9bf786c5244a56dc1704e80 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Tue, 17 Dec 2019 18:14:33 +0530
Subject: [PATCH 046/193] fix: Remove trailing whitespace and add semicolon

---
 erpnext/hr/doctype/employee_advance/employee_advance.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.js b/erpnext/hr/doctype/employee_advance/employee_advance.js
index 54a75925daa..ba62853336d 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.js
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.js
@@ -46,10 +46,10 @@ frappe.ui.form.on('Employee Advance', {
 			);
 		}
 
-		if (frm.doc.docstatus === 1 
+		if (frm.doc.docstatus === 1
 			&& (flt(frm.doc.claimed_amount) < flt(frm.doc.paid_amount))
 			&& frappe.model.can_create("Journal Entry")) {
-	
+
 			frm.add_custom_button(__("Return"),  function() {
 				frm.trigger('make_return_entry');
 			}, __('Create'));
@@ -107,7 +107,7 @@ frappe.ui.form.on('Employee Advance', {
 				const doclist = frappe.model.sync(r.message);
 				frappe.set_route('Form', doclist[0].doctype, doclist[0].name);
 			}
-		})
+		});
 	},
 
 	employee: function (frm) {

From 4203eb4ee12638c67293152bc0e3dc4f305a991b Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Tue, 17 Dec 2019 18:13:54 +0530
Subject: [PATCH 047/193] fix: not able to make work order from BOM

---
 erpnext/manufacturing/doctype/work_order/work_order.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 2b936be7985..c4238accac7 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -657,8 +657,9 @@ def make_work_order(item, qty=0, project=None):
 	wo_doc = frappe.new_doc("Work Order")
 	wo_doc.production_item = item
 	wo_doc.update(item_details)
-	if qty > 0:
-		wo_doc.qty = qty
+
+	if flt(qty) > 0:
+		wo_doc.qty = flt(qty)
 		wo_doc.get_items_and_operations_from_bom()
 
 	return wo_doc

From be8c4068082ea59fa8b75f8f268438db200e97a4 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Tue, 17 Dec 2019 22:27:23 +0530
Subject: [PATCH 048/193] fix: Update sales register report

---
 .../report/sales_register/sales_register.py   | 235 +++++++++++++++---
 1 file changed, 205 insertions(+), 30 deletions(-)

diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index 0e2821ac16d..afdd31df16d 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -38,32 +38,46 @@ def _execute(filters, additional_table_columns=None, additional_query_columns=No
 		cost_center = list(set(invoice_cc_wh_map.get(inv.name, {}).get("cost_center", [])))
 		warehouse = list(set(invoice_cc_wh_map.get(inv.name, {}).get("warehouse", [])))
 
-		row = [
-			inv.name, inv.posting_date, inv.customer, inv.customer_name
-		]
+		row = {
+			'invoice': inv.name,
+			'posting_date': inv.posting_date,
+			'customer': inv.customer,
+			'customer_name': inv.customer_name
+		}
 
 		if additional_query_columns:
 			for col in additional_query_columns:
-				row.append(inv.get(col))
+				row.update({
+					col: inv.get(col)
+				})
+
+		row.update({
+			'customer_group': inv.get("customer_group"),
+			'territory': inv.get("territory"),
+			'tax_id': inv.get("tax_id"),
+			'receivable_account': inv.debit_to,
+			'mode_of_payment':  ", ".join(mode_of_payments.get(inv.name, [])),
+			'project': inv.project,
+			'owner': inv.owner,
+			'remarks': inv.remarks,
+			'sales_order': ", ".join(sales_order),
+			'delivery_note': ", ".join(delivery_note),
+			'cost_center': ", ".join(cost_center),
+			'warehouse': ", ".join(warehouse),
+			'currency': company_currency
+		})
 
-		row +=[
-			inv.get("customer_group"),
-			inv.get("territory"),
-			inv.get("tax_id"),
-			inv.debit_to, ", ".join(mode_of_payments.get(inv.name, [])),
-			inv.project, inv.owner, inv.remarks,
-			", ".join(sales_order), ", ".join(delivery_note),", ".join(cost_center),
-			", ".join(warehouse), company_currency
-		]
 		# map income values
 		base_net_total = 0
 		for income_acc in income_accounts:
 			income_amount = flt(invoice_income_map.get(inv.name, {}).get(income_acc))
 			base_net_total += income_amount
-			row.append(income_amount)
+			row.update({
+				frappe.scrub(income_acc): income_amount
+			})
 
 		# net total
-		row.append(base_net_total or inv.base_net_total)
+		row.update({'net_total': base_net_total or inv.base_net_total})
 
 		# tax account
 		total_tax = 0
@@ -72,10 +86,18 @@ def _execute(filters, additional_table_columns=None, additional_query_columns=No
 				tax_amount_precision = get_field_precision(frappe.get_meta("Sales Taxes and Charges").get_field("tax_amount"), currency=company_currency) or 2
 				tax_amount = flt(invoice_tax_map.get(inv.name, {}).get(tax_acc), tax_amount_precision)
 				total_tax += tax_amount
-				row.append(tax_amount)
+				row.update({
+					frappe.scrub(tax_acc): tax_amount
+				})
 
 		# total tax, grand total, outstanding amount & rounded total
-		row += [total_tax, inv.base_grand_total, inv.base_rounded_total, inv.outstanding_amount]
+
+		row.update({
+			'tax_total': total_tax,
+			'grand_total': inv.base_grand_total,
+			'rounded_total': inv.base_rounded_total,
+			'outstanding_amount': inv.outstanding_amount
+		})
 
 		data.append(row)
 
@@ -84,19 +106,118 @@ def _execute(filters, additional_table_columns=None, additional_query_columns=No
 def get_columns(invoice_list, additional_table_columns):
 	"""return columns based on filters"""
 	columns = [
-		_("Invoice") + ":Link/Sales Invoice:120", _("Posting Date") + ":Date:80",
-		_("Customer") + ":Link/Customer:120", _("Customer Name") + "::120"
+		{
+			'label': _("Invoice"),
+			'fieldname': 'invoice',
+			'fieldtype': 'Link',
+			'options': 'Sales Invoice',
+			'width': 120
+		},
+		{
+			'label': _("Posting Date"),
+			'fieldname': 'posting_date',
+			'fieldtype': 'Date',
+			'width': 80
+		},
+		{
+			'label': _("Customer"),
+			'fieldname': 'customer',
+			'fieldtype': 'Link',
+			'options': 'Customer',
+			'width': 120
+		},
+		{
+			'label': _("Customer Name"),
+			'fieldname': 'customer_name',
+			'fieldtype': 'Data',
+			'width': 120
+		},
 	]
 
 	if additional_table_columns:
 		columns += additional_table_columns
 
 	columns +=[
-		_("Customer Group") + ":Link/Customer Group:120", _("Territory") + ":Link/Territory:80",
-		_("Tax Id") + "::80", _("Receivable Account") + ":Link/Account:120", _("Mode of Payment") + "::120",
-		_("Project") +":Link/Project:80", _("Owner") + "::150", _("Remarks") + "::150",
-		_("Sales Order") + ":Link/Sales Order:100", _("Delivery Note") + ":Link/Delivery Note:100",
-		_("Cost Center") + ":Link/Cost Center:100", _("Warehouse") + ":Link/Warehouse:100",
+		{
+			'label': _("Custmer Group"),
+			'fieldname': 'customer_group',
+			'fieldtype': 'Link',
+			'options': 'Customer Group',
+			'width': 120
+		},
+		{
+			'label': _("Territory"),
+			'fieldname': 'territory',
+			'fieldtype': 'Link',
+			'options': 'Territory',
+			'width': 80
+		},
+		{
+			'label': _("Tax Id"),
+			'fieldname': 'tax_id',
+			'fieldtype': 'Data',
+			'width': 120
+		},
+		{
+			'label': _("Receivable Account"),
+			'fieldname': 'receivable_account',
+			'fieldtype': 'Link',
+			'options': 'Account',
+			'width': 80
+		},
+		{
+			'label': _("Mode Of Payment"),
+			'fieldname': 'mode_of_payment',
+			'fieldtype': 'Data',
+			'width': 120
+		},
+		{
+			'label': _("Project"),
+			'fieldname': 'project',
+			'fieldtype': 'Link',
+			'options': 'project',
+			'width': 80
+		},
+		{
+			'label': _("Owner"),
+			'fieldname': 'owner',
+			'fieldtype': 'Data',
+			'width': 150
+		},
+		{
+			'label': _("Remarks"),
+			'fieldname': 'remarks',
+			'fieldtype': 'Data',
+			'width': 150
+		},
+		{
+			'label': _("Sales Order"),
+			'fieldname': 'sales_order',
+			'fieldtype': 'Link',
+			'options': 'Sales Order',
+			'width': 100
+		},
+		{
+			'label': _("Delivery Note"),
+			'fieldname': 'delivery_note',
+			'fieldtype': 'Link',
+			'options': 'Delivery Note',
+			'width': 100
+		},
+		{
+			'label': _("Cost Center"),
+			'fieldname': 'cost_center',
+			'fieldtype': 'Link',
+			'options': 'Cost Center',
+			'width': 100
+		},
+		{
+			'label': _("Warehouse"),
+			'fieldname': 'warehouse',
+			'fieldtype': 'Link',
+			'options': 'Warehouse',
+			'width': 100
+		},
 		{
 			"fieldname": "currency",
 			"label": _("Currency"),
@@ -105,7 +226,10 @@ def get_columns(invoice_list, additional_table_columns):
 		}
 	]
 
-	income_accounts = tax_accounts = income_columns = tax_columns = []
+	income_accounts = []
+	tax_accounts = []
+	income_columns = []
+	tax_columns = []
 
 	if invoice_list:
 		income_accounts = frappe.db.sql_list("""select distinct income_account
@@ -119,14 +243,65 @@ def get_columns(invoice_list, additional_table_columns):
 			and parent in (%s) order by account_head""" %
 			', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))
 
-	income_columns = [(account + ":Currency/currency:120") for account in income_accounts]
+	for account in income_accounts:
+		income_columns.append({
+			"label": account,
+			"fieldname": frappe.scrub(account),
+			"fieldtype": "Currency",
+			"options": 'currency',
+			"width": 120
+		})
+
 	for account in tax_accounts:
 		if account not in income_accounts:
-			tax_columns.append(account + ":Currency/currency:120")
+			tax_columns.append({
+				"label": account,
+				"fieldname": frappe.scrub(account),
+				"fieldtype": "Currency",
+				"options": 'currency',
+				"width": 120
+			})
 
-	columns = columns + income_columns + [_("Net Total") + ":Currency/currency:120"] + tax_columns + \
-		[_("Total Tax") + ":Currency/currency:120", _("Grand Total") + ":Currency/currency:120",
-		_("Rounded Total") + ":Currency/currency:120", _("Outstanding Amount") + ":Currency/currency:120"]
+	net_total_column = [{
+		"label": _("Net Total"),
+		"fieldname": "net_total",
+		"fieldtype": "Currency",
+		"options": 'currency',
+		"width": 120
+	}]
+
+	total_columns = [
+		{
+			"label": _("Tax Total"),
+			"fieldname": "tax_total",
+			"fieldtype": "Currency",
+			"options": 'currency',
+			"width": 120
+		},
+		{
+			"label": _("Grand Total"),
+			"fieldname": "grand_total",
+			"fieldtype": "Currency",
+			"options": 'currency',
+			"width": 120
+		},
+		{
+			"label": _("Rounded Total"),
+			"fieldname": "rounded_total",
+			"fieldtype": "Currency",
+			"options": 'currency',
+			"width": 120
+		},
+		{
+			"label": _("Outstanding Amount"),
+			"fieldname": "outstanding_amount",
+			"fieldtype": "Currency",
+			"options": 'currency',
+			"width": 120
+		}
+	]
+
+	columns = columns + income_columns + net_total_column + tax_columns + total_columns
 
 	return columns, income_accounts, tax_accounts
 

From f597ba82ea41a93228ed83c3d4fbe3aae4fae28f Mon Sep 17 00:00:00 2001
From: Ben Knowles <benknowles@users.noreply.github.com>
Date: Tue, 17 Dec 2019 13:07:02 -0600
Subject: [PATCH 049/193] fix: task validation error when adding tasks to
 projects (#19919)

* fix: task validation error when adding tasks to projects

When adding a task to a project, if the project didn't have an Expected End Date the validation would fail.

This is because passing a None value to getdate() returns today's date, rather than being optional as expected.

* update task.py
---
 erpnext/projects/doctype/task/task.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 7083d694f80..45f26814a65 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -47,11 +47,11 @@ class Task(NestedSet):
 		if not self.project or frappe.flags.in_test:
 			return
 
-		expected_end_date = getdate(frappe.db.get_value("Project", self.project, "expected_end_date"))
+		expected_end_date = frappe.db.get_value("Project", self.project, "expected_end_date")
 
 		if expected_end_date:
-			validate_project_dates(expected_end_date, self, "exp_start_date", "exp_end_date", "Expected")
-			validate_project_dates(expected_end_date, self, "act_start_date", "act_end_date", "Actual")
+			validate_project_dates(getdate(expected_end_date), self, "exp_start_date", "exp_end_date", "Expected")
+			validate_project_dates(getdate(expected_end_date), self, "act_start_date", "act_end_date", "Actual")
 
 	def validate_status(self):
 		if self.status!=self.get_db_value("status") and self.status == "Completed":
@@ -278,4 +278,4 @@ def validate_project_dates(project_end_date, task, task_start, task_end, actual_
 		frappe.throw(_("Task's {0} Start Date cannot be after Project's End Date.").format(actual_or_expected_date))
 
 	if task.get(task_end) and date_diff(project_end_date, getdate(task.get(task_end))) < 0:
-		frappe.throw(_("Task's {0} End Date cannot be after Project's End Date.").format(actual_or_expected_date))
\ No newline at end of file
+		frappe.throw(_("Task's {0} End Date cannot be after Project's End Date.").format(actual_or_expected_date))

From e7aa20ebef1b3442d7f962434e8ae285f2ad8933 Mon Sep 17 00:00:00 2001
From: 0Pranav <prnvnachnekar@gmail.com>
Date: Mon, 16 Dec 2019 16:52:42 +0530
Subject: [PATCH 050/193] fix: replace sql query by orm in
 delete_communications and added tests

---
 .../company/delete_company_transactions.py    | 11 ++--
 erpnext/setup/doctype/company/test_company.py | 51 +++++++++++++++++++
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index 637e65578a1..1503adb504c 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -106,7 +106,10 @@ def delete_lead_addresses(company_name):
 		frappe.db.sql("""update tabCustomer set lead_name=NULL where lead_name in ({leads})""".format(leads=",".join(leads)))
 
 def delete_communications(doctype, company_name, company_fieldname):
-		frappe.db.sql("""
-			DELETE FROM `tabCommunication` WHERE reference_doctype = %s AND
-			EXISTS (SELECT name FROM `tab{0}` WHERE {1} = %s AND `tabCommunication`.reference_name = name)
-			""".format(doctype, company_fieldname), (doctype, company_name))
+		reference_docs = frappe.get_all(doctype, filters={company_fieldname:company_name})
+		reference_doc_names = [r.name for r in reference_docs]
+		
+		communications = frappe.get_all("Communication", filters={"reference_doctype":doctype,"reference_name":["in", reference_doc_names]})
+		communication_names = [c.name for c in communications]
+
+		frappe.delete_doc("Communication", communication_names)
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index 8d9c23a37da..1664b660b86 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -88,6 +88,57 @@ class TestCompany(unittest.TestCase):
 					self.delete_mode_of_payment(template)
 					frappe.delete_doc("Company", template)
 
+	def test_delete_communication(self):
+		from erpnext.setup.doctype.company.delete_company_transactions import delete_communications
+		company = create_child_company()
+		lead = create_test_lead_in_company(company)
+		communication = create_company_communication("Lead", lead)
+		delete_communications("Lead", "Test Company", "company")
+		self.assertFalse(frappe.db.exists("Communcation", communication))
+		self.assertFalse(frappe.db.exists({"doctype":"Comunication Link", "link_name": communication}))
+
 	def delete_mode_of_payment(self, company):
 		frappe.db.sql(""" delete from `tabMode of Payment Account`
 			where company =%s """, (company))
+
+def create_company_communication(doctype, docname):
+	comm = frappe.get_doc({
+			"doctype": "Communication",
+			"communication_type": "Communication",
+			"content": "Deduplication of Links",
+			"communication_medium": "Email",
+			"reference_doctype":doctype,
+			"reference_name":docname
+		})
+	comm.insert()
+
+def create_child_company():
+	child_company = frappe.db.exists("Company", "Test Company")
+	if not child_company:
+		child_company = frappe.get_doc({
+			"doctype":"Company",
+			"company_name":"Test Company",
+			"abbr":"test_company",
+			"default_currency":"INR"
+		})
+		child_company.insert()
+	else:
+		child_company = frappe.get_doc("Company", child_company)
+	
+	return child_company.name
+
+def create_test_lead_in_company(company):
+	lead = frappe.db.exists("Lead", "Test Lead in new company")
+	if not lead:
+		lead = frappe.get_doc({
+			"doctype": "Lead",
+			"lead_name": "Test Lead in new company",
+			"scompany": company
+		})
+		lead.insert()
+	else:
+		lead = frappe.get_doc("Lead", lead)
+		lead.company = company
+		lead.save()
+	return lead.name
+

From 1202e64403eb50222e6012347ba76c0f56553c4d Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Wed, 18 Dec 2019 11:43:16 +0530
Subject: [PATCH 051/193] fix: Training Event Email Tenplate (#19652)

---
 .../training_scheduled.html                   | 51 ++++++++++++++++---
 .../training_scheduled.json                   |  6 ++-
 .../training_scheduled/training_scheduled.md  | 51 ++++++++++++++++---
 3 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/erpnext/hr/notification/training_scheduled/training_scheduled.html b/erpnext/hr/notification/training_scheduled/training_scheduled.html
index b1aeb2c8739..374038ac202 100644
--- a/erpnext/hr/notification/training_scheduled/training_scheduled.html
+++ b/erpnext/hr/notification/training_scheduled/training_scheduled.html
@@ -1,9 +1,44 @@
-<h3>{{_("Training Event")}}</h3>
+<table class="panel-header" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr height="10"></tr>
+    <tr>
+        <td width="15"></td>
+        <td>
+            <div class="text-medium text-muted">
+                <span>{{_("Training Event:")}} {{ doc.event_name }}</span>
+            </div>
+        </td>
+        <td width="15"></td>
+    </tr>
+    <tr height="10"></tr>
+</table>
 
-<p>{{ doc.introduction }}</p>
-
-<h4>{{_("Details")}}</h4>
-{{_("Event Name")}}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}
-<br>{{_("Event Location")}}: {{ doc.location }}
-<br>{{_("Start Time")}}: {{ doc.start_time }}
-<br>{{_("End Time")}}: {{ doc.end_time }}
+<table class="panel-body" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr height="10"></tr>
+    <tr>
+        <td width="15"></td>
+        <td>
+            <div>
+                {{ doc.introduction }}
+                <ul class="list-unstyled" style="line-height: 1.7">
+                    <li>{{_("Event Location")}}: <b>{{ doc.location }}</b></li>
+                    {% set start = frappe.utils.get_datetime(doc.start_time) %}
+                    {% set end = frappe.utils.get_datetime(doc.end_time) %}
+                    {% if start.date() == end.date() %}
+                    <li>{{_("Date")}}: <b>{{ start.strftime("%A, %d %b %Y") }}</b></li>
+                    <li>
+                        {{_("Timing")}}: <b>{{ start.strftime("%I:%M %p") + ' to ' + end.strftime("%I:%M %p") }}</b>
+                    </li>
+                    {% else %}
+                    <li>{{_("Start Time")}}: <b>{{ start.strftime("%A, %d %b %Y at %I:%M %p") }}</b>
+                    </li>
+                    <li>{{_("End Time")}}: <b>{{ end.strftime("%A, %d %b %Y at %I:%M %p") }}</b>
+                    </li>
+                    {% endif %}
+                    <li>{{ _('Event Link') }}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}</li>
+                </ul>
+            </div>
+        </td>
+        <td width="15"></td>
+    </tr>
+    <tr height="10"></tr>
+</table>
\ No newline at end of file
diff --git a/erpnext/hr/notification/training_scheduled/training_scheduled.json b/erpnext/hr/notification/training_scheduled/training_scheduled.json
index c07e1a6285b..966b8875723 100644
--- a/erpnext/hr/notification/training_scheduled/training_scheduled.json
+++ b/erpnext/hr/notification/training_scheduled/training_scheduled.json
@@ -1,5 +1,7 @@
 {
  "attach_print": 0,
+ "channel": "Email",
+ "condition": "",
  "creation": "2017-08-11 03:13:40.519614",
  "days_in_advance": 0,
  "docstatus": 0,
@@ -9,8 +11,8 @@
  "event": "Submit",
  "idx": 0,
  "is_standard": 1,
- "message": "<h3>{{_(\"Training Event\")}}</h3>\n\n<p>{{ doc.introduction }}</p>\n\n<h4>{{_(\"Details\")}}</h4>\n{{_(\"Event Name\")}}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}\n<br>{{_(\"Event Location\")}}: {{ doc.location }}\n<br>{{_(\"Start Time\")}}: {{ doc.start_time }}\n<br>{{_(\"End Time\")}}: {{ doc.end_time }}\n",
- "modified": "2017-08-13 22:49:42.338881",
+ "message": "<table class=\"panel-header\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n    <tr height=\"10\"></tr>\n    <tr>\n        <td width=\"15\"></td>\n        <td>\n            <div class=\"text-medium text-muted\">\n                <span>{{_(\"Training Event:\")}} {{ doc.event_name }}</span>\n            </div>\n        </td>\n        <td width=\"15\"></td>\n    </tr>\n    <tr height=\"10\"></tr>\n</table>\n\n<table class=\"panel-body\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n    <tr height=\"10\"></tr>\n    <tr>\n        <td width=\"15\"></td>\n        <td>\n            <div>\n                <ul class=\"list-unstyled\" style=\"line-height: 1.7\">\n                    <li>{{ doc.introduction }}</li>\n                    <li>{{_(\"Event Location\")}}: <b>{{ doc.location }}</b></li>\n                    {% set start = frappe.utils.get_datetime(doc.start_time) %}\n                    {% set end = frappe.utils.get_datetime(doc.end_time) %}\n                    {% if start.date() == end.date() %}\n                    <li>{{_(\"Date\")}}: <b>{{ start.strftime(\"%A, %d %b %Y\") }}</b></li>\n                    <li>\n                        {{_(\"Timing\")}}: <b>{{ start.strftime(\"%I:%M %p\") + ' to ' + end.strftime(\"%I:%M %p\") }}</b>\n                    </li>\n                    {% else %}\n                    <li>{{_(\"Start Time\")}}: <b>{{ start.strftime(\"%A, %d %b %Y at %I:%M %p\") }}</b>\n                    </li>\n                    <li>{{_(\"End Time\")}}: <b>{{ end.strftime(\"%A, %d %b %Y at %I:%M %p\") }}</b>\n                    </li>\n                    {% endif %}\n                </ul>\n                {{ _('Event Link') }}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}\n            </div>\n        </td>\n        <td width=\"15\"></td>\n    </tr>\n    <tr height=\"10\"></tr>\n</table>",
+ "modified": "2019-11-29 15:38:31.805409",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Training Scheduled",
diff --git a/erpnext/hr/notification/training_scheduled/training_scheduled.md b/erpnext/hr/notification/training_scheduled/training_scheduled.md
index bcadf7df590..374038ac202 100644
--- a/erpnext/hr/notification/training_scheduled/training_scheduled.md
+++ b/erpnext/hr/notification/training_scheduled/training_scheduled.md
@@ -1,9 +1,44 @@
-<h3>{{_("Training Event")}}</h3>
-<p>{{ message }}</p>
+<table class="panel-header" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr height="10"></tr>
+    <tr>
+        <td width="15"></td>
+        <td>
+            <div class="text-medium text-muted">
+                <span>{{_("Training Event:")}} {{ doc.event_name }}</span>
+            </div>
+        </td>
+        <td width="15"></td>
+    </tr>
+    <tr height="10"></tr>
+</table>
 
-<h4>{{_("Details")}}</h4>
-{{_("Event Name")}}: <a href="{{ event_link }}">{{ name }}</a>
-<br>{{_("Event Location")}}: {{ location }}
-<br>{{_("Start Time")}}: {{ start_time }}
-<br>{{_("End Time")}}: {{ end_time }}
-<br>{{_("Attendance")}}: {{ attendance }}
+<table class="panel-body" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr height="10"></tr>
+    <tr>
+        <td width="15"></td>
+        <td>
+            <div>
+                {{ doc.introduction }}
+                <ul class="list-unstyled" style="line-height: 1.7">
+                    <li>{{_("Event Location")}}: <b>{{ doc.location }}</b></li>
+                    {% set start = frappe.utils.get_datetime(doc.start_time) %}
+                    {% set end = frappe.utils.get_datetime(doc.end_time) %}
+                    {% if start.date() == end.date() %}
+                    <li>{{_("Date")}}: <b>{{ start.strftime("%A, %d %b %Y") }}</b></li>
+                    <li>
+                        {{_("Timing")}}: <b>{{ start.strftime("%I:%M %p") + ' to ' + end.strftime("%I:%M %p") }}</b>
+                    </li>
+                    {% else %}
+                    <li>{{_("Start Time")}}: <b>{{ start.strftime("%A, %d %b %Y at %I:%M %p") }}</b>
+                    </li>
+                    <li>{{_("End Time")}}: <b>{{ end.strftime("%A, %d %b %Y at %I:%M %p") }}</b>
+                    </li>
+                    {% endif %}
+                    <li>{{ _('Event Link') }}: {{ frappe.utils.get_link_to_form(doc.doctype, doc.name) }}</li>
+                </ul>
+            </div>
+        </td>
+        <td width="15"></td>
+    </tr>
+    <tr height="10"></tr>
+</table>
\ No newline at end of file

From 5150c69ee6af5d21e44eb0c0d4eb2c6967221654 Mon Sep 17 00:00:00 2001
From: 0Pranav <prnvnachnekar@gmail.com>
Date: Wed, 18 Dec 2019 12:07:24 +0530
Subject: [PATCH 052/193] use open_mapped_doc instead of create_new_doc

---
 erpnext/selling/doctype/customer/customer.js | 12 ++--
 erpnext/selling/doctype/customer/customer.py | 59 ++++++++++++++++++++
 2 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index cca8efeca4a..aa1b92f9a4c 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -5,13 +5,13 @@ frappe.ui.form.on("Customer", {
 	setup: function(frm) {
 
 		frm.make_methods = {
-			'Quotation': () => erpnext.utils.create_new_doc('Quotation', {
-				'quotation_to': frm.doc.doctype,
-				'party_name': frm.doc.name
+			'Quotation': () => frappe.model.open_mapped_doc({
+				method: "erpnext.selling.doctype.customer.customer.make_quotation",
+				frm: cur_frm
 			}),
-			'Opportunity': () => erpnext.utils.create_new_doc('Opportunity', {
-				'opportunity_from': frm.doc.doctype,
-				'party_name': frm.doc.name
+			'Opportunity': () => frappe.model.open_mapped_doc({
+				method: "erpnext.selling.doctype.customer.customer.make_opportunity",
+				frm: cur_frm
 			})
 		}
 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 57308cea41b..73ab7e6bb72 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -12,6 +12,7 @@ from erpnext.utilities.transaction_base import TransactionBase
 from erpnext.accounts.party import validate_party_accounts, get_dashboard_info, get_timeline_data # keep this
 from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
 from frappe.model.rename_doc import update_linked_doctypes
+from frappe.model.mapper import get_mapped_doc
 
 class Customer(TransactionBase):
 	def get_feed(self):
@@ -238,6 +239,64 @@ def create_contact(contact, party_type, party, email):
 	contact.append('links', dict(link_doctype=party_type, link_name=party))
 	contact.insert()
 
+@frappe.whitelist()
+def make_quotation(source_name, target_doc=None):
+
+	def set_missing_values(source, target):
+		_set_missing_values(source,target)
+
+	target_doc = get_mapped_doc("Customer", source_name, 
+		{"Customer": {
+			"doctype": "Quotation",
+			"field_map": {
+				"name":"party_name"
+			}
+		}}, target_doc, set_missing_values)
+
+	target_doc.quotation_to = "Customer"
+	target_doc.run_method("set_missing_values")
+	target_doc.run_method("set_other_charges")
+	target_doc.run_method("calculate_taxes_and_totals")
+
+	target_doc.selling_price_list = frappe.get_doc("Customer",source_name).default_price_list
+	return target_doc
+
+@frappe.whitelist()
+def make_opportunity(source_name, target_doc=None):
+	def set_missing_values(source, target):
+		_set_missing_values(source,target)
+
+	target_doc = get_mapped_doc("Customer", source_name, 
+		{"Customer": {
+			"doctype": "Opportunity",
+			"field_map": {
+				"name": "party_name",
+				"doctype": "opportunity_from",
+			}
+		}}, target_doc, set_missing_values
+	)
+
+	return target_doc
+
+def _set_missing_values(source, target):
+	address = frappe.get_all('Dynamic Link', {
+			'link_doctype': source.doctype,
+			'link_name': source.name,
+			'parenttype': 'Address',
+		}, ['parent'], limit=1)
+
+	contact = frappe.get_all('Dynamic Link', {
+			'link_doctype': source.doctype,
+			'link_name': source.name,
+			'parenttype': 'Contact',
+		}, ['parent'], limit=1)
+
+	if address:
+		target.customer_address = address[0].parent
+
+	if contact:
+		target.contact_person = contact[0].parent
+
 @frappe.whitelist()
 def get_loyalty_programs(doc):
 	''' returns applicable loyalty programs for a customer '''

From 84ae2cc5431972e0eb6483ccddd34f32950f5bc2 Mon Sep 17 00:00:00 2001
From: 0Pranav <prnvnachnekar@gmail.com>
Date: Wed, 18 Dec 2019 15:44:04 +0530
Subject: [PATCH 053/193] fix: defualt timezone not getting selected

---
 erpnext/www/book_appointment/index.js | 13 ++++---------
 erpnext/www/book_appointment/index.py | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/erpnext/www/book_appointment/index.js b/erpnext/www/book_appointment/index.js
index 5a814c6381e..262e31b3e40 100644
--- a/erpnext/www/book_appointment/index.js
+++ b/erpnext/www/book_appointment/index.js
@@ -24,20 +24,15 @@ async function get_global_variables() {
 }
 
 function setup_timezone_selector() {
-    /**
-     * window.timezones is a dictionary with the following structure
-     * { IANA name: Pretty name}
-     * For example : { Asia/Kolkata : "India Time - Asia/Kolkata"}
-     */
     let timezones_element = document.getElementById('appointment-timezone');
-    let offset = new Date().getTimezoneOffset();
-    Object.keys(window.timezones).forEach((timezone) => {
+    let local_timezone = moment.tz.guess()
+    window.timezones.forEach(timezone => {
         let opt = document.createElement('option');
         opt.value = timezone;
-        if (timezone == moment.tz.guess()) {
+        if (timezone == local_timezone) {
             opt.selected = true;
         }
-        opt.innerHTML = window.timezones[timezone]
+        opt.innerHTML = timezone;
         timezones_element.appendChild(opt)
     });
 }
diff --git a/erpnext/www/book_appointment/index.py b/erpnext/www/book_appointment/index.py
index e4af7e8e436..fe98c7a0e90 100644
--- a/erpnext/www/book_appointment/index.py
+++ b/erpnext/www/book_appointment/index.py
@@ -25,18 +25,20 @@ def get_appointment_settings():
 
 @frappe.whitelist(allow_guest=True)
 def get_timezones():
-	from babel.dates import get_timezone, get_timezone_name, Locale
-	from frappe.utils.momentjs import get_all_timezones
+	import pytz
+	return pytz.all_timezones
+	# from babel.dates import get_timezone, get_timezone_name, Locale
+	# from frappe.utils.momentjs import get_all_timezones
 
-	translated_dict = {}
-	locale = Locale.parse(frappe.local.lang, sep="-")
+	# translated_dict = {}
+	# locale = Locale.parse(frappe.local.lang, sep="-")
 
-	for tz in get_all_timezones():
-		timezone_name = get_timezone_name(get_timezone(tz), locale=locale, width='short')
-		if timezone_name:
-			translated_dict[tz] = timezone_name + ' - ' + tz
+	# for tz in get_all_timezones():
+	# 	timezone_name = get_timezone_name(get_timezone(tz), locale=locale, width='short')
+	# 	if timezone_name:
+	# 		translated_dict[tz] = timezone_name + ' - ' + tz
 
-	return translated_dict
+	# return translated_dict
 
 @frappe.whitelist(allow_guest=True)
 def get_appointment_slots(date, timezone):

From 0db86204cf86d0aff2d8c5c16ba3afef2341ac35 Mon Sep 17 00:00:00 2001
From: 0Pranav <prnvnachnekar@gmail.com>
Date: Wed, 18 Dec 2019 16:00:58 +0530
Subject: [PATCH 054/193] fix : only set price list if it exists for customer

---
 erpnext/selling/doctype/customer/customer.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 73ab7e6bb72..9fd37adc13e 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -258,7 +258,10 @@ def make_quotation(source_name, target_doc=None):
 	target_doc.run_method("set_other_charges")
 	target_doc.run_method("calculate_taxes_and_totals")
 
-	target_doc.selling_price_list = frappe.get_doc("Customer",source_name).default_price_list
+	price_list = frappe.get_value("Customer",source_name, 'default_price_list')
+	if price_list:
+		target_doc.selling_price_list = price_list
+
 	return target_doc
 
 @frappe.whitelist()

From 5f5c725ef99153b8489c6755cac84515aed66c16 Mon Sep 17 00:00:00 2001
From: 0Pranav <prnvnachnekar@gmail.com>
Date: Wed, 18 Dec 2019 16:21:50 +0530
Subject: [PATCH 055/193] add book appointment to the sidebar

---
 erpnext/hooks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 2a5e6d8f49a..c99ae7da5e4 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -180,6 +180,7 @@ standard_portal_menu_items = [
 	{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission", "role": "Student"},
 	{"title": _("Certification"), "route": "/certification", "reference_doctype": "Certification Application", "role": "Non Profit Portal User"},
 	{"title": _("Material Request"), "route": "/material-requests", "reference_doctype": "Material Request", "role": "Customer"},
+	{"title": _("Appointment Booking"), "route": "/book_appointment"},
 ]
 
 default_roles = [

From e786eea7dbcf78c272ca8d90440d0afc783faf2e Mon Sep 17 00:00:00 2001
From: 0Pranav <prnvnachnekar@gmail.com>
Date: Wed, 18 Dec 2019 16:25:26 +0530
Subject: [PATCH 056/193] remove comments

---
 erpnext/www/book_appointment/index.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/erpnext/www/book_appointment/index.py b/erpnext/www/book_appointment/index.py
index fe98c7a0e90..7bfac89f308 100644
--- a/erpnext/www/book_appointment/index.py
+++ b/erpnext/www/book_appointment/index.py
@@ -27,18 +27,6 @@ def get_appointment_settings():
 def get_timezones():
 	import pytz
 	return pytz.all_timezones
-	# from babel.dates import get_timezone, get_timezone_name, Locale
-	# from frappe.utils.momentjs import get_all_timezones
-
-	# translated_dict = {}
-	# locale = Locale.parse(frappe.local.lang, sep="-")
-
-	# for tz in get_all_timezones():
-	# 	timezone_name = get_timezone_name(get_timezone(tz), locale=locale, width='short')
-	# 	if timezone_name:
-	# 		translated_dict[tz] = timezone_name + ' - ' + tz
-
-	# return translated_dict
 
 @frappe.whitelist(allow_guest=True)
 def get_appointment_slots(date, timezone):

From 2ae79b8ac2c64df86bd33971b6e8ed39ae5d8b41 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Wed, 18 Dec 2019 17:48:39 +0530
Subject: [PATCH 057/193] fix: Pricing Rule Discount for Product

---
 erpnext/accounts/doctype/pricing_rule/pricing_rule.json | 9 +++------
 erpnext/accounts/doctype/pricing_rule/pricing_rule.py   | 3 +++
 erpnext/public/js/controllers/transaction.js            | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index f73fb10d320..29d83783d07 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -1,5 +1,4 @@
 {
- "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:title",
@@ -390,8 +389,7 @@
    "fieldname": "rate_or_discount",
    "fieldtype": "Select",
    "label": "Rate or Discount",
-   "options": "\nRate\nDiscount Percentage\nDiscount Amount",
-   "reqd": 1
+   "options": "\nRate\nDiscount Percentage\nDiscount Amount"
   },
   {
    "default": "Grand Total",
@@ -440,7 +438,7 @@
   },
   {
    "default": "0",
-   "depends_on": "eval:!doc.mixed_conditions && doc.price_or_product_discount == 'Price'",
+   "depends_on": "eval:!doc.mixed_conditions && doc.apply_on != 'Transaction'",
    "fieldname": "same_item",
    "fieldtype": "Check",
    "label": "Same Item"
@@ -556,8 +554,7 @@
  ],
  "icon": "fa fa-gift",
  "idx": 1,
- "links": [],
- "modified": "2019-12-13 15:48:48.331495",
+ "modified": "2019-12-18 17:29:22.957077",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule",
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index b99c07e6367..3c14819e6fe 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -47,6 +47,9 @@ class PricingRule(Document):
 		if tocheck and not self.get(tocheck):
 			throw(_("{0} is required").format(self.meta.get_label(tocheck)), frappe.MandatoryError)
 
+		if self.price_or_product_discount == 'Price' and not self.rate_or_discount:
+			throw(_("Rate or Discount is required for the price discount."), frappe.MandatoryError)
+
 	def validate_applicable_for_selling_or_buying(self):
 		if not self.selling and not self.buying:
 			throw(_("Atleast one of the Selling or Buying must be selected"))
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 1be4f27289e..6db849aca77 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -500,6 +500,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 								() => {
 									var d = locals[cdt][cdn];
 									me.add_taxes_from_item_tax_template(d.item_tax_rate);
+									if (d.free_item_data) {
+										me.apply_product_discount(d.free_item_data);
+									}
 								},
 								() => me.frm.script_manager.trigger("price_list_rate", cdt, cdn),
 								() => me.toggle_conversion_factor(item),

From aba58ba50ef19ea3d9dd464b9798f9f736a7f5ca Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 19 Dec 2019 11:02:37 +0530
Subject: [PATCH 058/193] fix: Spacing after commas

---
 erpnext/selling/doctype/customer/customer.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 9fd37adc13e..136236c417c 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -243,9 +243,9 @@ def create_contact(contact, party_type, party, email):
 def make_quotation(source_name, target_doc=None):
 
 	def set_missing_values(source, target):
-		_set_missing_values(source,target)
+		_set_missing_values(source, target)
 
-	target_doc = get_mapped_doc("Customer", source_name, 
+	target_doc = get_mapped_doc("Customer", source_name,
 		{"Customer": {
 			"doctype": "Quotation",
 			"field_map": {
@@ -258,7 +258,7 @@ def make_quotation(source_name, target_doc=None):
 	target_doc.run_method("set_other_charges")
 	target_doc.run_method("calculate_taxes_and_totals")
 
-	price_list = frappe.get_value("Customer",source_name, 'default_price_list')
+	price_list = frappe.get_value("Customer", source_name, 'default_price_list')
 	if price_list:
 		target_doc.selling_price_list = price_list
 
@@ -267,17 +267,16 @@ def make_quotation(source_name, target_doc=None):
 @frappe.whitelist()
 def make_opportunity(source_name, target_doc=None):
 	def set_missing_values(source, target):
-		_set_missing_values(source,target)
+		_set_missing_values(source, target)
 
-	target_doc = get_mapped_doc("Customer", source_name, 
+	target_doc = get_mapped_doc("Customer", source_name,
 		{"Customer": {
 			"doctype": "Opportunity",
 			"field_map": {
 				"name": "party_name",
 				"doctype": "opportunity_from",
 			}
-		}}, target_doc, set_missing_values
-	)
+		}}, target_doc, set_missing_values)
 
 	return target_doc
 

From 9d9a78442e849dd248781f9917361f3e77681852 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Thu, 19 Dec 2019 13:10:57 +0530
Subject: [PATCH 059/193] fix: bad filter query

---
 .../purchase_invoice/purchase_invoice.js      | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index d7e64cf36fd..643de7d300a 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -382,21 +382,11 @@ cur_frm.fields_dict['items'].grid.get_field("item_code").get_query = function(do
 
 cur_frm.fields_dict['credit_to'].get_query = function(doc) {
 	// filter on Account
-	if (doc.supplier) {
-		return {
-			filters: {
-				'account_type': 'Payable',
-				'is_group': 0,
-				'company': doc.company
-			}
-		}
-	} else {
-		return {
-			filters: {
-				'report_type': 'Balance Sheet',
-				'is_group': 0,
-				'company': doc.company
-			}
+	return {
+		filters: {
+			'account_type': 'Payable',
+			'is_group': 0,
+			'company': doc.company
 		}
 	}
 }

From e9cb561d8d1ae27b1d505d820a07424bfb76b9fc Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Thu, 19 Dec 2019 13:18:46 +0530
Subject: [PATCH 060/193] fix: no role has cancelling permission for share
 transfer doctype

---
 erpnext/accounts/doctype/share_transfer/share_transfer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.json b/erpnext/accounts/doctype/share_transfer/share_transfer.json
index f17bf04cafd..9e549e06858 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.json
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.json
@@ -188,7 +188,7 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-11-07 13:31:17.999744",
+ "modified": "2019-12-19 13:15:59.001301",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Share Transfer",
@@ -196,6 +196,7 @@
  "permissions": [
   {
    "amend": 1,
+   "cancel": 1,
    "create": 1,
    "delete": 1,
    "email": 1,

From 457ca0fe6cc0e66c25cdf05c85098f3d0483b07c Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Thu, 19 Dec 2019 13:34:29 +0530
Subject: [PATCH 061/193] fix: Company None not found in get_valuation_rate

---
 erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 00d27ef232b..1b9660e6d2c 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -372,7 +372,7 @@ class StockEntry(StockController):
 			elif d.t_warehouse and not d.basic_rate:
 				d.basic_rate = get_valuation_rate(d.item_code, d.t_warehouse,
 					self.doctype, self.name, d.allow_zero_valuation_rate,
-					currency=erpnext.get_company_currency(self.company))
+					currency=erpnext.get_company_currency(self.company), company=self.company)
 
 	def set_actual_qty(self):
 		allow_negative_stock = cint(frappe.db.get_value("Stock Settings", None, "allow_negative_stock"))

From 1e4ea466d3a58c2433006cdccf919a7acd0763fa Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 11 Dec 2019 09:36:17 +0530
Subject: [PATCH 062/193] style: update/standardize rename_doc usage

---
 .../v11_0/merge_land_unit_with_location.py    |  5 ++--
 .../v11_0/rename_asset_adjustment_doctype.py  |  4 ++--
 .../patches/v11_0/rename_health_insurance.py  |  3 +--
 .../rename_healthcare_doctype_and_fields.py   |  3 +--
 .../rename_production_order_to_work_order.py  |  9 ++++---
 .../rename_supplier_type_to_supplier_group.py |  3 +--
 .../rename_pricing_rule_child_doctypes.py     |  3 +--
 erpnext/stock/doctype/item/test_item.py       |  3 +--
 .../stock/doctype/warehouse/test_warehouse.py | 24 +++++++++++--------
 9 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/erpnext/patches/v11_0/merge_land_unit_with_location.py b/erpnext/patches/v11_0/merge_land_unit_with_location.py
index 1ea486dfd5d..7845da255a8 100644
--- a/erpnext/patches/v11_0/merge_land_unit_with_location.py
+++ b/erpnext/patches/v11_0/merge_land_unit_with_location.py
@@ -4,19 +4,18 @@
 from __future__ import unicode_literals
 
 import frappe
-from frappe.model.rename_doc import rename_doc
 from frappe.model.utils.rename_field import rename_field
 
 
 def execute():
 	# Rename and reload the Land Unit and Linked Land Unit doctypes
 	if frappe.db.table_exists('Land Unit') and not frappe.db.table_exists('Location'):
-		rename_doc('DocType', 'Land Unit', 'Location', force=True)
+		frappe.rename_doc('DocType', 'Land Unit', 'Location', force=True)
 
 	frappe.reload_doc('assets', 'doctype', 'location')
 
 	if frappe.db.table_exists('Linked Land Unit') and not frappe.db.table_exists('Linked Location'):
-		rename_doc('DocType', 'Linked Land Unit', 'Linked Location', force=True)
+		frappe.rename_doc('DocType', 'Linked Land Unit', 'Linked Location', force=True)
 
 	frappe.reload_doc('assets', 'doctype', 'linked_location')
 
diff --git a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
index c03ab0b7111..fad0cf7a45e 100644
--- a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
+++ b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
@@ -3,9 +3,9 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.model.rename_doc import rename_doc
+
 
 def execute():
 	if frappe.db.table_exists("Asset Adjustment") and not frappe.db.table_exists("Asset Value Adjustment"):
-		rename_doc('DocType', 'Asset Adjustment', 'Asset Value Adjustment', force=True)
+		frappe.rename_doc('DocType', 'Asset Adjustment', 'Asset Value Adjustment', force=True)
 		frappe.reload_doc('assets', 'doctype', 'asset_value_adjustment')
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/rename_health_insurance.py b/erpnext/patches/v11_0/rename_health_insurance.py
index 24d1ddf0314..e605071a297 100644
--- a/erpnext/patches/v11_0/rename_health_insurance.py
+++ b/erpnext/patches/v11_0/rename_health_insurance.py
@@ -2,9 +2,8 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-from frappe.model.rename_doc import rename_doc
 import frappe
 
 def execute():
-	rename_doc('DocType', 'Health Insurance', 'Employee Health Insurance', force=True)
+	frappe.rename_doc('DocType', 'Health Insurance', 'Employee Health Insurance', force=True)
 	frappe.reload_doc('hr', 'doctype', 'employee_health_insurance')
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/rename_healthcare_doctype_and_fields.py b/erpnext/patches/v11_0/rename_healthcare_doctype_and_fields.py
index 8fdac07658f..9705681b33f 100644
--- a/erpnext/patches/v11_0/rename_healthcare_doctype_and_fields.py
+++ b/erpnext/patches/v11_0/rename_healthcare_doctype_and_fields.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 import frappe
-from frappe.model.rename_doc import rename_doc
 from frappe.model.utils.rename_field import rename_field
 from frappe.modules import scrub, get_doctype_module
 
@@ -37,7 +36,7 @@ doc_rename_map = {
 def execute():
 	for dt in doc_rename_map:
 		if frappe.db.exists('DocType', dt):
-			rename_doc('DocType', dt, doc_rename_map[dt], force=True)
+			frappe.rename_doc('DocType', dt, doc_rename_map[dt], force=True)
 
 	for dn in field_rename_map:
 		if frappe.db.exists('DocType', dn):
diff --git a/erpnext/patches/v11_0/rename_production_order_to_work_order.py b/erpnext/patches/v11_0/rename_production_order_to_work_order.py
index 2c27fbbc9df..2f620f413ba 100644
--- a/erpnext/patches/v11_0/rename_production_order_to_work_order.py
+++ b/erpnext/patches/v11_0/rename_production_order_to_work_order.py
@@ -2,18 +2,17 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-from frappe.model.rename_doc import rename_doc
-from frappe.model.utils.rename_field import rename_field
 import frappe
+from frappe.model.utils.rename_field import rename_field
 
 def execute():
-	rename_doc('DocType', 'Production Order', 'Work Order', force=True)
+	frappe.rename_doc('DocType', 'Production Order', 'Work Order', force=True)
 	frappe.reload_doc('manufacturing', 'doctype', 'work_order')
 
-	rename_doc('DocType', 'Production Order Item', 'Work Order Item', force=True)
+	frappe.rename_doc('DocType', 'Production Order Item', 'Work Order Item', force=True)
 	frappe.reload_doc('manufacturing', 'doctype', 'work_order_item')
 
-	rename_doc('DocType', 'Production Order Operation', 'Work Order Operation', force=True)
+	frappe.rename_doc('DocType', 'Production Order Operation', 'Work Order Operation', force=True)
 	frappe.reload_doc('manufacturing', 'doctype', 'work_order_operation')
 
 	frappe.reload_doc('projects', 'doctype', 'timesheet')
diff --git a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
index 52d4621c7b7..c4b3838c71d 100644
--- a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
+++ b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 import frappe
-from frappe.model.rename_doc import rename_doc
 from frappe.model.utils.rename_field import rename_field
 from frappe import _
 from frappe.utils.nestedset import rebuild_tree
@@ -9,7 +8,7 @@ def execute():
 	if frappe.db.table_exists("Supplier Group"):
 		frappe.reload_doc('setup', 'doctype', 'supplier_group')
 	elif frappe.db.table_exists("Supplier Type"):
-		rename_doc("DocType", "Supplier Type", "Supplier Group", force=True)
+		frappe.rename_doc("DocType", "Supplier Type", "Supplier Group", force=True)
 		frappe.reload_doc('setup', 'doctype', 'supplier_group')
 		frappe.reload_doc("accounts", "doctype", "pricing_rule")
 		frappe.reload_doc("accounts", "doctype", "tax_rule")
diff --git a/erpnext/patches/v12_0/rename_pricing_rule_child_doctypes.py b/erpnext/patches/v12_0/rename_pricing_rule_child_doctypes.py
index 41ac8cff2b4..b9ad622b0ea 100644
--- a/erpnext/patches/v12_0/rename_pricing_rule_child_doctypes.py
+++ b/erpnext/patches/v12_0/rename_pricing_rule_child_doctypes.py
@@ -3,7 +3,6 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.model.rename_doc import rename_doc
 
 doctypes = {
     'Price Discount Slab': 'Promotional Scheme Price Discount',
@@ -16,6 +15,6 @@ doctypes = {
 def execute():
     for old_doc, new_doc in doctypes.items():
         if not frappe.db.table_exists(new_doc) and frappe.db.table_exists(old_doc):
-            rename_doc('DocType', old_doc, new_doc)
+            frappe.rename_doc('DocType', old_doc, new_doc)
             frappe.reload_doc("accounts", "doctype", frappe.scrub(new_doc))
             frappe.delete_doc("DocType", old_doc)
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index da53d8d6b15..cbd5e33b146 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -11,7 +11,6 @@ from erpnext.controllers.item_variant import (create_variant, ItemVariantExistsE
 	InvalidItemAttributeValueError, get_variant)
 from erpnext.stock.doctype.item.item import StockExistsForTemplate, InvalidBarcode
 from erpnext.stock.doctype.item.item import get_uom_conv_factor
-from frappe.model.rename_doc import rename_doc
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 from erpnext.stock.get_item_details import get_item_details
 
@@ -348,7 +347,7 @@ class TestItem(unittest.TestCase):
 		make_stock_entry(item_code="Test Item for Merging 2", target="_Test Warehouse 1 - _TC",
 			qty=1, rate=100)
 
-		rename_doc("Item", "Test Item for Merging 1", "Test Item for Merging 2", merge=True)
+		frappe.rename_doc("Item", "Test Item for Merging 1", "Test Item for Merging 2", merge=True)
 
 		self.assertFalse(frappe.db.exists("Item", "Test Item for Merging 1"))
 
diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py
index dc39e101ce0..e0483d3ab64 100644
--- a/erpnext/stock/doctype/warehouse/test_warehouse.py
+++ b/erpnext/stock/doctype/warehouse/test_warehouse.py
@@ -1,18 +1,22 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 from __future__ import unicode_literals
-from frappe.model.rename_doc import rename_doc
-from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+
+import unittest
+
+import frappe
 from frappe.utils import cint
-from erpnext import set_perpetual_inventory
 from frappe.test_runner import make_test_records
-from erpnext.accounts.doctype.account.test_account import get_inventory_account, create_account
 
 import erpnext
-import frappe
-import unittest
+from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+from erpnext import set_perpetual_inventory
+from erpnext.accounts.doctype.account.test_account import get_inventory_account, create_account
+
+
 test_records = frappe.get_test_records('Warehouse')
 
+
 class TestWarehouse(unittest.TestCase):
 	def setUp(self):
 		if not frappe.get_value('Item', '_Test Item'):
@@ -41,7 +45,7 @@ class TestWarehouse(unittest.TestCase):
 		# Rename with abbr
 		if frappe.db.exists("Warehouse", "Test Warehouse for Renaming 2 - _TC"):
 			frappe.delete_doc("Warehouse", "Test Warehouse for Renaming 2 - _TC")
-		rename_doc("Warehouse", "Test Warehouse for Renaming 1 - _TC", "Test Warehouse for Renaming 2 - _TC")
+		frappe.rename_doc("Warehouse", "Test Warehouse for Renaming 1 - _TC", "Test Warehouse for Renaming 2 - _TC")
 
 		self.assertTrue(frappe.db.get_value("Warehouse",
 			filters={"account": "Test Warehouse for Renaming 1 - _TC"}))
@@ -50,7 +54,7 @@ class TestWarehouse(unittest.TestCase):
 		if frappe.db.exists("Warehouse", "Test Warehouse for Renaming 3 - _TC"):
 			frappe.delete_doc("Warehouse", "Test Warehouse for Renaming 3 - _TC")
 
-		rename_doc("Warehouse", "Test Warehouse for Renaming 2 - _TC", "Test Warehouse for Renaming 3")
+		frappe.rename_doc("Warehouse", "Test Warehouse for Renaming 2 - _TC", "Test Warehouse for Renaming 3")
 
 		self.assertTrue(frappe.db.get_value("Warehouse",
 			filters={"account": "Test Warehouse for Renaming 1 - _TC"}))
@@ -58,7 +62,7 @@ class TestWarehouse(unittest.TestCase):
 		# Another rename with multiple dashes
 		if frappe.db.exists("Warehouse", "Test - Warehouse - Company - _TC"):
 			frappe.delete_doc("Warehouse", "Test - Warehouse - Company - _TC")
-		rename_doc("Warehouse", "Test Warehouse for Renaming 3 - _TC", "Test - Warehouse - Company")
+		frappe.rename_doc("Warehouse", "Test Warehouse for Renaming 3 - _TC", "Test - Warehouse - Company")
 
 	def test_warehouse_merging(self):
 		set_perpetual_inventory(1)
@@ -78,7 +82,7 @@ class TestWarehouse(unittest.TestCase):
 				{"item_code": "_Test Item", "warehouse": "Test Warehouse for Merging 2 - _TC"}, "actual_qty"))
 		)
 
-		rename_doc("Warehouse", "Test Warehouse for Merging 1 - _TC",
+		frappe.rename_doc("Warehouse", "Test Warehouse for Merging 1 - _TC",
 			"Test Warehouse for Merging 2 - _TC", merge=True)
 
 		self.assertFalse(frappe.db.exists("Warehouse", "Test Warehouse for Merging 1 - _TC"))

From c1a1e7d503cf9df43287abe81d3f2d899c6c5ad3 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 19 Dec 2019 20:11:37 +0530
Subject: [PATCH 063/193] style: formatting changes

---
 erpnext/hub_node/api.py                       |   4 +-
 .../js/hub/components/edit_details_dialog.js  |  14 +-
 erpnext/public/js/hub/pages/Item.vue          | 181 +++++++++---------
 3 files changed, 101 insertions(+), 98 deletions(-)

diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
index 602d65e81a1..f362539ee7c 100644
--- a/erpnext/hub_node/api.py
+++ b/erpnext/hub_node/api.py
@@ -116,10 +116,10 @@ def get_valid_items(search_value=''):
 	return valid_items
 
 @frappe.whitelist()
-def update_item(ref_doctype, ref_doc, data):
+def update_item(ref_doc, data):
 	data = json.loads(data)
 
-	data.update(dict(doctype=ref_doctype, name=ref_doc))
+	data.update(dict(doctype='Hub Item', name=ref_doc))
 	try:
 		connection = get_hub_connection()
 		connection.update(data)
diff --git a/erpnext/public/js/hub/components/edit_details_dialog.js b/erpnext/public/js/hub/components/edit_details_dialog.js
index e249ca5d7a4..97c5f83a13a 100644
--- a/erpnext/public/js/hub/components/edit_details_dialog.js
+++ b/erpnext/public/js/hub/components/edit_details_dialog.js
@@ -1,4 +1,4 @@
-function EditDetailsDialog(primary_action, defaults) {
+function edit_details_dialog(params) {
 	let dialog = new frappe.ui.Dialog({
 		title: __('Update Details'),
 		fields: [
@@ -6,14 +6,14 @@ function EditDetailsDialog(primary_action, defaults) {
 				label: 'Item Name',
 				fieldname: 'item_name',
 				fieldtype: 'Data',
-				default: defaults.item_name,
+				default: params.defaults.item_name,
 				reqd: 1
 			},
 			{
 				label: 'Hub Category',
 				fieldname: 'hub_category',
 				fieldtype: 'Autocomplete',
-				default: defaults.hub_category,
+				default: params.defaults.hub_category,
 				options: [],
 				reqd: 1
 			},
@@ -21,13 +21,13 @@ function EditDetailsDialog(primary_action, defaults) {
 				label: 'Description',
 				fieldname: 'description',
 				fieldtype: 'Text',
-				default: defaults.description,
+				default: params.defaults.description,
 				options: [],
 				reqd: 1
 			}
 		],
-		primary_action_label: primary_action.label || __('Update Details'),
-		primary_action: primary_action.fn
+		primary_action_label: params.primary_action.label || __('Update Details'),
+		primary_action: params.primary_action.fn
 	});
 
 	hub.call('get_categories').then(categories => {
@@ -38,4 +38,4 @@ function EditDetailsDialog(primary_action, defaults) {
 	return dialog;
 }
 
-export { EditDetailsDialog };
+export { edit_details_dialog };
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
index 31cc8d5c8cf..11744781b7a 100644
--- a/erpnext/public/js/hub/pages/Item.vue
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -1,10 +1,5 @@
 <template>
-	<div
-		class="marketplace-page"
-		:data-page-name="page_name"
-		v-if="init || item"
-	>
-
+	<div class="marketplace-page" :data-page-name="page_name" v-if="init || item">
 		<detail-view
 			:title="title"
 			:image="image"
@@ -12,20 +7,15 @@
 			:menu_items="menu_items"
 			:show_skeleton="init"
 		>
-			<detail-header-item slot="detail-header-item"
-				:value="item_subtitle"
-			></detail-header-item>
-			<detail-header-item slot="detail-header-item"
-				:value="item_views_and_ratings"
-			></detail-header-item>
+			<detail-header-item slot="detail-header-item" :value="item_subtitle"></detail-header-item>
+			<detail-header-item slot="detail-header-item" :value="item_views_and_ratings"></detail-header-item>
 
-			<button v-if="primary_action" slot="detail-header-item"
+			<button
+				v-if="primary_action"
+				slot="detail-header-item"
 				class="btn btn-primary btn-sm margin-top"
 				@click="primary_action.action"
-			>
-				{{ primary_action.label }}
-			</button>
-
+			>{{ primary_action.label }}</button>
 		</detail-view>
 
 		<review-area v-if="!init" :hub_item_name="hub_item_name"></review-area>
@@ -35,7 +25,7 @@
 <script>
 import ReviewArea from '../components/ReviewArea.vue';
 import { get_rating_html } from '../components/reviews';
-import { EditDetailsDialog } from '../components/edit_details_dialog';
+import { edit_details_dialog } from '../components/edit_details_dialog';
 
 export default {
 	name: 'item-page',
@@ -52,21 +42,20 @@ export default {
 			item: null,
 			title: null,
 			image: null,
-			sections: [],
-
+			sections: []
 		};
 	},
 	computed: {
 		is_own_item() {
 			let is_own_item = false;
-			if(this.item) {
-				if(this.item.hub_seller === hub.settings.hub_seller_name) {
+			if (this.item) {
+				if (this.item.hub_seller === hub.settings.hub_seller_name) {
 					is_own_item = true;
 				}
 			}
 			return is_own_item;
 		},
-		menu_items(){
+		menu_items() {
 			return [
 				{
 					label: __('Save Item'),
@@ -93,11 +82,11 @@ export default {
 					condition: hub.is_user_registered() && this.is_own_item,
 					action: this.unpublish_item
 				}
-			]
+			];
 		},
 
 		item_subtitle() {
-			if(!this.item) {
+			if (!this.item) {
 				return '';
 			}
 
@@ -106,25 +95,31 @@ export default {
 			const rating = this.item.average_rating;
 
 			if (rating > 0) {
-				subtitle_items.push(rating + `<i class='fa fa-fw fa-star-o'></i>`)
+				subtitle_items.push(rating + `<i class='fa fa-fw fa-star-o'></i>`);
 			}
 
-			subtitle_items.push({value:this.item.company,on_click:this.go_to_seller_profile_page});
+			subtitle_items.push({
+				value: this.item.company,
+				on_click: this.go_to_seller_profile_page
+			});
 
 			return subtitle_items;
 		},
 
 		item_views_and_ratings() {
-			if(!this.item) {
+			if (!this.item) {
 				return '';
 			}
 
 			let stats = __('No views yet');
-			if(this.item.view_count) {
+			if (this.item.view_count) {
 				const views_message = __(`${this.item.view_count} Views`);
 
 				const rating_html = get_rating_html(this.item.average_rating);
-				const rating_count = this.item.no_of_ratings > 0 ? `${this.item.no_of_ratings} reviews` : __('No reviews yet');
+				const rating_count =
+					this.item.no_of_ratings > 0
+						? `${this.item.no_of_ratings} reviews`
+						: __('No reviews yet');
 
 				stats = [views_message, rating_html, rating_count];
 			}
@@ -137,7 +132,7 @@ export default {
 				return {
 					label: __('Contact Seller'),
 					action: this.contact_seller.bind(this)
-				}
+				};
 			} else {
 				return undefined;
 			}
@@ -157,7 +152,7 @@ export default {
 			setTimeout(() => {
 				hub.call('add_item_view', {
 					hub_item_name: this.hub_item_name
-				})
+				});
 				// .then(() => {
 				// 	erpnext.hub.item_view_cache.push(this.hub_item_name);
 				// });
@@ -168,12 +163,12 @@ export default {
 		get_item_details() {
 			this.item_received = hub.call('get_item_details', { hub_item_name: this.hub_item_name })
 				.then(item => {
-				this.init = false;
-				this.item = item;
+					this.init = false;
+					this.item = item;
 
-				this.build_data();
-				this.make_dialogs();
-			});
+					this.build_data();
+					this.make_dialogs();
+				});
 		},
 		go_to_seller_profile_page(seller_name) {
 			frappe.set_route(`marketplace/seller/${seller_name}`);
@@ -206,32 +201,36 @@ export default {
 
 		add_to_saved_items() {
 			hub.call('add_item_to_user_saved_items', {
-				hub_item_name: this.hub_item_name,
-				hub_user: frappe.session.user
-			})
-			.then(() => {
-				const saved_items_link = `<b><a href="#marketplace/saved-items">${__('Saved')}</a></b>`
-				frappe.show_alert(saved_items_link);
-				erpnext.hub.trigger('action:item_save');
-			})
-			.catch(e => {
-				console.error(e);
-			});
+					hub_item_name: this.hub_item_name,
+					hub_user: frappe.session.user
+				})
+				.then(() => {
+					const saved_items_link = `<b><a href="#marketplace/saved-items">${__(
+						'Saved'
+					)}</a></b>`;
+					frappe.show_alert(saved_items_link);
+					erpnext.hub.trigger('action:item_save');
+				})
+				.catch(e => {
+					console.error(e);
+				});
 		},
 
 		add_to_featured_items() {
 			hub.call('add_item_to_seller_featured_items', {
-				hub_item_name: this.hub_item_name,
-				hub_user: frappe.session.user
-			},)
-			.then(() => {
-				const featured_items_link = `<b><a href="#marketplace/featured-items">${__('Added to Featured Items')}</a></b>`
-				frappe.show_alert(featured_items_link);
-				erpnext.hub.trigger('action:item_feature');
-			})
-			.catch(e => {
-				console.error(e);
-			});
+					hub_item_name: this.hub_item_name,
+					hub_user: frappe.session.user
+				})
+				.then(() => {
+					const featured_items_link = `<b><a href="#marketplace/featured-items">${__(
+						'Added to Featured Items'
+					)}</a></b>`;
+					frappe.show_alert(featured_items_link);
+					erpnext.hub.trigger('action:item_feature');
+				})
+				.catch(e => {
+					console.error(e);
+				});
 		},
 
 		make_contact_seller_dialog() {
@@ -254,13 +253,13 @@ export default {
 					if (!message) return;
 
 					hub.call('send_message', {
-						hub_item: this.item.name,
-						message
-					})
+							hub_item: this.item.name,
+							message
+						})
 						.then(() => {
 							this.contact_seller_dialog.hide();
 							frappe.set_route('marketplace', 'buying', this.item.name);
-							erpnext.hub.trigger('action:send_message')
+							erpnext.hub.trigger('action:send_message');
 						});
 				}
 			});
@@ -277,7 +276,10 @@ export default {
 					}
 				],
 				primary_action: ({ message }) => {
-					hub.call('add_reported_item', { hub_item_name: this.item.name, message })
+					hub.call('add_reported_item', {
+							hub_item_name: this.item.name,
+							message
+						})
 						.then(() => {
 							d.hide();
 							frappe.show_alert(__('Item Reported'));
@@ -287,35 +289,32 @@ export default {
 		},
 
 		make_editing_dialog() {
-			this.edit_details_dialog = EditDetailsDialog(
-				{
-					fn: (values) => {
+			this.edit_dialog = edit_details_dialog({
+				primary_action: {
+					fn: values => {
 						this.update_details(values);
-						this.edit_details_dialog.hide();
+						this.edit_dialog.hide();
 					}
-				}, {
-						'item_name': this.item.item_name,
-						'hub_category': this.item.hub_category,
-						'description': this.item.description,
+				},
+				defaults: {
+					item_name: this.item.item_name,
+					hub_category: this.item.hub_category,
+					description: this.item.description
 				}
-			);
+			});
 		},
 
 		update_details(values) {
-			frappe.call(
-				'erpnext.hub_node.api.update_item',
-				{
-					ref_doctype: 'Hub Item',
+			frappe.call('erpnext.hub_node.api.update_item', {
 					ref_doc: this.item.name,
 					data: values
-				}
-			)
-			.then((r) => {
-				return this.get_item_details();
-			})
-			.then(() => {
-				frappe.show_alert(__(`${this.item.item_name} Updated`));
-			})
+				})
+				.then(r => {
+					return this.get_item_details();
+				})
+				.then(() => {
+					frappe.show_alert(__(`${this.item.item_name} Updated`));
+				});
 		},
 
 		contact_seller() {
@@ -324,23 +323,27 @@ export default {
 
 		report_item() {
 			if (!hub.is_seller_registered()) {
-				frappe.throw(__('Please login as a Marketplace User to report this item.'));
+				frappe.throw(
+					__('Please login as a Marketplace User to report this item.')
+				);
 			}
 			this.report_item_dialog.show();
 		},
 
 		edit_details() {
 			if (!hub.is_seller_registered()) {
-				frappe.throw(__('Please login as a Marketplace User to edit this item.'));
+				frappe.throw(
+					__('Please login as a Marketplace User to edit this item.')
+				);
 			}
-			this.edit_details_dialog.show();
+			this.edit_dialog.show();
 		},
 
 		unpublish_item() {
 			frappe.msgprint(__('This feature is under development...'));
 		}
 	}
-}
+};
 </script>
 
 <style scoped></style>

From ad9eb9b72c18d96d8521181b82e41066593c93a6 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 19 Dec 2019 20:57:40 +0530
Subject: [PATCH 064/193] fix: Tax amount not visible for some invoices

---
 erpnext/regional/report/gstr_2/gstr_2.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/erpnext/regional/report/gstr_2/gstr_2.py b/erpnext/regional/report/gstr_2/gstr_2.py
index a3622690078..f326fe07cac 100644
--- a/erpnext/regional/report/gstr_2/gstr_2.py
+++ b/erpnext/regional/report/gstr_2/gstr_2.py
@@ -44,12 +44,16 @@ class Gstr2Report(Gstr1Report):
 		for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
 			invoice_details = self.invoices.get(inv)
 			for rate, items in items_based_on_rate.items():
-				row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
-				tax_amount = taxable_value * rate / 100
-				if inv in self.igst_invoices:
-					row += [tax_amount, 0, 0]
+				if inv not in self.igst_invoices:
+					rate = rate / 2
+					row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
+					tax_amount = taxable_value * rate / 100
+					row += [0, tax_amount, tax_amount]
 				else:
-					row += [0, tax_amount / 2, tax_amount / 2]
+					row, taxable_value = self.get_row_data_for_invoice(inv, invoice_details, rate, items)
+					tax_amount = taxable_value * rate / 100
+					row += [tax_amount, 0, 0]
+
 
 				row += [
 					self.invoice_cess.get(inv),

From c2a5f99a387e66f6495d42d328f71399c20d91d4 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 20 Dec 2019 12:56:01 +0530
Subject: [PATCH 065/193] fix: incorrect consumed qty for partial purchase
 receipt in subcontracting

---
 erpnext/controllers/buying_controller.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 3ec7aff9cbb..75b896bb134 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -265,16 +265,17 @@ class BuyingController(StockController):
 
 			fg_yet_to_be_received = qty_to_be_received_map.get(item_key)
 
-			raw_material_data = backflushed_raw_materials_map.get(item_key, {})
-
-			consumed_qty = raw_material_data.get('qty', 0)
-			consumed_serial_nos = raw_material_data.get('serial_nos', '')
-			consumed_batch_nos = raw_material_data.get('batch_nos', '')
-
 			transferred_batch_qty_map = get_transferred_batch_qty_map(item.purchase_order, item.item_code)
 			backflushed_batch_qty_map = get_backflushed_batch_qty_map(item.purchase_order, item.item_code)
 
 			for raw_material in transferred_raw_materials + non_stock_items:
+				rm_item_key = '{}{}'.format(raw_material.rm_item_code, item.purchase_order)
+				raw_material_data = backflushed_raw_materials_map.get(rm_item_key, {})
+
+				consumed_qty = raw_material_data.get('qty', 0)
+				consumed_serial_nos = raw_material_data.get('serial_nos', '')
+				consumed_batch_nos = raw_material_data.get('batch_nos', '')
+
 				transferred_qty = raw_material.qty
 
 				rm_qty_to_be_consumed = transferred_qty - consumed_qty

From 7e68f050d9f1a4e86c7d12d3527ca722f1b61a88 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Fri, 20 Dec 2019 14:49:18 +0530
Subject: [PATCH 066/193] fix: account manager doesn't have cancel submit perm
 for share transfer

---
 erpnext/accounts/doctype/share_transfer/share_transfer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.json b/erpnext/accounts/doctype/share_transfer/share_transfer.json
index 9e549e06858..59a305317d8 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.json
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.json
@@ -188,7 +188,7 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-12-19 13:15:59.001301",
+ "modified": "2019-12-20 14:48:01.990600",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Share Transfer",
@@ -222,6 +222,7 @@
    "write": 1
   },
   {
+   "cancel": 1,
    "create": 1,
    "delete": 1,
    "email": 1,
@@ -231,6 +232,7 @@
    "report": 1,
    "role": "Accounts Manager",
    "share": 1,
+   "submit": 1,
    "write": 1
   }
  ],

From 0dba4345f3af0b0476c1fb4bb0b7b3174e575098 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 20 Dec 2019 17:04:22 +0530
Subject: [PATCH 067/193] fix: patch

---
 erpnext/patches/v12_0/add_export_type_field_in_party_master.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/erpnext/patches/v12_0/add_export_type_field_in_party_master.py b/erpnext/patches/v12_0/add_export_type_field_in_party_master.py
index c565b7ecd87..5bb6e3fb339 100644
--- a/erpnext/patches/v12_0/add_export_type_field_in_party_master.py
+++ b/erpnext/patches/v12_0/add_export_type_field_in_party_master.py
@@ -27,6 +27,8 @@ def execute():
 		tax_category = inter_state_category.name
 
 	for doctype in ('Sales Taxes and Charges Template', 'Purchase Taxes and Charges Template'):
+		if not frappe.get_meta(doctype).has_field('is_inter_state'): continue
+
 		template = frappe.db.get_value(doctype, {'is_inter_state': 1, 'disabled': 0}, ['name'])
 		if template:
 			frappe.db.set_value(doctype, template, 'tax_category', tax_category)

From 0e83a5754b890bf04b58e15ce500f71dff5ad52d Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 23 Dec 2019 08:24:46 +0530
Subject: [PATCH 068/193] fix: remove illustrations from onboarding slides
 (#19872)

* fix: remove illustrations from onboarding slides

* fix: change Welcome slide's description

* fix: justify text in slide
---
 .../add_a_few_suppliers.json                    |   5 +++--
 .../images/illustrations/customers-onboard.png  | Bin 16870 -> 0 bytes
 .../images/illustrations/desk-onboard.png       | Bin 11054 -> 0 bytes
 .../images/illustrations/letterhead-onboard.png | Bin 63859 -> 0 bytes
 .../images/illustrations/products-onboard.png   | Bin 33014 -> 0 bytes
 .../images/illustrations/supplier-onboard.png   | Bin 17531 -> 0 bytes
 .../add_a_few_customers.json                    |   5 +++--
 .../welcome_back_to_erpnext!.json               |   4 ++--
 .../welcome_to_erpnext!.json                    |   7 ++++---
 .../add_a_few_products_you_buy_or_sell.json     |   5 +++--
 10 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 erpnext/public/images/illustrations/customers-onboard.png
 delete mode 100644 erpnext/public/images/illustrations/desk-onboard.png
 delete mode 100644 erpnext/public/images/illustrations/letterhead-onboard.png
 delete mode 100644 erpnext/public/images/illustrations/products-onboard.png
 delete mode 100644 erpnext/public/images/illustrations/supplier-onboard.png

diff --git a/erpnext/buying/onboarding_slide/add_a_few_suppliers/add_a_few_suppliers.json b/erpnext/buying/onboarding_slide/add_a_few_suppliers/add_a_few_suppliers.json
index d3adcb79812..ce3d8cfb7b2 100644
--- a/erpnext/buying/onboarding_slide/add_a_few_suppliers/add_a_few_suppliers.json
+++ b/erpnext/buying/onboarding_slide/add_a_few_suppliers/add_a_few_suppliers.json
@@ -12,9 +12,10 @@
   }
  ],
  "idx": 0,
- "image_src": "/assets/erpnext/images/illustrations/supplier-onboard.png",
+ "image_src": "",
+ "is_completed": 0,
  "max_count": 3,
- "modified": "2019-12-03 22:53:50.552445",
+ "modified": "2019-12-09 17:54:18.452038",
  "modified_by": "Administrator",
  "name": "Add A Few Suppliers",
  "owner": "Administrator",
diff --git a/erpnext/public/images/illustrations/customers-onboard.png b/erpnext/public/images/illustrations/customers-onboard.png
deleted file mode 100644
index 4a517bde29c071b1d7866c2e02aa7115aa0fac60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16870
zcmc(HWl&sAxF+rz+%0IZ!3UQF5<CHdySuv%5C||xaF<{qSa1!_AcH#ucL{ET?|k3h
zd#kp#>Q?PmZS9XUr{B|Z>hyF!&-1?B=R~QiD&S&KVj&<P;C^`j_7egEVgUT0$3TPs
zc2&S8;29{^GAc3%2sQE8kEW<_Tf|c5gO!R30tY;efq)oki+}=8A;J$z_<?|cl#leE
zR}cg8k^d`A|4*ieT8$P0f;7U1w=$YOh{u7WahzgqM&4T5d58h0X7o0Kr0Xd>?Gy5a
zAVlb@V%NT4eFDx%5B`P%`R}h^KpQzPCKx@}^4Je{_U61@CcI(Tv3t2ERZf@CpVb^3
z(H4mr7A(3XeFwe4@_l6Az9}cB+?|<p6Er)c(DL_<+ddRPa;CL$Ju_4&$Q@~=BqeXs
z47Y&u&!%;Y4)K9&o0Zk}bcW5`zqx%|xm!89rAximerNmMtzMSFeoohzY?)yIP;OQn
zXz6nERQoG(iNmBharWEL%#UTw^Is-zpPn4F_-GE(^(0ejX3o`)LqvN^SAOg+cnEOw
zy;70;)GJ8eyElKye06tyjJUgZ6e)>W;!7#2gq)c_mM4Gx+6>7zla<U8GeO)=R*p+u
zmdrV+&eX4*&WG@Xx_j*|3#Qba?_M}wbu(1_lGmx#EHE1zhlzkS@v16?+HnIZq_ZE^
z`@5^Z43P}`c~wKS2!q#V<9gQ6Hwy8V-o~Wq5AMj`m8YJ+bTC=znOBF*JD*<Z_&>*Y
zkgynSzv!cwyRD7st_R-3G9GFo2?D#ShnAkFXS2Vi;e)~ERsi19duI^V^E#g8h@0`>
zd)(cD*0iRI4#LK9Epwz_mWiT^I(;b8#3?FPYlA+>i7Y7Lo(aO-a|JY2xHs3==6_~H
zln`v|l*1@^i^I6h{p;mKXVl{PQ`H0uYFulNilrBG-bHfahO?LoU;<83K3Cm~mbVFs
z17-C@wL;>ZJD+Y?ZRJ|qR;Q=i+}ld2KB}&%<w+i|JZ;T*gRQVIc=?x6+(vM5)}5ly
z-B0?O(-&^<d)!jseGno<<^7RmE$Ty`F9n7~gEN-%koP9h{l#YCF_e!lxT5eT!mKgo
zT25}xy+TLa3m4&w4DzH*BkP?<T@u1+&#Wu~?;Y_;=>X>L0E)@L4^a*BMIR?G_NPH<
zHdT`KnczKLm3-T5O4L_>l}u%y6f-AK-(;?rm#Z+BJUFe?x4dQJA4XBVIUTB!6!n{F
zG*mO{T8vN5KV05Fj87&;m{*KzMBt%gpY+CIo8KmOL4LdTnxq&92XdY^H77`gboyg(
z`|6$44VND)ZL=P%^ED#r?$96wQbd;likpF{s{R3><c2E6(ZOT}Kez>-M+ejulpf<s
zG>mK9CU!#?@2QyKxf$WEC$+t8?@)`j8~CIyGDqh435lEvTRO-_0Wv95!h~D|raPdm
z9;P&4WSN$HrLY~S)j#}cWcRJ|_gDdx1k2J0?wUUlJghpzv>md610f7KoZE|0H6HAo
zm;IR^ICIi4>eA_ULz$b?MdVW#VKWDBka_%@&btWgh&Ze}YeXE<BXfU5W{td>YCzxf
zX&yAp31hzKwwU42NLR=jn0ex;SlPl~g;aV<wgkQG-v^IB#iHGKo(FpiHwR11F`!O@
zd{5keAFt8focu+)t-0#=@nQ3GLFdCuOFHs4qjoGVgWZ2$1q2@w5z+62zRP0G54|Kc
zp$7RIB2^-~W_XX5oW$Y^K%SLMY0YtVnbU3{Xp*Z%kP$bBbelkq%U*i18nh4BN=24>
z8kYW5KMRZ+t(TfuO9sp&`*#;_Hsjtu;Hn{y<(n%d@A(-SW|q5bbg(8)z9qfzE9&k0
zm}ay$1oIqiPvqRb&L!Su6+j=2X#a2!<Un-@y{{3;xSM%m+sl)R^Zyv8e}6X~{9I}r
zaNe(N4$i0bH`zaWepXU^s58CSFQhFIwB(8Q)&T?LBWD<RPsh;nMkv*?Lmz)d>~mNB
zEz7^87l9_NjGycN1)P}$^|Ub_r}*NI)I4t!7`a+|1!L57R7`K(U9b<z?GSVwaVRu8
ztBxeO4)wh^UYyBNHGQ5T{6S#5>afepTgsC@Y(`5ncy;5`71fikidGqvojt2<VrLAj
zQnm*0M4fZ9qhl9aO4Sb?P*D=?ux5b;v1W@`P34~UQmq-PRS^3EEi=p1v(#Ho=!WB0
z#MSW;-JL$=_bULesKiOIh>*Ckuli#ZjTyC9G!pit%|qQ>2>RE$%UF54<9_C`-LMXj
zQ<mSx>y>yA-|<;E5X*HD@S@-#%H{JRxu2G3KdoH8DaFvz+54WNUn4RaXFp9G`dY#|
z=4R4jSe#2Vq&ysHdriy#&S5i)1bSaS_A}(oaTWP`Qk9*j&P>VoGu}aT8KIGagRP9M
zk*K{8wQ>a<dJISuT?;~wES7{qKGTo<qreM#+^J;fZ%%s#NyApu^p;v#T5m4in|=bM
zfaGZm?xm}Q4D-9fi;Yift*D$1V;lHwj6IIvn_IyUEq9`E?RY)|EuHgqyvOWvoGsAq
zGJrP@Z?<bbO%kKm%+l8u^lSE=6c1|U2aTyAl{62rmU{G~krU#Bbz~#qwCD*>rM+_9
zpg66)dep8{klX`sYrDR(I2kDX=4MAZ5&%`Y;7p@9rv`~1Fc^ih9FXcCXF&z-FRMv0
z;`#`RkkqAH!T6QK&uW=p@6Hy8VZ`1D-HvB!iv>I6ljL>Gt<+7`s+Ll7CG6?<OA<Qq
zv}~lug+s3->GFv%?q;M2ZdTUoJNxg_>er3-*YPlDoGbEy6C`hNWimw$KpG4<Kmn!S
zykF}n#u4+r<B*=By(XuAFw^tp@W5ny%R#Ro0w`pV=qn`<#eQw91A+hr)WXPA4R|Hp
z9XPfGz$h@y{Z|EUi!7<6Sj~2%e)=DNJlchzV(;oavt{}Gy#7LV%X<|NRIGT0b$*R{
zR>Nu_zIY$XecK{uER{McNFK+uWw$;M-dm=5?DtwjV;YdDPI*|f`kF*4<#SXJ^NOmF
z)DmSKdin&zp2$V`MqR6B-D5UXpp=U<eOiUfc1#55D46r<t~|?Px67|2?2YY7x+E#=
zS6CK?^Xq(MzXsb2L~M_tNTo4+caT|dUvHlO`rXl;!xse?_xp|1L)zx&XaQp*qvzo#
z`EC5(-@CI3B~&}k)GIH%&h_rjq2Am>N;NN-0ehq_q30YXyF{YO!)tX0o)^R}ViTY)
zL(X>jIVGa4&F<l*GX5_m=A|tX21fVVX;R8pby=pogJq>xEepF!xC_}pv=3>Pa@3jE
z#QDB5)=p?h%DDA@H>KD7FCljU{nCD!@zJlLc!7L{wY{|RTd4*0Z`%=VydSyfY=cDg
z`C~!>RV9FW(~U$H((OTPbZ(WTt=+!aE_}y>jpKI@X}#fJoTOVzh<6v&n)=<5ZyhaZ
z=zgg~I*M%+MOzMlPOOU9Nbz67S<K}OW*$O1ZPxiN{&QF+(kr~wY=0*+Am~XHkkd&<
zdFi3Kyuc$&-9b(D4&H%0{6@72RjuLmI;CU^e}-)dB;C~nX&e?9+$EPCs8YCB;M>@>
z4w7LKn5ZT^S^ABon+F!3*-s>24fr(p{pVEwj~V|Tr*%96wkIDWKk=XRH}5;qR4xSH
z<n}f<RqGGzO~&bh??j;zNWRpqEGk2h`f)eIoPV~9l(^WF*dai1Wk)4FaA{o9G=9CA
zw&|G8UG>cc7%yUb?Hv*I<oW^1n$gdS&i(x%7rGlCR219q<;yh}m6uRI{4$Mi)u&}{
zR!H!U{{)-%>p<QW!(%hPAL8rNK>hxw+g0WkN*wUoYF%ck4<>0+I@RZcGv-5Yos_DE
znlL~8=d&7W?%S#z4a9+hDx3Qd1^xDD>5dzr8Pz%+SzABlU8TDK@W308IlB3yU%3B|
z#}vO`H9zRj2GX^;%qK5Iqr5*Tp4o@`sjL`(!g_p-Fo*<Fket5&$~%qBtJkho>Pqg2
z_QMF57F^@lQ-c}TKXiQ$?79H6wk;>_Xq3c|*O_5PJinu-+|!X<#<dnF3)e&w@U_8?
zbPq)L2*mo-n_b&LtTlX`O>T)4Wcae2s10%+9tv_d$K}A=y9jaOA}GB8FUqFmgVNrb
zbOU*M(*n(Haoe55K3D&lAJayZdiQ?JKoN6c%DM8B<xiv_j`PH0#k>d3A$^;QEJUf-
zCeR%%r)HpV<8qnRpy3V}`OEg1juOb~t|38%T=-~6Gd8jV7KU^;z&GpRMH-{Kz`9O{
z)`!0-?aiLKTxw%yiaT;P&J3-*H~nS44g({KOxuKd#7a|YLGq3+yNN*|mh^^9HU#O_
zABfx%RB<z+9ZC|qH!i%5|6D$^c;Vf4tcW$`j<0P<76no8Mxsx>9jRY#9iezL<5jg|
zZV;jt^WuUNVKd5sj!@vuJyQgXIruil+(pN^I!R%s7gYphU2Va(*U{|NycAh^y^>_9
zm|09ZXQ%pMFH{XdwGIzcGFP-F9l}?2`yS*{;LsmQ!W<$R>w4zhjwJ1$4?SPZ9hL`v
zR=GWWDEAG-Q;E|T&Bd04O=5|h4{D8QfLIYxzpTc1%`W@;o+mIL<YvBtX><b+nFj@*
zEHeG_L+@U#D|sOd+ORdpzDEU5^<iS2uSS%=G4%++!c_$2;UHP)m{Wah%a|bf4oKzx
zG(S3;hO`Dnm!@rNcb~Hehn`Q#F?3xZz7ZZ@<Q5r}CDH00h|k&)VsHxaqawIowxvv>
zSRYvB9DLS8lsp<;9GMhP8e4AWfGr^*(hi?N@O|Ci*VtfWPQ_^`W8&Bxo|Y7WnFoG+
ztGax<Ei&7sw0jPT*R)T2f=uO8Adv_!ldGAV&;O`K3W`oB?jA^PXi`Ug6qNoYu`H;5
znr@Xsb#jJP`BpeVY!>Iv16=3Iy8S8487+CKNwdwviJuLRp8}XOv@cd#mNn!>q6oql
z8(7<FS_^ten!;#iHs{pB7g&ZWeTcD;w3|Ztz2bBmRHT;qZWGuT+VQvrLA!jHP85dV
za<ax48#09SY&Vtck@cq+)t!JAjEJ#oSgS+7@bxaT``fM%qYoR+`xw`Q^B6~_(3);O
zyACB?qkE^a%{9?X1T?yevYThCcb7a2Hf6j6W){Xpk?mQr*=uY1(MsbYcmb_6;<MZz
zh_HBGDK5KUwrfIA-F*;xh<+@Om>|FBYrGh0{3+F?fHBptQGe<nDQYUi!_1b+ZkYHd
z870refFMl?S7a{4)3c==d;LyhGA1q;yo}>ID^skLX#knHypIx)Fi_#SKuQHrSK@8a
z2Lf_YK<1l~wqKAAV&RW1AjZ?DyUAP3Nw<vwVY6*!=$NK;9TWuPp!hvf+4}jUwAVjJ
z2`C(F3$P(d?lXslKu~CH*+Q!j?{qK_(3T1jsepVVMeLE8+1#kl7HBSV8XW-_I{RN$
zi1MW7+df`!q`z~K-@^_Dno~P#WBlM6V-<LGJ<Ll>V53ehQyrZxVIQ<+F4vPRNn6qy
zG-q1ZJUK6MIYIt(+Y5QJ3L}Y^L%@}=9Ptef!cv(Ujw%P8W*xkT*kKSC0+rn*j4Knw
zxpJyDy*{a;^@aRIMe5L-{PY7U$fmcjWW7wSLeO`RrVR_$qP%SXz#&P;pRIW`aHUU6
zm;Dn%FqV#{1ZDIiBNHxnp13?^x!qMiT@|e|7r~ajW2dL<^*Zt65Fz5|XsCcp^@1WQ
z+8aU<6&}Fn6Y~D9L1yu$Kz1k{=LCS?x;>o}fn0;+k<j5o9hxB}@qydVxA%acq(enm
zz>ozl0X>E-FB(mWZhW%^9B-83B*21X0lX0i<@9IZ$Y|LYLIenP>YPpt%f7n&6esDp
zsoqV>f!T;JTB3A?3=!uCT5--2vQa`4)in>iKX$q}u*N<<C%9()Uy1C$vrH^e=9Yt1
zz8|X=JWURhk1|#pvp+pPK1u~5ivok!QeHsSRnxW3%eFni4k@><x5~Q$z$fo=_`e3C
z-pAk^_;h~XT4n4?$`EGSOG$_ft<Kqaam{zS-fY>MQN)yHG6B0<ie}&`JAN9lz?!C_
z<w2<}-TDjCPrYWtv1sqOuVdy~D?sf<7n#Da@Y6I~%Tn?zwZ5$lytB7A%zNN}zao{K
zCIur|&AYG~iZcG%*$#0If-y%I9c-0D@Yn4gzfTVM57jo{<_$+GPtm8x4QKv*ORgOK
z@of~z4`SN93qV|4uA8el0vKP}PoR$tfrJCNR>AAx@}5l}jYEnU+F0uGbFvN@+{3?P
z<vFY4<3BN!NF-kVT-d&A#xJ^#E2PtVX3ncvC@r@A8<AFAOnE<1g=u2LWdpUe&2+3s
z5K$4Yo_zsDp=~s}p;R>KW50pWK%L`?nc`rCV&`_G?2ez^O%lKd?G(rp{dM%xk<vrD
zNxv8UL7lM#spizVfwxIYTH@(tCCMMT@WJ(I!C>vS|M!8WbDQ;i1pe%LmE?TPtln(F
zK)mld^(6;Db<B`2Qn)^+Jkr3=eaYJzR((S9!`(P+DJFE6vh10BmRhc*p`%h_S^m8L
zR)3FD0%Jt*2V2q?4yCiNX;CE|Weo&>R&b_MHcC6@Bv79kQiU{p-rSi<@&`z58d7u^
zqr4GBxgg~29UrJDr)?}b)z;R=Z)%`bw6ETB_Z+AWJ(|*c4Ee-`Q(bJ+RwNidUa10c
zEKKV*4BgwIBIK8MY_*-f2p8hFXXLPDq`61NuXR+(Rg8_rP9@_a=D92)OiFXqi)Uxr
zx$I8{Ic7LB8kzq@rZ1AQH_?d~YOTVYkWWV#e>B$^-bljqe1(5wD^a4HoZ@;Efd5#D
z+FS&!kL#v~wjxXeKA0nPP7&y+`pUXiyL~dE&>$Ti3m`hDq&3E_0?Fh?oS)s?MDVZ+
z(gnEttjQfuCyDvE<0W7B4z&z=`;QlumIl=N4R?5T);>;paCrJRn!pmyEcQ8`T%V)t
z4C(D+PXIx~!#?yYZP^WH<$_Mw5o*ZNoYM)5z*nSq3~a8Vb#n}Y)ErDNn@H)eS&Mk!
z7y3S8R7TOJy`L8f&=ZW68KB&X35b4W>S7bge=M?kgsmgI_Sa6@6&NE%*{LSKxo$ol
z*fmcxq6BkcinkuXAyi1?Y961gLJ0j_D}<7PUyFX4Mr0zQcB0(I5(lvJ3jp)9OVna~
zlBZLO{CpB@Aj&Que7OFqi^U^6gDlcPN|>f?VmHpPymJk8?z@m=l>kOP9_5#TbcjNy
zN7vRdb|XS(&(_hmFgK$Lq5~t)<7)>b^A$UIhjn74p7F73(7ft35W8v)xgeG7QZ%x}
zS?%(V0}P0}l)EWrq`mjHhasS2(fY5;wbk4nuIGr2tHF$%7Zc1Y0K@5x$$r(UxIpvv
zCcXKF4P;G;w4ELwy!D1%m_Wd&Ii9maOpJ#A1$*u8GV=#9!MVrc8~sAVv<N8$-{#rd
z&FfDmR)E5TAp&!^nIHDY8$ujRK`H_R`v8%kenD^WKV!F>>6Ba}vX7iOxIri-p7g=f
z8dfabo|Z?u={-zZMYunFR=wEtO3s85$qF{@QfHLIG%?%jSQ*)%Cw09=o#Xnma%L0#
z%HA}cL;uaO-X-kKN#&dtCVu&Bu~}g$Bf%<%8Vy5dPEnM{-}pkPB&R)dD%qRqujd1K
zbc#j{*wlDC@;S+BB_HQM<p-=s@kN+ja6SBTxb}%H!wX3mzD8vFlV4dqdbrMxHdq)p
z3ARk8@_l4byR*o7<0Pa`%KIK@vCO%Z2ngkZroLBdRfeV?F#E8pghdpXPZc<bS_P`r
zB!4U^#^Fq}EHA};o&v-6hif&KB*?ukliG<1Rt${kuqZ8l3j%3KVTTMsehWn#O*bxC
zW@1e<yB?smM0JV5S_rlAmh28ws_hDQ`oM{WjeXEx3l_9W&-YxvJbqYONV3trF=G|b
z7^j~VsUl2BauBAdc7$n)nmwU+>71hS>=2MieWPeYu&c`QCr@*W8~%z02-|~+hlN{C
zFW64d#wPQng6DYy97m=IJVe>vv<Hkq2)IKMrpRt!2_J@s0(9oUdAdkMCPbnjJK7h7
zOUej3&9j<Nc@XE+DnaIw4;3Bu1~8D$4<dkQjIYaPlTp;J%^9+{Owem319V?Bst>e}
zsE%dCKr7+ShM-WDVdYI0V&b40<FnH=o{*Wj%YEHjXzpSm)=S~<bFRF&%Pi|(9Bh7k
z_i4D&-(j`wj5_#j?U9}G<fmNg34Vc`tsmys4&FzuO%ZDS>fh1{+FNeNP3%Jcpq22b
z{i&Z_(sK_OWxCWbyX%Uk+g|5J&DcOV``k05Zy8;f-a~h<PNwm|vskUv8_#8oBu?J<
z@Z9^bQJ0$>cJQ>|?{ZT$`Mh(lb=ADD!Sl$BTScO0ND&mx07g`bpT9?ymK@l|oZYGl
z>73iaIX7+-cjQ*jis?HaXgA*EmE&I~(Zj9L$}q@1cQDzY1Xba@WIj<a<LU=}m~*=k
zwaQ;KoPQ8}JkhkoNqd`L4h*Wiv$Kb02;P-_G5t_zV8(d~Q_6P`$dse^ylZ;BmB=zx
zBQ=q7taS0wjT6YFp!a;xAU}v4Dc91CZfOCo{fumx!goKlop=0SP#Y@O^~>-_2POgu
z(KZR-Wdh|uGh?#jdOb;F_>bsIc>uX=sB9R0!VhzbsVSWVX9;yY3TXZIi_vy6pKy{9
z^p}8PM%sZ@NM_gj!S&(*J_*oUB11OT^l!F&dvE>$6uqv}2^HHqN*BVOmgo*kpnJ{N
zF1<!O$BFq8V^S3=6~>8*NhKC8M+|bLh!6&o|7Rz;{GGM-#u5ENpOWXXdSTttVTvBd
z^NR)qweLr(R}X5`jK*AXiZY?q)zzhwlEKf9!5xnmP~%*zw>?Am3XFdOrvifxj#9t8
z=j-Z0dOhs{IrEOY!N;C9b`V*6(<;mjBX@DUE=LO-ZDn_lzz1gi=C3%%>Q28%<cVIO
z&zV_Csu(RRBI%u%&%Yc+6b@rx&r%*IpK9G@oCw`e+TkA+(awz_bGGuXT9#1`EDGSu
z8A047ND^hyXg-eMB9|nLpe=(kctvcMM01+e9f@4w>IC#t(dm+7yGzyYQoSVIH`fj9
z50RU%@se2<j3**7-2o?JR2h5md!oKC4rwmcVUo~xJ>+Yp%R7j0(A1pr%-tdy%Y;v2
z6}H;MSNl|7pYzkHeFxVb-fkP8@$e@wU1_<2{kvptetF=4NW~>%^8%*W((xhe@Jb)M
zY|LnDAbYOi-;S`8E<QRz2!XeLIL`X(gh~A!f&LMdZ~-SgMV>C{e(+(($Bo?7LDj(g
z=Vkk!++9bL;B~~NA9WR?v5#8P_`ZaOg6gO>G0P>Q*1zVm55c~zHi2;f>E-#Gj@x1E
z>~q~Wj44oWZtl<-L*{vb09*mw5P&$%)VrRC?mwgy<vsK=K&rhqBw{Ge;*_R>616~t
zX-~fX_~5{9zeXg@d3$?v7@ul!Oi+Ps&gl90k47_?b=<2@#g&#(z@WDkQ=10j`tMtX
z2BZonr!@CQw7w9x8^#xCcjynaD#hcg*8oZM=5Ii>{P`p$qLQS)E!U}XMFkPk)Vp*5
z)Ur=bHSKD``vM@E#biT6wqu|fjs%-vO7Qx(T8)*kkp|ztb7zP+Ld6g;oqXK~kw$f@
zec)Eu3t;Q?dcTX>VE5|S>!)0S>7!16mtT{?J+!5A-luuz=UAyB#aGkE^uz=7nb^w<
zu?Agv2ak$}!~2#yN)1Sh_?P>%NkyBhFT*vQp*d6j7(lWsiFJS$gd3Oc&&AabVCb#T
zF=h^gItgfLCm;l=oc9(Ukjj?LZv1k+scPS0Rgq9p_6X7*I88o#4ic#Z7N7pUIv754
z$1C|l+<e+~=Guw`5ffhDtXWscf76@C_xn6*rBx<*v%0T;tM`<2xE1ht_k3DWHHZ6s
z1~n*k;S(ju2`5;mZf043l_34Av{Z!DN9iLg3>X1#?`?sZrEq)*#q((S0?HMGNyMpK
z|F9D+$jQs;+%HGZTE-6iM%&6Q_*y57PN$Z}Tf}&L_k3JO=P(Xl+1PlIxruEqt%L|q
zPx$dFkM<f7Ryj0{en`t5^D?n0Cr9?J1pE#1?rVDR{(#W?ChGkL!iVQUG0SPdp??|)
zSwkNpA0XaCqo6oaANLiGOqw8Su9+1__5OTe#k&48yU5a5l`TxO8J}V1n%o9s-4L38
znOrSgcsnGo3puoC)0(!Y>>w7mAg)!xw;g6MFOr)kZ#<F_8e+PWACb~s3-F6wJNm$6
zLJ6224I?#Gr$Wj4{`lD<T=|nKJJa;&fIXEYLMv)m>GuX1UY?zqi(w(^((82b$j!Ms
z<Np2n%`o}%i;IiA6?^{YB41*fuzNw)!OqT3<K(uL<x{UV8cEY=dRHHhJXDEbvMcqq
z?H5TPy6LY5?w<3bxOU#RDpW(MyD;fEX<RnZgw9fs6LO<HcR;`)-yoBp>|9dAe&csT
zjSqBr9knItH@wr)8%lGk5CYii3Wq-idXymXYW^NJ$s56`qTh$KzAVv|<dO|zKI_%i
zCYZm#vtL}MYZY7cm77dp0thttbP?|XK_e7;{z;S_ei*B^f4|1p8VnsQSTFvF-ES(W
zd}0wCEb8P*{a*J`=8dq<pR+QTK0e$UnxHM7h!mc*#E>mZ<%ip+v$3HXZ|mV8=JV9Y
z-ZNi9YRlgV-eB}c>0D>y1V`7&&So-)0%fZF)OQz!M<u)VU|>pGc91<)$L_2*;=WL6
zyTH9hfnt{qWHn#N%k&3BU0u)mq&9RAn_i?!;9i|+0)ZB=75Qy0Rj|+4eg}@5xH6C~
zb~}Qz{o(x3g&vr>)X9RQy@Rz2h+{A{Rd^vGS8`!p2T?pkX<uuDZB2YG!4q6}b2u;X
zm~J}F7W#E3fEX#v#EJTzO?LR!Eewpp@k;WR-4e$PvBMq7W$|bA&$`YaNt3&55zA;n
z>qosnebIO|IS~rbrAg_P0fHN@4fk*G^G6D*T`{@7o6M?%b7o4tJ5ioLxn3>YSk@M1
z)A?n+EXuv~Ogk3hDa-FVV{!l=%{yBp!X~3P@_?eHp%8)!k=s$lSr~74?jc)*VvGwQ
zz{Vx(Fx%A5_NV*qPg$&^mDmV2bKJ`nwrpF6hQH^9uht7VOhsKOk@KLKUsBUxUAKE_
zO$0~UJ6+7g4!}#Wa#KY7_2CRV7BQ_*q^R+`kruY`!)8^`X?BcwV_f{s$T7=bgsQSN
zrw{WQIm!6t-8N>Bi7>lvscmv>b{}x8E6??cUjQ3MV+cvc1Rl4f7xmJ}H!S&=DG+V&
zU;dmj57Wm2XR~6XWuNAL@&;Koyb}A~QY7Z}f@1N;>wbYx#w#<ml;(IEDO<ZU#6Sim
z+>R2ndaF)2d@0VC0tTf2dg6+CW4^*aEI#2gPror(%h}jk9!^%fn+UOU_&m#t;Qbe(
zvN5IYK8XCQTkgfH&3B<i3Ofj;RTd2**1uo8U-m|(cAWBnU7qKzZ=Pn)jCr7~!NWVk
zSQfE4L=Ugp*%GECF}uh|+Te3Ee5M4NXx%tn`9r}u^DdvNcOZK{ltCQ}j%c09T|#jT
z2q+_Gqj)E;5cwb5G}|y8Bb<d?(l9*gKwsQ}{dlHjmqvm@4cn6;%jlP8ZX8J`p0|2Y
zA7B58-H=-fM~;3ct?QrQ|IJ+`+wo@|%e}n6AiO#4u;;f6UTmuBoM|?eKaqFJGj4ka
zgx3Nt$)sT2_|LO$F3P3btA8IsQs7@JPEt4iw?R~7g(JUN>1qQXPrN%HBAHNa|AsBY
zW0S{fah@s)$=?7LD7`1YUrLXy<{CJ^3N<qOFso279X~KhIY0xHY6Q%R0)w~bSqqa@
zN)}5~bfB0WY;VB1wy99^gOZ+1S~}@|Vy>faPQU~yNLl;vO_%Jh#(+*Mjqlr$&SKwm
z6=#*+`4J*@!&Rl+$7ym4YQ95tUnrkFP_VjUen(|z9yav*>Oz$365%H{0ZE>KPu_Qi
zywu70s#(4={1SGa%gT$O?)fEJI+IBP*{(0cJSetoazTVpfo%(;k|EKfbY}^cPO$#o
zZD=Pva5Li5{qT5qnI|P7@dTv0CVu!Vw0t<W)~1!vc{8-}8PvYh(O8*sXW<DC{6Obm
z$&V9%hHIB>=~N7bwpSWo)<ms>bg~MV2fWc3O4C?daw_hmei<g7E9<GM{w4IK(c4wm
z%516yp@y8H!)K}-Nz^=DGQ{P`tt#FlJnS=09-3O=*I&zlB)HGC7LK2Fxkk=yF~Eqa
z%B*1n<H#Ghy+EGO%5$%pZ^F$VB_Tt6-x*eO&rae3HgWBkJh&nK>>sb*(75@qsrVoI
zzyZjo6w#p1Y4ykh%GmjJ!hBzgx*6dt_r50KLARjhT)ne<Px1-(;|K@jIrS&8vG7d9
zgP%iK;Rus@%RG7qe%{+py<@|)+#Rl9Yr?V#-{Z14O>taV$j5IRWpeWIalDCWYlU(d
z#o3(L!`Q(3NhqWXzI{k(s=3$$o7R{T;g@9)@t&rd#0|v=rPNyr(_Fr(bqfEs;*J@i
zn+;(c2dTHf-anxmc`ZPyz!`!GhFS6n($0v`CY(USB8Z_WtQPpyIFhpveQjMzu#elV
zLmuE+k?fUzIGA=*a%EdEnyEpP=Q_<65?lQot{Vr)*C=aB${}Y<%5Rs^b-x?yF9wr8
z#ZDy-qz%(esYVszH<cv};2>#)Ovzvok?RY6JBZl@bnsBJShx(7GuR^?>}J-R!6f@1
zhJPZ6G`eYm*euNrKz-K<3GN?5=Q#y5rlL2r(O+9Fm*EcqmE}|UuX#V}qpTITcW_zf
z7VreeOU18f{+!njs16V=4#4M!!<2)vsT`|dpBI_7&X}^L|3bzNi<V;PLIe#rV_O0q
zo7d5~dmMAU!vZ@bdsr&YHayiqV}DsA%Sl2qIow$ywo;{(T;-m_x5M@=>lsC_Ox!|{
z+)v?CnK>LC7UAQiGX_DDxMRP7XS8U~@vxHzHJFeCB{$F*PmSt)nPUfMw8c{#b!)(A
zuH4@f)9h=cvtfUUt6Lv{mEn)-hf<LY_N}@7>4uH1<nLD|yhsrn2GE*UO)oPsAy4|z
z_-#$ragAAZ*=#!$G=nx8IsB?MnrRVqZ94<u$HyA!9n<N6JDo`83EFtVgcs&brTH3^
z{tST<N{PWuyl?IhYnJl5*0Ax7DnV1?iih!TTcn|rRu4-Ub24UO*JJZeNSRWUO1TmD
zg`me|%0?Q}kLz)h)TIyHuII@;?G3JQm6vF=g!5gH-yk;+uJ3$pz?)o5CK18VCBel|
zjPwokf|_W3`7WH7)CT)nRKk5L<nryYa>=Z`OT1kA#DeHPbD~=RA%2+O^3PgDv)Ix$
zK)|}r5hn&-TLZD(aqFh?xYu-Qh5d$;MovS5aBDfENkk{dBl0=q_S-!A4>a^j@(#5-
zr@VtLZNYFOSLI<jUyAC%sldeCvwcA-wy9*mR5J!4)Q!NL_TV!zE_uyqe1L`|O<{*H
zu$$kqp_&#cHVOm@JK;szrYNkqroS8CXwU|B3%|H+JAOaTEEm;mMnl@ckf3-1ZPhVM
z(6eD5T4o;m$C}sn9cF&>R_SHMp!`9LYc%|QM~0T~Apg(7ed^^l4d6v@_cppokkqr7
zkarXo-5rNzgJYsgg?!OO&onEeOQB&kCrk&ArXYMp>rT)ApsqV-SK(`!3xJgbh|1?U
zL<T@*E{5yl^ml{TV-<B0Khmk_vP>&oXeE;3BAO4^!x36(%E*lq?jI(h8&e#8j@3Vd
zp{$eQfNJUE*q?GOQql#IoQBSr*?v>Xk1W7l?m#uTP}5eaM!nbb&_;b2`>N)O6eCk#
zf>`yz9}seytUfItTq+8v!Tmp31^Dk)2>yTN#dQ4+GP^X|xuFD+P$K2fo8-mjl>P8`
z3+T6eg27<%crQ{pWynX8gou$ZI^)KULRo8c_OFjt(mOrw){-n!ov=VJSMY+?Dy}nx
z{Ax7kqLH(o#*E_4<4of|TV1KR+>lGWlPZ~}@Y5-H<AIeEyLzm>Ug?{7yLskLQjjC<
z6l}jni&Qdw<G~ln<bF>y!5<ln#<fi#yR(;@YWE7Xr4gbQ+)>M7$y<U0O2kO-l@h15
zQ!bWEIEe8YD`?*7Gr4~EXJ+K#VW4-lQiW*_N}Au$y|#O9di1Oq@w@Q$zL5uL(NH5P
zF);dhYnOb|<RC!M2*CU6i{x64k)U&!YQcD+krLlUV{mYn@ev|<z>=fB^(6}|#uzBf
zV5W%?xB(4di$%0FOqN#MiE*!Y!7xW0LlQ<d=&c@rG$a1aZN%qp%|f7--L#85ls46X
z^x1Nbdo9+OJ2(6GbjN>@DfKVam?RLsvM$xYj*zxRIa%C@<n~GBN89B)hN?|L_vW8w
z!93pdA}Qn5&SM*N*?khgpx6|T8@}VEkHO$ct&%|BWJ^?-_i{VQaRp$4T=?bG2v4*j
z!&xX`jv=&5LM#9io99^_+*mPf3sn8o3c0|{#-V<h_TqnJ1~5{ZM%jqfYBFY4XO4LM
zn9*k|;jFNhd{b2ufCSutoudd_VmklivcPnTZIfN6rS3SDO|?`mg=q5r;m;#BzxnK5
znQh<Lyx=Yyo28ETl-)S)^jkZO#~DeP-^;wtmyN}D4qk5F<tCB$@6IGJkn?&wd?{e(
z?3KN}Jq+M6Jh$WfrM6z5HdZ?|uA6^YCzq@D2r0|P<9=~u#S8sVc_6_rRW+^4AG58+
z@jA;xdY#q^#w@5}4Fb@u;7qBgT71kVZanL&;9vEz;>vyPW)<%JtB8p(MG?M7?ZHIU
zvQA<FScv3>{P1lg&a;U*2M~Tzy-NLDJhpS)S06VSW|{U|!7WKN7EDnw_ImCi5zloU
zHw6HVuaSSZYpLfMV^Mk?jYD2F%xtM7YRY-q07>;AoqP1spmP)VTyHM<Vu8XEhMMi3
zdyxqIgq!w@>fKbW@K@=;Q}?j^Q9|3>`mz)Hzc{zlxI4F%vBFMlzo@YP*`Vq0!J0di
z=zh!LIz}uk@1i$5dt-w<fK}%cq<KT|k@(!Yp}Utj=m|RqEj5uPKAsh0-$U`2;3NBw
z6)!q>*qZ|~G641S(I0<8R={<|jpF7SwQdFGhP;s-Pk5c5er6j`LsyF)Ua%)VCZn^c
z4~;7O-53txQLCB`BL_XQlcW+g4`<gQiG1^7!z)-(IFX?9iB(6iT5uX}w)p+ta|GjS
zvA^t*K{nZf!}dH$l?)o#0;3yE`KSZE8|M#+6nkOgW23&FBH^#bo)U){(DjsP09TXa
z>}{>=J#9jy`K%Rfr?g}CrzY;}PlKoV<9b*UQ-|+LW6Msh76Fl+zwBHQH&Jcq(nsld
zhF@`>S)F~=e%(wZH%9UJ>gv=NXQZe=TjX+6)KeHm98)&0vE6<A^JjT4cbKIMIIgzO
z*G81eTe!vN^1I{mJ1zc}SN=Q=X-a50tzuvQ?6{ulNdAhZ67z^Irh`u>Zlv8acS5L*
zu^lo`*tV9&s)K{ZEmr0SRG<FtAke&dczUl2!s(o^dmP=-GIy;B#%m@QBNOElGh7V<
zo9;y=$&J@tNnZ{yaO&<!a(-`9$I&?}a0S+DPyM<&W-!6)OjOkuKc8Y$OIhcUthlV6
zO>-&Xbrj7BU3$6!L>kN7y5OaQ8c3U2mMM)T&ZZBQmsB^dOeBuaZ16g149Qvl4Zdo=
z>!J?Q@^N(ecfEK?25yP9@~Zy3e*7ak1o-&#Y-#=9lJ#LBIla~S*x9iVii5dEM^_6m
z4<{<A?Zv<Myy(9f@G|U9zu`-H*zM;?2>eNq{1^-arH&qaP3gah>a`P^*eb_08!Mz#
zr@>v`s@7L2rJ-0rs#rP>Mofqe|2GKCMQ?&9Rq<u+vqev~-Y6zwyS<exub~>kXzNv^
zG+j(1bR!zu*dHeqfF>+=FWh-I+WE2>!xPj_?cby}1avU*ClSgTEqi=|#rYaS+RN!Y
zU^h26w|4Ypa+*Vr3D3vQ!4L2V%L?7kpwt|YbhIk4-9ag^_JsT;c358s8S!|TuhnaM
zhP9B>e2MIc4`Y-MGo)I1PG2;xYbYbesupZ(Ji<45om^x@02QF*t)3oa8oZZ_dddq6
zQR9K<Qa}Z40M*mma&vVfn;1yP0UT^S79ftbekdP=K1|?J)Jnn(t<iLK(-#BAZIb$B
zll<KwD{&#ukx1NF-SVa_hPv}#u1jTpE2@|`@IUtjfs@CLMrlEJfG@|orT>y(f~<3d
zpC-D1Xzrs_0l7hK9QBbnlq)w9!L#S1Mecz*ShB)AIEIzcWgL$#VF)|h7Sd`Y=OF)s
zkUeR>c{qSgW%!dfn|Uta&lfXb(2v-ZJ%;sO&D6W8TF&^)hB(FqKZdvH2l;#~r4`u4
z4BsoJ83ztM^r6N~1Z`cOIU`U3`FBP~vb&a)$DXv7I5nb;H6q}Uxmbs?Be+91sjz3h
zH7Kg&PtZ(ONSmZFe<YsY#_`b46Lik=PfT6veBJIHD&c}t6B*fWvELgV3=fj(3#a&N
z&(n?ucUw>>^yT^aw)4d}zQW*OJjFQW>3+WRS$KSW+?d2-E#eb~jbQ<$XiE1y+V#oy
zZ1BU?!Ssu0<L_VCi)&LsC{;MCYZVVunn1bZ_8oXIKlmu_+tV+94@$Bw(|~>knvQB!
zp&&o34*U&2_4!F)vM{`sCjrI*mnL^JY-xo$$YUg{m#nMk^)dA`v*J|9IzhWC$ndHn
ze1~*iE(8zcid4**V+GEVUdk+@H%Twe*DQ$zJ}OZ+gw2m_es7>SM5V5@QZB8ugTVBt
z5#3?vgAE$eW!%$uhr_Kf&F_VARLUwWcAc)Z#3ni$h@|(G8Eye;IryT+8Pp{<ly#Ay
z>Ma4Y32RF{zbV^~zZ`ja;IP3%)7J3_?^$%-mHwlu#d0&A3G**7^6Td(ro+A~a{Z>s
z>#KTpHzI`N`KDg9A0^Xz&(oLP4uUsRLouRd^cfL4qQ=Uau&XBF{i|Os*?hb{5Gvrg
z-qtHbq1j%AF^1bxLs)q8ge9iVi67YC8+H+TTO4S~8U|t*1IP!EKg<HZgcOQSVlq#>
z>|C!Gc{@3~jUD;Bu4OVQeI3x-ku>_qQbT-@Kx=u|_0xHon&K*!-&_1@t@9M!@bB_y
z0CK-FPJWJ3Fk_kSir<ENYC^0>hjk=R_3IJ}ISFO{RLi<qbOqc<Lk<(K=UwhIYhjH<
zoYJ`Xto|Djch%#%&te;cJUR(Gj4C4Jh4|B89!N$ah^0V7#(S8zRFWKht9wJPR0AoO
zSW$vYxxhJaNp3xtCP<me1!anYcT{A~yZ*#oW`I7b`$IsGuY3G}nv)f)J!IO?N_5ry
zH)%&!rbj(oA!NV8rIEu(RUyT=Jsz+2RCPD|gy0{=<r_}knZlft5b!xSUOJ<{C!kg7
z=FD&cKE-L06b$3UUlv$^b4nsZH2jnu9<`)-44<M(7$nRb4wD>f_h%tg!rTk7sB$LU
zNJ720OoP}`#D(*PZ3HV9Oj$7WsbXN3Pph*XEglkoZ}zqE*U2qw3L;(#jf9G{gYW`6
zwCw(*x1aLZV@-tHBHQmM94_TOMNwsswg`A5gKg0|uyZZJlX4|I3SYN}D;E^L{=(|x
zYwjC0ZOUo<tegn#-+GUh%}Y25(6QFdCEu#pjwQ3rDVs7S3cg&3QDq9%*8-r7Y(y4h
z?;`YU(ahmyo8yWUz8`=5xtw8mY7cvB!`PVQnG?f*Hxe6}#F>%ffGb7xOUx$s7VLu_
zGDGUBy$|*TtBGY0%9RGJyz=2O72f$)L#Qv;Wd*~wN8y*v&Zxd-DlJnuciPa|?fEJG
zt*{q<fpr0z%o<hJ=<;ghm2f1SQb;rv_w+7&SZMF^a?D-6eIX$Taqs8Jb2YQxteqm6
zpEyX~O4ml#1u?k1?V^5;F6oM)P~BX4>Ty#f7t$Y{R0CD{&@DR@Xn0H8`GjWO_ll0}
zx?VP#U?j`K*$eKqgIRf;M4lz$v|4q>i6hOu#>%@GMtoyK<NI@k90j>y1-eRzamLT0
zqzkfn&4@Ou=sB`^3cpj63)58e^G4Q=wzbzJSM|B=j}&bw%COpT-Tee>B9VPU2gnyy
z2RJVno4HT&zN8SI9T2OTW*s+sDVM%^bBZ^Z)oc8IDBaPtq}1A{VQ>oqDn)Q&oBQrQ
zzO^}Dt@M}>M~<HaGOadw-0hYmr9yfIhl*FRSO>tPOZSED*d53C&RbK=_uN#Y6!Z6+
zzkxeKR_<rvs;;d^v!1m?BEUgieMa6|mo6*PJ;o3Pf02l?teTc9v*YgG^&+#_3MXR3
zitgY&Bh{uE4LvZ!@?gO~iXQJD2{JKk^UylQ$=kQdD<*(W7|L4K-awX)E9x1y7Rr$D
z56Np5@hzEpNnO7;Ld*DD(#!tsuhASL2253@Aw(HlErDy@M7#)2N>aF`?Vs;aRE$nr
zEA@9PtG4Upok<!=Q`4*v?Q_WBO5*vu3l-pBB{3%lxBM2UEdRAg|F^s#+`szIhRV?P
z*@<@r0R1nxQV_TRDq=K|YFB*6QAoqxy}F9pBkW`KwM9>3O@3$A9uvzw@|NtnMB~Br
zvnf+EXu}~Q7+Fz(@L#F&{vY9jr8u`cM`&|Bvs1a{bioCNKN#=22a>3Ke8C78R{+_G
zlb}6){#<=S&<`lNeXCkU<t$fx$bmK5?(MIwt)!2s050<kwDysKDgGG~!*~pv$dLd}
zs~r5dhqyJ$g_UD<QqYVhA6g_msgVaWV~Vo6IN!bwK3!+qFI^G=p9j1Vp?oD8=F)?W
zSgKG`S!ts|<;YF)4~Mp#5ON11s`0}TCg~?rloC(zK#!x0@Gc3F0ECUUbW4h9b61;+
z*S{)1k|KGa?e}@GSy3J0AE(pCOr|*|G{WCuIm9Q1Tb6(PvR8%%chAP7ci+J`V__?C
zMIq22+VWMK&(z_xCfVKy=DdpXG(SW$fKAmp7^*ra-^2Z{AIWhchwx|w)Y3toeey@z
zoCq|4lgl$Lv5FNGTS1uMCzmr)T6FD`I{sGLh#<qT&F&utkKJK!b{cSt*<+yR2>>Q?
z$L};aK`x34|I{qQ6^xCctAL?os<jlPRRYR|NAJRemdjXL9b5eurC2QWPRd|cp%h7}
zKBB8ltfWOlIriYHzoBVs7^^;_Hh9nDo+th>y?0y_OmRcOOOF4d^YfC^+5tuwC1k#@
zAci_^o7JkgGhEf8StNdp({8UGz%P9)Fae!E@e_DsOM*CUTb>E%_{m_xqb4SI<i6ff
z>yEE<9TGBEFm_8Hc5Z_~3?B^7*UE-sC^_h7avA!)-q5IyL)+GFVe8w6_znN&4q;h0
z&Gr`8w#DX7xBA;tI{a#9|3n+n=c~u$2cKfll<(lto2*!5mzB;={Ixz@Tr{es=Fa0A
zg2<(v)Xo<C?5*l+ggdF@lbx>h)}?0eNFJVxWPy6-KcjQBlCn>S+{5W%^KU2io&sOa
z{3?FUuiJ%lU(Ar1YYx}*1Oud<Smq~XZ~Y%>0{N-eo!Wf6Vpre`5U)V~Ua$+h3pfvV
z8KtVtp;}#5JNw2-z6Il1-PY%b9}VCT3CGd)prHPWiDT!6X5<m4`6>3`uJ=ng;>NuU
z0fS1j*b7*5RKJbiZ!^JV;94YUb;Uor@bX%XqcBX>E_)I~iO*m7O@LRNl$c1_x``97
z`VV!SZ@R*|0U|cyz9~3iTfr;%!kg^E=KJoACd{a{HJ=s!@w>-&;iI$+kPK;D#OmYx
zwcE;(_Vw561fqzboQe(SlIjf&XHhgwPAJIHCWg6XYRrfa(I0d<wo=!<Dx;#GBtG_m
z&LWHVLx$Xy>cg(@mj}csvQ8c=in$fF15KOMW`x_`Txkvk;k7u?=>7^QT5n}XbL`DM
zRiV;?O5@pFff&k(X+&Nj@!FR>Jt0N(F~s--C6tLF-R}nnS&jT>h1{NC2HjM_$He>a
zgYAmeMXR7xj??coz{g*i4agIBF5}X;+@D1@n6ux;)uFc)3sEC~C*#U>;jCi|1nO{)
z)jF$EdbnjvKp+}2_-begqj8qII=xqojYa%4Z674u=S@oqx?MXA_ISUH;a+D1@S~3@
zQRf--I61w~V^Ksv%-TQ?DboTEI8YB&Gz>*9P9<xIO3-X%{mps9PT~{nRcdP|(XtW2
zx09@@CR$lUN%a|yrN)T0Z%OfxSj7~bZ@K}>t~Uu3{Il$;mYD5+`5@*fN(KHVr_cod
z&1j!)TA}Gi7Lo9N;RraQr4UEQkO#xgN#e#wG1G^RvwLkFcf}M+XdgDMVz}<Kh5rm_
zEN6#kTmM~-ui_*}VkYE`G=4RTX}<A&wZ)hG5m{*AQ;rnf<;Gv7a5x<{wC8!9tcY5g
zOvqX9bwe)CfAhNBPuLz_&}56})+!E7K}#y}w@+Kv^mN$bLkje0r#~=lGL~NE350ms
z;UO-AOSx+VS-}7gB6#%6SUooVyckZHcuEWPUkcfucKd<iD{jW(6tTZ?-K!pFY=;(K
z400=i^WcT6D}*^`P57(lF!4qu_xFW)%u=IRF|aKOx?<aAVopDah#p=2n&-E6m;933
z&|(M|F4{AWQMijOf4g-9f&!^l^PICn+$TMRPm!o<-CMeHyS#avoiJVQ|9srLFnM}-
z+ZBhXIi){_=D<wK9dW$#PLE7kIF%yKaPwQ`H{N!dhBGQrD#Fo)AK~y`RqX27Xd>0y
zE)xXHKAKRlUe~MGfGKy1gP|Y86sYQG{<-_aJGrE;HwSvV$I*)sSbF`q!i;c+<$yD+
z#<yCpe|=<+ICxuQBsPDk{@L2}AJkfr^RIuK!vuHP-BBqY{w)b-x;=QkVVg)g;Pnl6
zg4o@rRs<<e*3DP^pbUFw>EAP3zxUt_cS>q<0dK5p1@0ZcIB7bDQo@bj@TR035WTv9
z;L*z2^eShSLY8<kME%~*a8$C6piy!tdEvl1ebD`M-t%I7@Z(l+5HNgam;UVPO28xr
z;GwtsvGdPyL?c_UzrX*?b?4&_&kN5|lr+sDxk^NB-qT;}m%ruJ9rvZ*<C(1)>92e0
z<31pXTGCv{h<<yHaO4_OkQQrtBwRY(_=hxeDCNu=9gXjUfYjM{-vUc4Ij0%e%UIzK
z@k0&RH|B_5I>*$bgb-R^B}WT##B1q&`47_kyyGl*)RzAbwAA!P1zKbjUlN`fw!@V+
zBok@4fjfP^<}b9h2F|bt0w@8kW)xe=-`ti;z}`)cBO7#@JUo6So`3mYHJ;Dv>PjMY
zU}sr^0UXn!5t2IcEBoY6x)JqwHKHqX7h4$WbPnv79Rg7Dy1af=xRbhtH^dGNwADpx
z_B8rQ|C#lV?mZ=Fp`Yt0z*d+3dtMX#!vQM)d<&pNAyw2g6R<Q~f0Fg-^vK+DFUtu7
zyNthtqEL;kav<s0BWFhf15D9gs+9H)0Q}ccMw!3k?%oI627ZLLE6Z{27Ux<}IzldN
z%nN9dW(e8)E?VOP$>V41a{3iePJBNoP=dUWeq5#uNv2lChn$A0a$O#bYkxMzDx@cT
zKbu#bLp?A>^pE_<%mjujiR%sab3f|P_{JXyd>(ivO;eyRY0@$DRXuU&^9R7n+*FUf
zt*z?Qo0+pg2Oa=VX2Q&$(`8SI>8-Q!LcN_@qnQT(4nH=O6URn(=L-%`{W*etTEwiy
zarFXV7q3r*3VBw8eTl(U$#_EpX{pq^(sRPfx&QeV?El>=0H~i3_F}}UK35=NHvP}X
P7CyXFeOo1K68b*?@SBA4

diff --git a/erpnext/public/images/illustrations/desk-onboard.png b/erpnext/public/images/illustrations/desk-onboard.png
deleted file mode 100644
index 74b632dc30b652d250a1077ce4f0735cf0cffc0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11054
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
PT2)cdcvbS^&8PnaQt#UW

diff --git a/erpnext/public/images/illustrations/letterhead-onboard.png b/erpnext/public/images/illustrations/letterhead-onboard.png
deleted file mode 100644
index fdfd16ad9da2b40e2c6a3626e1db0b1635b4cee9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 63859
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

diff --git a/erpnext/public/images/illustrations/products-onboard.png b/erpnext/public/images/illustrations/products-onboard.png
deleted file mode 100644
index 2dee2039e7d8330926042167b3186843996b2566..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33014
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

diff --git a/erpnext/public/images/illustrations/supplier-onboard.png b/erpnext/public/images/illustrations/supplier-onboard.png
deleted file mode 100644
index 30335f2b63be25d769c2104eddb7940389049536..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17531
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

diff --git a/erpnext/selling/onboarding_slide/add_a_few_customers/add_a_few_customers.json b/erpnext/selling/onboarding_slide/add_a_few_customers/add_a_few_customers.json
index f39fea48960..92d00bcb380 100644
--- a/erpnext/selling/onboarding_slide/add_a_few_customers/add_a_few_customers.json
+++ b/erpnext/selling/onboarding_slide/add_a_few_customers/add_a_few_customers.json
@@ -12,9 +12,10 @@
   }
  ],
  "idx": 0,
- "image_src": "/assets/erpnext/images/illustrations/customers-onboard.png",
+ "image_src": "",
+ "is_completed": 0,
  "max_count": 3,
- "modified": "2019-12-03 22:54:28.959549",
+ "modified": "2019-12-09 17:54:01.686006",
  "modified_by": "Administrator",
  "name": "Add A Few Customers",
  "owner": "Administrator",
diff --git a/erpnext/setup/onboarding_slide/welcome_back_to_erpnext!/welcome_back_to_erpnext!.json b/erpnext/setup/onboarding_slide/welcome_back_to_erpnext!/welcome_back_to_erpnext!.json
index bf330d09de4..f00dc947d2c 100644
--- a/erpnext/setup/onboarding_slide/welcome_back_to_erpnext!/welcome_back_to_erpnext!.json
+++ b/erpnext/setup/onboarding_slide/welcome_back_to_erpnext!/welcome_back_to_erpnext!.json
@@ -7,10 +7,10 @@
  "domains": [],
  "help_links": [],
  "idx": 0,
- "image_src": "/assets/erpnext/images/illustrations/desk-onboard.png",
+ "image_src": "",
  "is_completed": 0,
  "max_count": 3,
- "modified": "2019-12-04 19:21:39.995776",
+ "modified": "2019-12-09 17:53:53.849953",
  "modified_by": "Administrator",
  "name": "Welcome back to ERPNext!",
  "owner": "Administrator",
diff --git a/erpnext/setup/onboarding_slide/welcome_to_erpnext!/welcome_to_erpnext!.json b/erpnext/setup/onboarding_slide/welcome_to_erpnext!/welcome_to_erpnext!.json
index 4ea69852afa..37eb67b1d7e 100644
--- a/erpnext/setup/onboarding_slide/welcome_to_erpnext!/welcome_to_erpnext!.json
+++ b/erpnext/setup/onboarding_slide/welcome_to_erpnext!/welcome_to_erpnext!.json
@@ -7,13 +7,14 @@
  "domains": [],
  "help_links": [],
  "idx": 0,
- "image_src": "/assets/erpnext/images/illustrations/desk-onboard.png",
+ "image_src": "",
+ "is_completed": 0,
  "max_count": 0,
- "modified": "2019-12-03 22:49:12.871260",
+ "modified": "2019-12-22 21:26:28.414597",
  "modified_by": "Administrator",
  "name": "Welcome to ERPNext!",
  "owner": "Administrator",
- "slide_desc": "Setting up an ERP can be overwhelming. But don't worry, we have got your back!\nLet's setup your company.\nThis wizard will help you onboard to ERPNext in a short time!",
+ "slide_desc": "<div class=\"text center\">Setting up an ERP can be overwhelming. But don't worry, we have got your back! This wizard will help you onboard to ERPNext in a short time!</div>",
  "slide_fields": [],
  "slide_module": "Setup",
  "slide_order": 1,
diff --git a/erpnext/stock/onboarding_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json b/erpnext/stock/onboarding_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json
index 27a30627eec..5ee316786ca 100644
--- a/erpnext/stock/onboarding_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json
+++ b/erpnext/stock/onboarding_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json
@@ -7,9 +7,10 @@
  "domains": [],
  "help_links": [],
  "idx": 0,
- "image_src": "/assets/erpnext/images/illustrations/products-onboard.png",
+ "image_src": "",
+ "is_completed": 0,
  "max_count": 3,
- "modified": "2019-12-03 22:54:07.558632",
+ "modified": "2019-12-09 17:54:09.602885",
  "modified_by": "Administrator",
  "name": "Add A Few Products You Buy Or Sell",
  "owner": "Administrator",

From ee10f2f50d6aaedeaaff469007d7ac5f2276065c Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Mon, 23 Dec 2019 13:07:00 +0530
Subject: [PATCH 069/193] fix: bad query for debit_to field in sales invoice

---
 .../doctype/sales_invoice/sales_invoice.js    | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 7f4ae3c1fc4..db6ac55a119 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -556,22 +556,11 @@ cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
 }
 
 cur_frm.set_query("debit_to", function(doc) {
-	// filter on Account
-	if (doc.customer) {
-		return {
-			filters: {
-				'account_type': 'Receivable',
-				'is_group': 0,
-				'company': doc.company
-			}
-		}
-	} else {
-		return {
-			filters: {
-				'report_type': 'Balance Sheet',
-				'is_group': 0,
-				'company': doc.company
-			}
+	return {
+		filters: {
+			'account_type': 'Receivable',
+			'is_group': 0,
+			'company': doc.company
 		}
 	}
 });

From 6edd3580d1cbe534d17c65a05eb21e16fb57ce64 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 23 Dec 2019 15:48:34 +0530
Subject: [PATCH 070/193] fix(expense-claim): update status (#20030)

* fix(expense-claim): update status

* fix(expense-claim): compare using grandtotal precision
---
 erpnext/hr/doctype/expense_claim/expense_claim.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py
index dfb0bb96d82..38bafb1d2f6 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.py
@@ -43,9 +43,9 @@ class ExpenseClaim(AccountsController):
 		}[cstr(self.docstatus or 0)]
 
 		paid_amount = flt(self.total_amount_reimbursed) + flt(self.total_advance_amount)
-		precision = self.precision("total_sanctioned_amount")
+		precision = self.precision("grand_total")
 		if (self.is_paid or (flt(self.total_sanctioned_amount) > 0
-			and flt(self.total_sanctioned_amount, precision) ==  flt(paid_amount, precision))) \
+			and flt(self.grand_total, precision) ==  flt(paid_amount, precision))) \
 			and self.docstatus == 1 and self.approval_status == 'Approved':
 				self.status = "Paid"
 		elif flt(self.total_sanctioned_amount) > 0 and self.docstatus == 1 and self.approval_status == 'Approved':

From e6b3da0f5949c4390b737df08e12c79bae476c5f Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Mon, 23 Dec 2019 15:50:29 +0530
Subject: [PATCH 071/193] feat: fixed party and party type in Accrual journal
 entry (#20021)

---
 .../hr/doctype/payroll_entry/payroll_entry.py    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
index 2de01e6394d..dfd38ebbe38 100644
--- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py
@@ -163,7 +163,7 @@ class PayrollEntry(Document):
 		"""
 		cond = self.get_filter_condition()
 		return frappe.db.sql(""" select eld.loan_account, eld.loan,
-				eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment
+				eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment,t1.employee
 			from
 				`tabSalary Slip` t1, `tabSalary Slip Loan` eld
 			where
@@ -246,6 +246,7 @@ class PayrollEntry(Document):
 				accounts.append({
 						"account": acc,
 						"debit_in_account_currency": flt(amount, precision),
+						"party_type": '',
 						"cost_center": self.cost_center,
 						"project": self.project
 					})
@@ -257,6 +258,7 @@ class PayrollEntry(Document):
 						"account": acc,
 						"credit_in_account_currency": flt(amount, precision),
 						"cost_center": self.cost_center,
+						"party_type": '',
 						"project": self.project
 					})
 
@@ -264,7 +266,9 @@ class PayrollEntry(Document):
 			for data in loan_details:
 				accounts.append({
 						"account": data.loan_account,
-						"credit_in_account_currency": data.principal_amount
+						"credit_in_account_currency": data.principal_amount,
+						"party_type": "Employee",
+						"party": data.employee
 					})
 
 				if data.interest_amount and not data.interest_income_account:
@@ -275,14 +279,17 @@ class PayrollEntry(Document):
 						"account": data.interest_income_account,
 						"credit_in_account_currency": data.interest_amount,
 						"cost_center": self.cost_center,
-						"project": self.project
+						"project": self.project,
+						"party_type": "Employee",
+						"party": data.employee
 					})
 				payable_amount -= flt(data.total_payment, precision)
 
 			# Payable amount
 			accounts.append({
 				"account": default_payroll_payable_account,
-				"credit_in_account_currency": flt(payable_amount, precision)
+				"credit_in_account_currency": flt(payable_amount, precision),
+				"party_type": '',
 			})
 
 			journal_entry.set("accounts", accounts)
@@ -546,7 +553,6 @@ def submit_salary_slips_for_employees(payroll_entry, salary_slips, publish_progr
 		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}")

From 1263515a922002e940adeeb6970afd7cfdf1b0a1 Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Mon, 23 Dec 2019 15:51:31 +0530
Subject: [PATCH 072/193] fix: exchange rate not fetching correctly (#20010)

---
 erpnext/accounts/doctype/journal_entry/journal_entry.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index e25942ca34d..88973373ed7 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -968,7 +968,7 @@ def get_exchange_rate(posting_date, account=None, account_currency=None, company
 
 		# The date used to retreive the exchange rate here is the date passed
 		# in as an argument to this function.
-		elif (not exchange_rate or exchange_rate==1) and account_currency and posting_date:
+		elif (not exchange_rate or flt(exchange_rate)==1) and account_currency and posting_date:
 			exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
 	else:
 		exchange_rate = 1

From 4f18d2548df9ce8cc9093972cedeab78c43bc1c0 Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Mon, 23 Dec 2019 16:01:38 +0530
Subject: [PATCH 073/193] fix: none type object updates AR report row (#19958)

---
 .../accounts/report/accounts_receivable/accounts_receivable.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index c70a2cd1a74..f82146a1df8 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -285,7 +285,7 @@ class ReceivablePayableReport(object):
 
 	def set_party_details(self, row):
 		# customer / supplier name
-		party_details = self.get_party_details(row.party)
+		party_details = self.get_party_details(row.party) or {}
 		row.update(party_details)
 		if self.filters.get(scrub(self.filters.party_type)):
 			row.currency = row.account_currency

From 06f9538e519ba0ae74b965d5eeafc31a73b94eb3 Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Mon, 23 Dec 2019 16:08:21 +0530
Subject: [PATCH 074/193] fix: bad condition while checking last asset movement
 entry (#20047)

---
 erpnext/assets/doctype/asset_movement/asset_movement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py
index 4e1822b2ce5..3a08baa714e 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.py
@@ -110,7 +110,7 @@ class AssetMovement(Document):
 				ORDER BY
 					asm.transaction_date asc
 				""", (d.asset, self.company, 'Receipt'), as_dict=1)
-			if auto_gen_movement_entry[0].get('name') == self.name:
+			if auto_gen_movement_entry and auto_gen_movement_entry[0].get('name') == self.name:
 				frappe.throw(_('{0} will be cancelled automatically on asset cancellation as it was \
 					auto generated for Asset {1}').format(self.name, d.asset))
 

From 90786076009f6a2ca35ae4bf961ff5399b28dee0 Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Mon, 23 Dec 2019 16:25:16 +0530
Subject: [PATCH 075/193] fix: paid amount gets overwritten by
 get_outstanding_invoices (#20050)

---
 .../accounts/doctype/payment_entry/payment_entry.js    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index adf47ed2764..2192b7bf989 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -652,14 +652,16 @@ frappe.ui.form.on('Payment Entry', {
 						(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student")
 					) {
 						if(total_positive_outstanding > total_negative_outstanding)
-							frm.set_value("paid_amount",
-								total_positive_outstanding - total_negative_outstanding);
+							if (!frm.doc.paid_amount)
+								frm.set_value("paid_amount",
+									total_positive_outstanding - total_negative_outstanding);
 					} else if (
 						total_negative_outstanding &&
 						total_positive_outstanding < total_negative_outstanding
 					) {
-						frm.set_value("received_amount",
-							total_negative_outstanding - total_positive_outstanding);
+						if (!frm.doc.received_amount)
+							frm.set_value("received_amount",
+								total_negative_outstanding - total_positive_outstanding);
 					}
 				}
 

From c1b6b4ed3598719ad710d9b6c5d7a89540dfbcbc Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Mon, 23 Dec 2019 17:28:00 +0530
Subject: [PATCH 076/193] fix: breadcrumb for company list (#20051)

---
 erpnext/setup/doctype/company/company_list.js | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 erpnext/setup/doctype/company/company_list.js

diff --git a/erpnext/setup/doctype/company/company_list.js b/erpnext/setup/doctype/company/company_list.js
new file mode 100644
index 00000000000..017286560fe
--- /dev/null
+++ b/erpnext/setup/doctype/company/company_list.js
@@ -0,0 +1,10 @@
+frappe.listview_settings['Company'] = {
+    onload: () => {
+        frappe.breadcrumbs.add({
+            type: 'Custom',
+            module: __('Accounts'),
+            label: __('Accounts'),
+            route: '#modules/Accounts'
+        });
+    }
+}
\ No newline at end of file

From 2b3482d5dd41aac82c959b270e2f7ab513249d79 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 23 Dec 2019 17:58:50 +0530
Subject: [PATCH 077/193] fix: Do not validate accounting dimensions if from
 repost (#20042)

* fix: Do not check for accounting dimensions in case of repost

* fix: Do not validate accounting dimensions if from repost
---
 erpnext/accounts/doctype/gl_entry/gl_entry.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index 078e05816db..041e419752b 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -29,7 +29,6 @@ class GLEntry(Document):
 		self.validate_and_set_fiscal_year()
 		self.pl_must_have_cost_center()
 		self.validate_cost_center()
-		self.validate_dimensions_for_pl_and_bs()
 
 		if not self.flags.from_repost:
 			self.check_pl_account()
@@ -39,6 +38,7 @@ class GLEntry(Document):
 	def on_update_with_args(self, adv_adj, update_outstanding = 'Yes', from_repost=False):
 		if not from_repost:
 			self.validate_account_details(adv_adj)
+			self.validate_dimensions_for_pl_and_bs()
 			check_freezing_date(self.posting_date, adv_adj)
 
 		validate_frozen_account(self.account, adv_adj)

From bd5f5dabbd72764b2ad860fd5266019d48863eff Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Mon, 23 Dec 2019 18:01:41 +0530
Subject: [PATCH 078/193] fix: Salary Structure Fixes (#19923)

---
 .../salary_structure/salary_structure.js      | 87 ++++++++++---------
 1 file changed, 46 insertions(+), 41 deletions(-)

diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index dd34ef2ae2c..9f42c917a4d 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -46,7 +46,7 @@ frappe.ui.form.on('Salary Structure', {
 		frm.trigger("toggle_fields");
 		frm.fields_dict['earnings'].grid.set_column_disp("default_amount", false);
 		frm.fields_dict['deductions'].grid.set_column_disp("default_amount", false);
-		
+
 		if(frm.doc.docstatus === 1) {
 			frm.add_custom_button(__("Preview Salary Slip"), function() {
 				frm.trigger('preview_salary_slip');
@@ -119,47 +119,52 @@ frappe.ui.form.on('Salary Structure', {
 			},
 			callback: function(r) {
 				var employees = r.message;
-				var d = new frappe.ui.Dialog({
-					title: __("Preview Salary Slip"),
-					fields: [
-						{
-							"label":__("Employee"),
-							"fieldname":"employee",
-							"fieldtype":"Select",
-							"reqd": true,
-							options: employees
-						}, {
-							fieldname:"fetch",
-							"label":__("Show Salary Slip"),
-							"fieldtype":"Button"
-						}
-					]
-				});
-				d.get_input("fetch").on("click", function() {
-					var values = d.get_values();
-					if(!values) return;
-					var print_format;
-					frm.doc.salary_slip_based_on_timesheet ?
-						print_format="Salary Slip based on Timesheet" :
-						print_format="Salary Slip Standard";
-
-					frappe.call({
-						method: "erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip",
-						args: {
-							source_name: frm.doc.name,
-							employee: values.employee,
-							as_print: 1,
-							print_format: print_format,
-							for_preview: 1
-						},
-						callback: function(r) {
-							var new_window = window.open();
-							new_window.document.write(r.message);
-							// frappe.msgprint(r.message);
-						}
+				if(!employees) return;
+				if (employees.length == 1){
+					frm.events.open_salary_slip(frm, employees[0]);
+				} else {
+						var d = new frappe.ui.Dialog({
+						title: __("Preview Salary Slip"),
+						fields: [
+							{
+								"label":__("Employee"),
+								"fieldname":"employee",
+								"fieldtype":"Select",
+								"reqd": true,
+								options: employees
+							}, {
+								fieldname:"fetch",
+								"label":__("Show Salary Slip"),
+								"fieldtype":"Button"
+							}
+						]
 					});
-				});
-				d.show();
+					d.get_input("fetch").on("click", function() {
+						var values = d.get_values();
+						if(!values) return;
+							frm.events.open_salary_slip(frm, values.employee)
+
+					});
+					d.show();
+				}
+			}
+		});
+	},
+
+	open_salary_slip: function(frm, employee){
+		var print_format = frm.doc.salary_slip_based_on_timesheet ? "Salary Slip based on Timesheet" : "Salary Slip Standard";
+		frappe.call({
+			method: "erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip",
+			args: {
+				source_name: frm.doc.name,
+				employee: employee,
+				as_print: 1,
+				print_format: print_format,
+				for_preview: 1
+			},
+			callback: function(r) {
+				var new_window = window.open();
+				new_window.document.write(r.message);
 			}
 		});
 	},

From 8bada8759a63c330d6c41c3a53efd45d1f99312c Mon Sep 17 00:00:00 2001
From: Pranav Nachnekar <prnvnachnekar@gmail.com>
Date: Mon, 23 Dec 2019 12:49:29 +0000
Subject: [PATCH 079/193] fix: wrap `scheduled_time` with `getdate()` (#20044)

* fix: wrap `scheduled_time` with `getdate()`

Handles inconsistent data returned from the ORM.

* fix: use `getdate()` instead of `date()`
---
 erpnext/crm/doctype/appointment/appointment.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erpnext/crm/doctype/appointment/appointment.py b/erpnext/crm/doctype/appointment/appointment.py
index b6c4c4707de..f50293043b1 100644
--- a/erpnext/crm/doctype/appointment/appointment.py
+++ b/erpnext/crm/doctype/appointment/appointment.py
@@ -11,7 +11,7 @@ from datetime import timedelta
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import get_url
+from frappe.utils import get_url, getdate
 from frappe.utils.verified_command import verify_request, get_signed_params
 
 
@@ -117,7 +117,7 @@ class Appointment(Document):
 		if self._assign:
 			return
 		available_agents = _get_agents_sorted_by_asc_workload(
-			self.scheduled_time.date())
+			getdate(self.scheduled_time))
 		for agent in available_agents:
 			if(_check_agent_availability(agent, self.scheduled_time)):
 				agent = agent[0]
@@ -189,7 +189,7 @@ def _get_agents_sorted_by_asc_workload(date):
 		assigned_to = frappe.parse_json(appointment._assign)
 		if not assigned_to:
 			continue
-		if (assigned_to[0] in agent_list) and appointment.scheduled_time.date() == date:
+		if (assigned_to[0] in agent_list) and getdate(appointment.scheduled_time) == date:
 			appointment_counter[assigned_to[0]] += 1
 	sorted_agent_list = appointment_counter.most_common()
 	sorted_agent_list.reverse()

From 93cb64ee305455e5ffd624b47ca8479d5fb7c485 Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Mon, 23 Dec 2019 18:24:56 +0530
Subject: [PATCH 080/193] enhancement`: Added Set Reserve Warehouse field in
 Purchase Order. (#19991)

---
 .../purchase_order/purchase_order.json        | 12 ++++++++++-
 erpnext/public/js/controllers/transaction.js  | 20 ++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 5dce3497829..8cd44c789de 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2013-05-21 16:16:39",
@@ -47,6 +48,7 @@
   "ignore_pricing_rule",
   "sec_warehouse",
   "set_warehouse",
+  "set_reserve_warehouse",
   "col_break_warehouse",
   "is_subcontracted",
   "supplier_warehouse",
@@ -1039,12 +1041,20 @@
    "fieldtype": "Link",
    "label": "Tax Category",
    "options": "Tax Category"
+  },
+  {
+   "depends_on": "supplied_items",
+   "fieldname": "set_reserve_warehouse",
+   "fieldtype": "Link",
+   "label": "Set Reserve Warehouse",
+   "options": "Warehouse"
   }
  ],
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
- "modified": "2019-07-11 18:25:49.509343",
+ "links": [],
+ "modified": "2019-12-18 13:13:22.852412",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 6db849aca77..6ca095869f7 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1775,14 +1775,28 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		}
 	},
 
+	set_reserve_warehouse: function() {
+		this.autofill_warehouse("reserve_warehouse");
+	},
+
 	set_warehouse: function() {
+		this.autofill_warehouse("warehouse");
+	},
+
+	autofill_warehouse : function (warehouse_field) {
+		// set warehouse in all child table rows
 		var me = this;
-		if(this.frm.doc.set_warehouse) {
-			$.each(this.frm.doc.items || [], function(i, item) {
-				frappe.model.set_value(me.frm.doctype + " Item", item.name, "warehouse", me.frm.doc.set_warehouse);
+		let warehouse = (warehouse_field === "warehouse") ? me.frm.doc.set_warehouse : me.frm.doc.set_reserve_warehouse;
+		let child_table = (warehouse_field === "warehouse") ? me.frm.doc.items : me.frm.doc.supplied_items;
+		let doctype = (warehouse_field === "warehouse") ? (me.frm.doctype + " Item") : (me.frm.doctype + " Item Supplied");
+
+		if(warehouse) {
+			$.each(child_table || [], function(i, item) {
+				frappe.model.set_value(doctype, item.name, warehouse_field, warehouse);
 			});
 		}
 	},
+
 	coupon_code: function() {
 		var me = this;
 		frappe.run_serially([

From 4f72c0b8b5b592318329cd836dd088ca59a7cd8a Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 23 Dec 2019 18:27:12 +0530
Subject: [PATCH 081/193] fix: wrong items in table being deleted (#19994)

---
 erpnext/public/js/utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index d5a78d4f1f0..f363999ebe2 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -501,6 +501,7 @@ erpnext.utils.update_child_items = function(opts) {
 	frm.doc[opts.child_docname].forEach(d => {
 		dialog.fields_dict.trans_items.df.data.push({
 			"docname": d.name,
+			"name": d.name,
 			"item_code": d.item_code,
 			"qty": d.qty,
 			"rate": d.rate,

From d8c10bcedbb3f2ce71f98ee9eca24fbffd802fc2 Mon Sep 17 00:00:00 2001
From: Khushal Trivedi <khushal.t@indictranstech.com>
Date: Mon, 23 Dec 2019 18:38:11 +0530
Subject: [PATCH 082/193] fix:Sibling child table filtering for duplicate entry
 on student form (#19908)

* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix: joining and relieving Date can be on same date as valid use case

* fix-education: date of birth validation

* fix:Sibling child table filtering for duplacacy on student form

* fix:Sibling child table filtering for duplacacy on student form

* fix:Sibling child table filtering for duplacacy on student form
---
 erpnext/education/doctype/student/student.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/erpnext/education/doctype/student/student.js b/erpnext/education/doctype/student/student.js
index b6e741c4da6..1936dcbd3e0 100644
--- a/erpnext/education/doctype/student/student.js
+++ b/erpnext/education/doctype/student/student.js
@@ -31,7 +31,7 @@ frappe.ui.form.on('Student', {
 frappe.ui.form.on('Student Guardian', {
 	guardians_add: function(frm){
 		frm.fields_dict['guardians'].grid.get_field('guardian').get_query = function(doc){
-			var guardian_list = [];
+			let guardian_list = [];
 			if(!doc.__islocal) guardian_list.push(doc.guardian);
 			$.each(doc.guardians, function(idx, val){
 				if (val.guardian) guardian_list.push(val.guardian);
@@ -40,3 +40,18 @@ frappe.ui.form.on('Student Guardian', {
 		};
 	}
 });
+
+
+frappe.ui.form.on('Student Sibling', {
+	siblings_add: function(frm){
+		frm.fields_dict['siblings'].grid.get_field('student').get_query = function(doc){
+			let sibling_list = [frm.doc.name];
+			$.each(doc.siblings, function(idx, val){
+				if (val.student && val.studying_in_same_institute == 'YES') {
+					sibling_list.push(val.student);
+				}
+			});
+			return { filters: [['Student', 'name', 'not in', sibling_list]] };
+		};
+	}
+});
\ No newline at end of file

From da5d5c4941f860b8152e40f1ab605838225eff22 Mon Sep 17 00:00:00 2001
From: "Parth J. Kharwar" <parthjk98@gmail.com>
Date: Mon, 23 Dec 2019 18:41:17 +0530
Subject: [PATCH 083/193] fix(hr): update leave application status on cancel
 (#19883)

---
 erpnext/hr/doctype/leave_application/leave_application.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 915cea149d8..5222712ea2b 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -54,9 +54,11 @@ class LeaveApplication(Document):
 		self.create_leave_ledger_entry()
 		self.reload()
 
+	def before_cancel(self):
+		self.status = "Cancelled"
+
 	def on_cancel(self):
 		self.create_leave_ledger_entry(submit=False)
-		self.status = "Cancelled"
 		# notify leave applier about cancellation
 		self.notify_employee()
 		self.cancel_attendance()

From b3e50d846b8ddc1152789cf97efc953d826203c9 Mon Sep 17 00:00:00 2001
From: Prasad Ramesh <progressive.prasad@gmail.com>
Date: Mon, 23 Dec 2019 18:47:25 +0530
Subject: [PATCH 084/193] Update README.md (#20049)

---
 README.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 64f8d67d8e8..ed57a17279c 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,26 @@
 
 </div>
 
-Includes: Accounting, Inventory, Manufacturing, CRM, Sales, Purchase, Project Management, HRMS. Requires MariaDB.
+ERPNext as a monolith includes the following areas for managing businesses:
 
-ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
+1. [Accounting](https://erpnext.com/docs/user/manual/en/accounts)
+1. [Inventory](https://erpnext.com/docs/user/manual/en/stock)
+1. [CRM](https://erpnext.com/docs/user/manual/en/CRM)
+1. [Sales](https://erpnext.com/docs/user/manual/en/selling)
+1. [Purchase](https://erpnext.com/docs/user/manual/en/buying)
+1. [HRMS](https://erpnext.com/docs/user/manual/en/human-resources)
+1. [Project Management](https://erpnext.com/docs/user/manual/en/projects)
+1. [Support](https://erpnext.com/docs/user/manual/en/support)
+1. [Asset Management](https://erpnext.com/docs/user/manual/en/asset)
+1. [Quality Management](https://erpnext.com/docs/user/manual/en/quality-management)
+1. [Manufacturing](https://erpnext.com/docs/user/manual/en/manufacturing)
+1. [Website Management](https://erpnext.com/docs/user/manual/en/website)
+1. [Customize ERPNext](https://erpnext.com/docs/user/manual/en/customize-erpnext)
+1. [And More](https://erpnext.com/docs/user/manual/en/)
+
+ERPNext requires MariaDB.
+
+ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a full-stack web app framework built with Python & JavaScript.
 
 - [User Guide](https://erpnext.com/docs/user)
 - [Discussion Forum](https://discuss.erpnext.com/)

From 964cbc03ba9fb56f7fc1456ce1bfe94f451ef600 Mon Sep 17 00:00:00 2001
From: Wolfram Schmidt <wolfram.schmidt@tueit.de>
Date: Mon, 23 Dec 2019 14:20:40 +0100
Subject: [PATCH 085/193] Update employee.json (#20057)

unnecessary description. Should be added by customer manually if needed individually.
---
 erpnext/hr/doctype/employee/employee.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 9291820524e..a45b41d9174 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -232,7 +232,6 @@
    "reqd": 1
   },
   {
-   "description": "You can enter any date manually",
    "fieldname": "date_of_birth",
    "fieldtype": "Date",
    "label": "Date of Birth",
@@ -831,4 +830,4 @@
  "sort_order": "DESC",
  "title_field": "employee_name",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 152c6be209425c1682c8f2ae7d6510cca95c75e5 Mon Sep 17 00:00:00 2001
From: DeeMysterio <dikshajadhav11.dj@gmail.com>
Date: Mon, 23 Dec 2019 19:02:29 +0530
Subject: [PATCH 086/193] fix(employee onboarding): stop showing irrelevant job
 offer links for a job applicant (#20053)

---
 .../hr/doctype/employee_onboarding/employee_onboarding.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js
index 996dcdf8484..c1285675e5c 100644
--- a/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js
+++ b/erpnext/hr/doctype/employee_onboarding/employee_onboarding.js
@@ -7,6 +7,14 @@ frappe.ui.form.on('Employee Onboarding', {
 		frm.add_fetch("employee_onboarding_template", "department", "department");
 		frm.add_fetch("employee_onboarding_template", "designation", "designation");
 		frm.add_fetch("employee_onboarding_template", "employee_grade", "employee_grade");
+
+		frm.set_query('job_offer', function () {
+			return {
+				filters: {
+					'job_applicant': frm.doc.job_applicant
+				}
+			};
+		});
 	},
 
 	refresh: function(frm) {

From cc62aad503c8c9c453e545fb2213a7e0814e4191 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Tue, 24 Dec 2019 11:51:39 +0530
Subject: [PATCH 087/193] fix: Label for return amount

---
 erpnext/hr/doctype/employee_advance/employee_advance.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/hr/doctype/employee_advance/employee_advance.json b/erpnext/hr/doctype/employee_advance/employee_advance.json
index a4e46765470..d233a2bb936 100644
--- a/erpnext/hr/doctype/employee_advance/employee_advance.json
+++ b/erpnext/hr/doctype/employee_advance/employee_advance.json
@@ -166,7 +166,7 @@
   {
    "fieldname": "return_amount",
    "fieldtype": "Currency",
-   "label": "Return Amount",
+   "label": "Returned Amount",
    "options": "Company:company:default_currency",
    "read_only": 1
   }
@@ -210,4 +210,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 818c49279c5230770fdac5691f5bfb5e8ee5237b Mon Sep 17 00:00:00 2001
From: RJPvT <48353029+RJPvT@users.noreply.github.com>
Date: Tue, 24 Dec 2019 07:54:58 +0100
Subject: [PATCH 088/193] Update supplier_scorecard.py (#20061)

---
 erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
index 9e201e31926..af109ba2848 100644
--- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
+++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
@@ -138,7 +138,7 @@ def refresh_scorecards():
 		# Check to see if any new scorecard periods are created
 		if make_all_scorecards(sc.name) > 0:
 			# Save the scorecard to update the score and standings
-			sc.save()
+			frappe.get_doc('Supplier Scorecard', sc.name).save()
 
 
 @frappe.whitelist()

From 088be37e64be70b47db8e8f6ce962875d79956dc Mon Sep 17 00:00:00 2001
From: Sun Howwrongbum <sun.animus@gmail.com>
Date: Tue, 24 Dec 2019 12:29:25 +0530
Subject: [PATCH 089/193] feat: consider expiry_date during Batch queries
 (#20065)

---
 erpnext/controllers/queries.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 7b4a4c92ad1..5c319008a85 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -311,6 +311,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
 				and sle.item_code = %(item_code)s
 				and sle.warehouse = %(warehouse)s
 				and (sle.batch_no like %(txt)s
+				or batch.expiry_date like %(txt)s
 				or batch.manufacturing_date like %(txt)s)
 				and batch.docstatus < 2
 				{cond}
@@ -329,6 +330,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
 			where batch.disabled = 0
 			and item = %(item_code)s
 			and (name like %(txt)s
+			or expiry_date like %(txt)s
 			or manufacturing_date like %(txt)s)
 			and docstatus < 2
 			{0}

From 5af4c57ef7b1eee87dab16b39813e4d7f59f81a1 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Tue, 24 Dec 2019 12:31:38 +0530
Subject: [PATCH 090/193] fix: ambihious error (#20068)

---
 erpnext/stock/doctype/batch/batch.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 3e890b4dd4e..114925469b5 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -261,15 +261,14 @@ def get_batch_no(item_code, warehouse, qty=1, throw=False):
 
 
 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` 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 '
-		'order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC',
-		(item_code, warehouse),
-		as_dict=True
-	)
 
-	return batches
+	return frappe.db.sql("""
+		select batch_id, sum(`tabStock Ledger Entry`.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
+		order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC'
+	""", (item_code, warehouse), as_dict=True)
\ No newline at end of file

From 55bc26e300914954f16fd2fae76af038c10a8d34 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Tue, 24 Dec 2019 12:55:01 +0530
Subject: [PATCH 091/193] fix: Allow creation of multiple landed cost voucher
 against a Purchase Document (#20058)

---
 .../purchase_receipt/purchase_receipt.py      | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 060175f9045..691f92ffa72 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -88,7 +88,7 @@ class PurchaseReceipt(BuyingController):
 
 		if getdate(self.posting_date) > getdate(nowdate()):
 			throw(_("Posting Date cannot be future date"))
-	
+
 	def validate_cwip_accounts(self):
 		for item in self.get('items'):
 			if item.is_fixed_asset and is_cwip_accounting_enabled(item.asset_category):
@@ -362,7 +362,7 @@ class PurchaseReceipt(BuyingController):
 					# valuation rate is total of net rate, raw mat supp cost, tax amount, lcv amount per item
 					self.update_assets(item, item.valuation_rate)
 		return gl_entries
-	
+
 	def add_asset_gl_entries(self, item, gl_entries):
 		arbnb_account = self.get_company_default("asset_received_but_not_billed")
 		# This returns category's cwip account if not then fallback to company's default cwip account
@@ -395,7 +395,7 @@ class PurchaseReceipt(BuyingController):
 			"credit_in_account_currency": (base_asset_amount
 				if asset_rbnb_currency == self.company_currency else asset_amount)
 		}, item=item))
-	
+
 	def add_lcv_gl_entries(self, item, gl_entries):
 		expenses_included_in_asset_valuation = self.get_company_default("expenses_included_in_asset_valuation")
 		if not is_cwip_accounting_enabled(item.asset_category):
@@ -404,7 +404,7 @@ class PurchaseReceipt(BuyingController):
 		else:
 			# This returns company's default cwip account
 			asset_account = get_asset_account("capital_work_in_progress_account", company=self.company)
-		
+
 		gl_entries.append(self.get_gl_dict({
 			"account": expenses_included_in_asset_valuation,
 			"against": asset_account,
@@ -424,7 +424,7 @@ class PurchaseReceipt(BuyingController):
 		}, item=item))
 
 	def update_assets(self, item, valuation_rate):
-		assets = frappe.db.get_all('Asset', 
+		assets = frappe.db.get_all('Asset',
 			filters={ 'purchase_receipt': self.name, 'item_code': item.item_code }
 		)
 
@@ -610,27 +610,36 @@ def make_stock_entry(source_name,target_doc=None):
 	return doclist
 
 def get_item_account_wise_additional_cost(purchase_document):
-	landed_cost_voucher = frappe.get_value("Landed Cost Purchase Receipt",
-		{"receipt_document": purchase_document, "docstatus": 1}, "parent")
+	landed_cost_vouchers = frappe.get_all("Landed Cost Purchase Receipt", fields=["parent"],
+		filters = {"receipt_document": purchase_document, "docstatus": 1})
 
-	if not landed_cost_voucher:
+	if not landed_cost_vouchers:
 		return
 
 	total_item_cost = 0
 	item_account_wise_cost = {}
-	landed_cost_voucher_doc = frappe.get_doc("Landed Cost Voucher", landed_cost_voucher)
-	based_on_field = frappe.scrub(landed_cost_voucher_doc.distribute_charges_based_on)
+	item_cost_allocated = []
 
-	for item in landed_cost_voucher_doc.items:
-		total_item_cost += item.get(based_on_field)
+	for lcv in landed_cost_vouchers:
+		landed_cost_voucher_doc = frappe.get_cached_doc("Landed Cost Voucher", lcv.parent)
+		based_on_field = frappe.scrub(landed_cost_voucher_doc.distribute_charges_based_on)
 
-	for item in landed_cost_voucher_doc.items:
-		if item.receipt_document == purchase_document:
-			for account in landed_cost_voucher_doc.taxes:
-				item_account_wise_cost.setdefault((item.item_code, item.purchase_receipt_item), {})
-				item_account_wise_cost[(item.item_code, item.purchase_receipt_item)].setdefault(account.expense_account, 0.0)
-				item_account_wise_cost[(item.item_code, item.purchase_receipt_item)][account.expense_account] += \
-					account.amount * item.get(based_on_field) / total_item_cost
+		for item in landed_cost_voucher_doc.items:
+			if item.purchase_receipt_item not in item_cost_allocated:
+				total_item_cost += item.get(based_on_field)
+				item_cost_allocated.append(item.purchase_receipt_item)
+
+	for lcv in landed_cost_vouchers:
+		landed_cost_voucher_doc = frappe.get_cached_doc("Landed Cost Voucher", lcv.parent)
+		based_on_field = frappe.scrub(landed_cost_voucher_doc.distribute_charges_based_on)
+
+		for item in landed_cost_voucher_doc.items:
+			if item.receipt_document == purchase_document:
+				for account in landed_cost_voucher_doc.taxes:
+					item_account_wise_cost.setdefault((item.item_code, item.purchase_receipt_item), {})
+					item_account_wise_cost[(item.item_code, item.purchase_receipt_item)].setdefault(account.expense_account, 0.0)
+					item_account_wise_cost[(item.item_code, item.purchase_receipt_item)][account.expense_account] += \
+						account.amount * item.get(based_on_field) / total_item_cost
 
 	return item_account_wise_cost
 

From 08433c2919160e2b099ad191318f3c52e2d0d789 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Tue, 24 Dec 2019 13:03:47 +0530
Subject: [PATCH 092/193] fix: supplier email id field not showing in the
 notification for purchase cycle doctypes (#20071)

---
 .../accounts/doctype/purchase_invoice/purchase_invoice.json  | 5 ++++-
 erpnext/buying/doctype/purchase_order/purchase_order.json    | 3 ++-
 erpnext/stock/doctype/purchase_receipt/purchase_receipt.json | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 6fe18115c04..3715d774139 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2013-05-21 16:16:39",
@@ -417,6 +418,7 @@
    "fieldname": "contact_email",
    "fieldtype": "Small Text",
    "label": "Contact Email",
+   "options": "Email",
    "print_hide": 1,
    "read_only": 1
   },
@@ -1287,7 +1289,8 @@
  "icon": "fa fa-file-text",
  "idx": 204,
  "is_submittable": 1,
- "modified": "2019-09-17 22:31:42.666601",
+ "links": [],
+ "modified": "2019-12-24 12:51:58.613538",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 8cd44c789de..d4c5acee906 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -342,6 +342,7 @@
    "fieldname": "contact_email",
    "fieldtype": "Small Text",
    "label": "Contact Email",
+   "options": "Email",
    "print_hide": 1,
    "read_only": 1
   },
@@ -1054,7 +1055,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2019-12-18 13:13:22.852412",
+ "modified": "2019-12-24 12:44:13.137194",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index d6bc1a9b972..27cd997bcc2 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2013-05-21 16:16:39",
@@ -305,6 +306,7 @@
    "fieldname": "contact_email",
    "fieldtype": "Small Text",
    "label": "Contact Email",
+   "options": "Email",
    "print_hide": 1,
    "read_only": 1
   },
@@ -1056,7 +1058,8 @@
  "icon": "fa fa-truck",
  "idx": 261,
  "is_submittable": 1,
- "modified": "2019-09-27 14:24:49.044505",
+ "links": [],
+ "modified": "2019-12-24 12:52:17.216304",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt",

From 5557b16260093c0aa5e4a143421620ae677cdf4d Mon Sep 17 00:00:00 2001
From: Don-Leopardo <46027152+Don-Leopardo@users.noreply.github.com>
Date: Tue, 24 Dec 2019 08:09:34 -0300
Subject: [PATCH 093/193] fix: order_type validation restriction (#18096)

---
 erpnext/controllers/selling_controller.py          | 7 -------
 erpnext/selling/doctype/quotation/quotation.py     | 4 ----
 erpnext/selling/doctype/sales_order/sales_order.py | 4 ----
 3 files changed, 15 deletions(-)

diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 9dbd5be9188..9a9f3d1d319 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -148,13 +148,6 @@ class SellingController(StockController):
 		if sales_team and total != 100.0:
 			throw(_("Total allocated percentage for sales team should be 100"))
 
-	def validate_order_type(self):
-		valid_types = ["Sales", "Maintenance", "Shopping Cart"]
-		if not self.order_type:
-			self.order_type = "Sales"
-		elif self.order_type not in valid_types:
-			throw(_("Order Type must be one of {0}").format(comma_or(valid_types)))
-
 	def validate_max_discount(self):
 		for d in self.get("items"):
 			if d.item_code:
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 790b2f0804d..9ebef0d6bc7 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -26,7 +26,6 @@ class Quotation(SellingController):
 		super(Quotation, self).validate()
 		self.set_status()
 		self.update_opportunity()
-		self.validate_order_type()
 		self.validate_uom_is_integer("stock_uom", "qty")
 		self.validate_valid_till()
 		self.set_customer_name()
@@ -40,9 +39,6 @@ class Quotation(SellingController):
 	def has_sales_order(self):
 		return frappe.db.get_value("Sales Order Item", {"prevdoc_docname": self.name, "docstatus": 1})
 
-	def validate_order_type(self):
-		super(Quotation, self).validate_order_type()
-
 	def update_lead(self):
 		if self.quotation_to == "Lead" and self.party_name:
 			frappe.get_doc("Lead", self.party_name).set_status(update=True)
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 2112a4174b1..94bbb793a3a 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -34,7 +34,6 @@ class SalesOrder(SellingController):
 
 	def validate(self):
 		super(SalesOrder, self).validate()
-		self.validate_order_type()
 		self.validate_delivery_date()
 		self.validate_proj_cust()
 		self.validate_po()
@@ -100,9 +99,6 @@ class SalesOrder(SellingController):
 					frappe.msgprint(_("Quotation {0} not of type {1}")
 						.format(d.prevdoc_docname, self.order_type))
 
-	def validate_order_type(self):
-		super(SalesOrder, self).validate_order_type()
-
 	def validate_delivery_date(self):
 		if self.order_type == 'Sales' and not self.skip_delivery_note:
 			delivery_date_list = [d.delivery_date for d in self.get("items") if d.delivery_date]

From 0ad7449ae34cf9c78e8c31192f867000820b1237 Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Tue, 24 Dec 2019 16:42:30 +0530
Subject: [PATCH 094/193] feat: allow adding & deleting of items in submitted
 SO & PO (#19911)

* feat: allow adding of items after quotation submission

* feat: allow deletion of items from submitted SO & PO

* fix: case when items are added and deleted at once

* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
---
 .../purchase_order/test_purchase_order.py     | 67 +++++++++++++++++++
 erpnext/controllers/accounts_controller.py    | 21 ++++++
 erpnext/public/js/utils.js                    |  3 +-
 .../doctype/sales_order/test_sales_order.py   | 49 +++++++++++++-
 4 files changed, 138 insertions(+), 2 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index 08f5d8b4d00..1712369e60b 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -118,6 +118,73 @@ class TestPurchaseOrder(unittest.TestCase):
 		self.assertEqual(po.get("items")[0].amount, 1400)
 		self.assertEqual(get_ordered_qty(), existing_ordered_qty + 3)
 
+	
+	def test_add_new_item_in_update_child_qty_rate(self):
+		po = create_purchase_order(do_not_save=1)
+		po.items[0].qty = 4
+		po.save()
+		po.submit()
+		pr = make_pr_against_po(po.name, 2)
+
+		po.load_from_db()
+		first_item_of_po = po.get("items")[0]
+
+		trans_item = json.dumps([
+			{
+				'item_code': first_item_of_po.item_code,
+				'rate': first_item_of_po.rate,
+				'qty': first_item_of_po.qty,
+				'docname': first_item_of_po.name
+			},
+			{'item_code' : '_Test Item', 'rate' : 200, 'qty' : 7}
+		])
+		update_child_qty_rate('Purchase Order', trans_item, po.name)
+
+		po.reload()
+		self.assertEquals(len(po.get('items')), 2)
+		self.assertEqual(po.status, 'To Receive and Bill')
+
+	
+	def test_remove_item_in_update_child_qty_rate(self):
+		po = create_purchase_order(do_not_save=1)
+		po.items[0].qty = 4
+		po.save()
+		po.submit()
+		pr = make_pr_against_po(po.name, 2)
+
+		po.reload()
+		first_item_of_po = po.get("items")[0]
+		# add an item
+		trans_item = json.dumps([
+			{
+				'item_code': first_item_of_po.item_code,
+				'rate': first_item_of_po.rate,
+				'qty': first_item_of_po.qty,
+				'docname': first_item_of_po.name
+			},
+			{'item_code' : '_Test Item', 'rate' : 200, 'qty' : 7}])
+		update_child_qty_rate('Purchase Order', trans_item, po.name)
+
+		po.reload()
+		# check if can remove received item
+		trans_item = json.dumps([{'item_code' : '_Test Item', 'rate' : 200, 'qty' : 7, 'docname': po.get("items")[1].name}])
+		self.assertRaises(frappe.ValidationError, update_child_qty_rate, 'Purchase Order', trans_item, po.name)
+
+		first_item_of_po = po.get("items")[0]
+		trans_item = json.dumps([
+			{
+				'item_code': first_item_of_po.item_code,
+				'rate': first_item_of_po.rate,
+				'qty': first_item_of_po.qty,
+				'docname': first_item_of_po.name
+			}
+		])
+		update_child_qty_rate('Purchase Order', trans_item, po.name)
+
+		po.reload()
+		self.assertEquals(len(po.get('items')), 1)
+		self.assertEqual(po.status, 'To Receive and Bill')
+
 	def test_update_qty(self):
 		po = create_purchase_order()
 
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 6150516ac8c..86f5d53b33c 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1155,6 +1155,25 @@ def set_purchase_order_defaults(parent_doctype, parent_doctype_name, child_docna
 	child_item.base_amount = 1 # Initiallize value will update in parent validation
 	return child_item
 
+def check_and_delete_children(parent, data):
+	deleted_children = []
+	updated_item_names = [d.get("docname") for d in data]
+	for item in parent.items:
+		if item.name not in updated_item_names:
+			deleted_children.append(item)
+
+	for d in deleted_children:
+		if parent.doctype == "Sales Order" and flt(d.delivered_qty):
+			frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been delivered").format(d.idx, d.item_code))
+
+		if parent.doctype == "Purchase Order" and flt(d.received_qty):
+			frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been received").format(d.idx, d.item_code))
+		
+		if flt(d.billed_amt):
+			frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been billed.").format(d.idx, d.item_code))
+
+		d.cancel()
+		d.delete()
 
 @frappe.whitelist()
 def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, child_docname="items"):
@@ -1163,6 +1182,8 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
 	sales_doctypes = ['Sales Order', 'Sales Invoice', 'Delivery Note', 'Quotation']
 	parent = frappe.get_doc(parent_doctype, parent_doctype_name)
 
+	check_and_delete_children(parent, data)
+
 	for d in data:
 		new_child_flag = False
 		if not d.get("docname"):
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index f363999ebe2..3f444f83879 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -458,7 +458,8 @@ erpnext.utils.update_child_items = function(opts) {
 					fieldname:"item_code",
 					options: 'Item',
 					in_list_view: 1,
-					read_only: 1,
+					read_only: 0,
+					disabled: 0,
 					label: __('Item Code')
 				}, {
 					fieldtype:'Float',
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index feb6b76c4d3..d8e9a635b3a 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -321,7 +321,12 @@ class TestSalesOrder(unittest.TestCase):
 		create_dn_against_so(so.name, 4)
 		make_sales_invoice(so.name)
 
-		trans_item = json.dumps([{'item_code' : '_Test Item 2', 'rate' : 200, 'qty' : 7}])
+		first_item_of_so = so.get("items")[0]
+		trans_item = json.dumps([
+			{'item_code' : first_item_of_so.item_code, 'rate' : first_item_of_so.rate, \
+				'qty' : first_item_of_so.qty, 'docname': first_item_of_so.name},
+			{'item_code' : '_Test Item 2', 'rate' : 200, 'qty' : 7}
+		])
 		update_child_qty_rate('Sales Order', trans_item, so.name)
 
 		so.reload()
@@ -330,6 +335,48 @@ class TestSalesOrder(unittest.TestCase):
 		self.assertEqual(so.get("items")[-1].qty, 7)
 		self.assertEqual(so.get("items")[-1].amount, 1400)
 		self.assertEqual(so.status, 'To Deliver and Bill')
+	
+	def test_remove_item_in_update_child_qty_rate(self):
+		so = make_sales_order(**{
+			"item_list": [{
+				"item_code": '_Test Item',
+				"qty": 5,
+				"rate":1000
+			}]
+		})
+		create_dn_against_so(so.name, 2)
+		make_sales_invoice(so.name)
+
+		# add an item so as to try removing items
+		trans_item = json.dumps([
+			{"item_code": '_Test Item', "qty": 5, "rate":1000, "docname": so.get("items")[0].name},
+			{"item_code": '_Test Item 2', "qty": 2, "rate":500}
+		])
+		update_child_qty_rate('Sales Order', trans_item, so.name)
+		so.reload()
+		self.assertEqual(len(so.get("items")), 2)
+
+		# check if delivered items can be removed
+		trans_item = json.dumps([{
+			"item_code": '_Test Item 2',
+			"qty": 2,
+			"rate":500,
+			"docname": so.get("items")[1].name
+		}])
+		self.assertRaises(frappe.ValidationError, update_child_qty_rate, 'Sales Order', trans_item, so.name)
+
+		#remove last added item
+		trans_item = json.dumps([{
+			"item_code": '_Test Item',
+			"qty": 5,
+			"rate":1000,
+			"docname": so.get("items")[0].name
+		}])
+		update_child_qty_rate('Sales Order', trans_item, so.name)
+		
+		so.reload()
+		self.assertEqual(len(so.get("items")), 1)
+		self.assertEqual(so.status, 'To Deliver and Bill')
 
 
 	def test_update_child_qty_rate(self):

From d7427919a4d638359de9c7ba4be4832cf4d6011f Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Tue, 24 Dec 2019 16:45:09 +0530
Subject: [PATCH 095/193] fix: Address section rearrange and minor bug fixes

---
 erpnext/crm/doctype/lead/lead.json | 36 +++++++++++++++++++-----------
 erpnext/crm/doctype/lead/lead.py   | 33 ++++++++++++++-------------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 2219307caf4..bc007b146f1 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_events_in_timeline": 1,
  "allow_import": 1,
  "autoname": "naming_series:",
@@ -30,18 +31,19 @@
   "ends_on",
   "notes_section",
   "notes",
-  "contact_info",
+  "address_info",
   "address_html",
   "address_title",
   "address_line1",
   "address_line2",
   "city",
   "county",
+  "column_break2",
+  "contact_html",
   "state",
   "country",
   "pincode",
-  "column_break2",
-  "contact_html",
+  "contact_section",
   "phone",
   "mobile_no",
   "fax",
@@ -230,15 +232,6 @@
    "fieldtype": "Text Editor",
    "label": "Notes"
   },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "eval: doc.__islocal",
-   "fieldname": "contact_info",
-   "fieldtype": "Section Break",
-   "label": "Address & Contact",
-   "oldfieldtype": "Column Break",
-   "options": "fa fa-map-marker"
-  },
   {
    "fieldname": "address_html",
    "fieldtype": "HTML",
@@ -424,12 +417,29 @@
    "fieldtype": "Link",
    "label": "Designation",
    "options": "Designation"
+  },
+  {
+   "collapsible": 1,
+   "collapsible_depends_on": "eval: doc.__islocal",
+   "fieldname": "address_info",
+   "fieldtype": "Section Break",
+   "label": "Address & Contact",
+   "oldfieldtype": "Column Break",
+   "options": "fa fa-map-marker"
+  },
+  {
+   "collapsible": 1,
+   "collapsible_depends_on": "eval: doc.__islocal",
+   "fieldname": "contact_section",
+   "fieldtype": "Section Break",
+   "label": "Contact"
   }
  ],
  "icon": "fa fa-user",
  "idx": 5,
  "image_field": "image",
- "modified": "2019-09-20 12:49:02.536647",
+ "links": [],
+ "modified": "2019-12-24 16:00:44.239168",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Lead",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 6645c4d0019..6cab18dc1c3 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -161,22 +161,25 @@ class Lead(SellingController):
 			"salutation": self.salutation,
 			"gender": self.gender,
 			"designation": self.designation,
-			"email_ids": [
-				{
-					"email_id": self.email_id,
-					"is_primary": 1
-				}
-			],
-			"phone_nos": [
-				{
-					"phone": self.phone,
-					"is_primary": 1
-				},
-				{
-					"phone": self.mobile_no,
-				}
-			]
 		})
+
+		if self.email_id:
+			contact.append("email_ids", {
+				"email_id": self.email_id,
+				"is_primary": 1
+			})
+
+		if self.phone:
+			contact.append("phone_nos", {
+				"phone": self.phone,
+				"is_primary": 1
+			})
+
+		if self.mobile_no:
+			contact.append("phone_nos", {
+				"phone": self.mobile_no
+			})
+
 		contact.insert()
 
 		return contact

From b972f763f30e2ab5b6e8f6aa5c59a103ccf22970 Mon Sep 17 00:00:00 2001
From: Pranav Nachnekar <prnvnachnekar@gmail.com>
Date: Tue, 24 Dec 2019 11:16:46 +0000
Subject: [PATCH 096/193] fix: added validation for cost center (#19932)

* fix: add validation for cost centers in sales invoice

* use `get_cached_value` for getting compnay, formatting of error message
---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 0f4d4451be9..9ea5a51e3f5 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -90,6 +90,7 @@ class SalesInvoice(SellingController):
 		self.validate_account_for_change_amount()
 		self.validate_fixed_asset()
 		self.set_income_account_for_fixed_assets()
+		self.validate_item_cost_centers()
 		validate_inter_company_party(self.doctype, self.customer, self.company, self.inter_company_invoice_reference)
 
 		if cint(self.is_pos):
@@ -147,6 +148,12 @@ class SalesInvoice(SellingController):
 					elif asset.status in ("Scrapped", "Cancelled", "Sold"):
 						frappe.throw(_("Row #{0}: Asset {1} cannot be submitted, it is already {2}").format(d.idx, d.asset, asset.status))
 
+	def validate_item_cost_centers(self):
+		for item in self.items:
+			cost_center_company = frappe.get_cached_value("Cost Center", item.cost_center, "company")
+			if cost_center_company != self.company:
+				frappe.throw(_("Row #{0}: Cost Center {1} does not belong to company {2}").format(frappe.bold(item.idx), frappe.bold(item.cost_center), frappe.bold(self.company)))
+
 	def before_save(self):
 		set_account_for_mode_of_payment(self)
 

From ec258a43d9dba31d887379ef9b629db997c46a3a Mon Sep 17 00:00:00 2001
From: Don-Leopardo <46027152+Don-Leopardo@users.noreply.github.com>
Date: Tue, 24 Dec 2019 09:05:53 -0300
Subject: [PATCH 097/193] perf: Asset Depreciations and Balances report
 (#18022)

---
 .../asset_depreciations_and_balances.py       | 215 ++++++++++--------
 1 file changed, 115 insertions(+), 100 deletions(-)

diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
index 0c99f1424cf..78546609adb 100644
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
@@ -4,126 +4,141 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import formatdate, getdate, flt, add_days
+from frappe.utils import formatdate, flt, add_days
+
 
 def execute(filters=None):
 	filters.day_before_from_date = add_days(filters.from_date, -1)
 	columns, data = get_columns(filters), get_data(filters)
 	return columns, data
-	
+
+
 def get_data(filters):
 	data = []
-	
+
 	asset_categories = get_asset_categories(filters)
 	assets = get_assets(filters)
-	asset_costs = get_asset_costs(assets, filters)
-	asset_depreciations = get_accumulated_depreciations(assets, filters)
-	
+
 	for asset_category in asset_categories:
 		row = frappe._dict()
-		row.asset_category = asset_category
-		row.update(asset_costs.get(asset_category))
+		# row.asset_category = asset_category
+		row.update(asset_category)
+
+		row.cost_as_on_to_date = (flt(row.cost_as_on_from_date) + flt(row.cost_of_new_purchase) -
+				flt(row.cost_of_sold_asset) - flt(row.cost_of_scrapped_asset))
+
+		row.update(next(asset for asset in assets if asset["asset_category"] == asset_category.get("asset_category", "")))
+		row.accumulated_depreciation_as_on_to_date = (flt(row.accumulated_depreciation_as_on_from_date) +
+				flt(row.depreciation_amount_during_the_period) - flt(row.depreciation_eliminated))
+
+		row.net_asset_value_as_on_from_date = (flt(row.cost_as_on_from_date) -
+				flt(row.accumulated_depreciation_as_on_from_date))
+
+		row.net_asset_value_as_on_to_date = (flt(row.cost_as_on_to_date) -
+				flt(row.accumulated_depreciation_as_on_to_date))
 
-		row.cost_as_on_to_date = (flt(row.cost_as_on_from_date) + flt(row.cost_of_new_purchase)
-			- flt(row.cost_of_sold_asset) - flt(row.cost_of_scrapped_asset))
-			
-		row.update(asset_depreciations.get(asset_category))
-		row.accumulated_depreciation_as_on_to_date = (flt(row.accumulated_depreciation_as_on_from_date) + 
-			flt(row.depreciation_amount_during_the_period) - flt(row.depreciation_eliminated))
-		
-		row.net_asset_value_as_on_from_date = (flt(row.cost_as_on_from_date) - 
-			flt(row.accumulated_depreciation_as_on_from_date))
-		
-		row.net_asset_value_as_on_to_date = (flt(row.cost_as_on_to_date) - 
-			flt(row.accumulated_depreciation_as_on_to_date))
-	
 		data.append(row)
-		
+
 	return data
-	
+
+
 def get_asset_categories(filters):
-	return frappe.db.sql_list("""
-		select distinct asset_category from `tabAsset` 
-		where docstatus=1 and company=%s and purchase_date <= %s
-	""", (filters.company, filters.to_date))
-	
+	return frappe.db.sql("""
+		SELECT asset_category,
+			   ifnull(sum(case when purchase_date < %(from_date)s then
+							   case when ifnull(disposal_date, 0) = 0 or disposal_date >= %(from_date)s then
+									gross_purchase_amount
+							   else
+									0
+							   end
+						   else
+								0
+						   end), 0) as cost_as_on_from_date,
+			   ifnull(sum(case when purchase_date >= %(from_date)s then
+			   						gross_purchase_amount
+			   				   else
+			   				   		0
+			   				   end), 0) as cost_of_new_purchase,
+			   ifnull(sum(case when ifnull(disposal_date, 0) != 0
+			   						and disposal_date >= %(from_date)s
+			   						and disposal_date <= %(to_date)s then
+							   case when status = "Sold" then
+							   		gross_purchase_amount
+							   else
+							   		0
+							   end
+						   else
+								0
+						   end), 0) as cost_of_sold_asset,
+			   ifnull(sum(case when ifnull(disposal_date, 0) != 0
+			   						and disposal_date >= %(from_date)s
+			   						and disposal_date <= %(to_date)s then
+							   case when status = "Scrapped" then
+							   		gross_purchase_amount
+							   else
+							   		0
+							   end
+						   else
+								0
+						   end), 0) as cost_of_scrapped_asset
+		from `tabAsset`
+		where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s
+		group by asset_category
+	""", {"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company}, as_dict=1)
+
+
 def get_assets(filters):
 	return frappe.db.sql("""
-		select name, asset_category, purchase_date, gross_purchase_amount, disposal_date, status
-		from `tabAsset` 
-		where docstatus=1 and company=%s and purchase_date <= %s""", 
-		(filters.company, filters.to_date), as_dict=1)
-		
-def get_asset_costs(assets, filters):
-	asset_costs = frappe._dict()
-	for d in assets:
-		asset_costs.setdefault(d.asset_category, frappe._dict({
-			"cost_as_on_from_date": 0,
-			"cost_of_new_purchase": 0,
-			"cost_of_sold_asset": 0,
-			"cost_of_scrapped_asset": 0
-		}))
-		
-		costs = asset_costs[d.asset_category]
-		
-		if getdate(d.purchase_date) < getdate(filters.from_date):
-			if not d.disposal_date or getdate(d.disposal_date) >= getdate(filters.from_date):
-				costs.cost_as_on_from_date += flt(d.gross_purchase_amount)
-		else:
-			costs.cost_of_new_purchase += flt(d.gross_purchase_amount)
-			
-			if d.disposal_date and getdate(d.disposal_date) >= getdate(filters.from_date) \
-					and getdate(d.disposal_date) <= getdate(filters.to_date):
-				if d.status == "Sold":
-					costs.cost_of_sold_asset += flt(d.gross_purchase_amount)
-				elif d.status == "Scrapped":
-					costs.cost_of_scrapped_asset += flt(d.gross_purchase_amount)
-			
-	return asset_costs
-	
-def get_accumulated_depreciations(assets, filters):
-	asset_depreciations = frappe._dict()
-	for d in assets:
-		asset = frappe.get_doc("Asset", d.name)
-		
-		if d.asset_category in asset_depreciations:
-			asset_depreciations[d.asset_category]['accumulated_depreciation_as_on_from_date'] += asset.opening_accumulated_depreciation
-		else:
-			asset_depreciations.setdefault(d.asset_category, frappe._dict({
-				"accumulated_depreciation_as_on_from_date": asset.opening_accumulated_depreciation,
-				"depreciation_amount_during_the_period": 0,
-				"depreciation_eliminated_during_the_period": 0
-			}))
+		SELECT results.asset_category,
+			   sum(results.accumulated_depreciation_as_on_from_date) as accumulated_depreciation_as_on_from_date,
+			   sum(results.depreciation_eliminated_during_the_period) as depreciation_eliminated_during_the_period,
+			   sum(results.depreciation_amount_during_the_period) as depreciation_amount_during_the_period
+		from (SELECT a.asset_category,
+				   ifnull(sum(a.opening_accumulated_depreciation +
+							  case when ds.schedule_date < %(from_date)s and
+										(ifnull(a.disposal_date, 0) = 0 or a.disposal_date >= %(from_date)s) then
+								   ds.depreciation_amount
+							  else
+								   0
+							  end), 0) as accumulated_depreciation_as_on_from_date,
+				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0 and a.disposal_date >= %(from_date)s
+										and a.disposal_date <= %(to_date)s and ds.schedule_date <= a.disposal_date then
+								   ds.depreciation_amount
+							  else
+								   0
+							  end), 0) as depreciation_eliminated_during_the_period,
 
-		depr = asset_depreciations[d.asset_category]
+				   ifnull(sum(case when ds.schedule_date >= %(from_date)s and ds.schedule_date <= %(to_date)s
+										and (ifnull(a.disposal_date, 0) = 0 or ds.schedule_date <= a.disposal_date) then
+								   ds.depreciation_amount
+							  else
+								   0
+							  end), 0) as depreciation_amount_during_the_period
+			from `tabAsset` a, `tabDepreciation Schedule` ds
+			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s and a.name = ds.parent
+			group by a.asset_category
+			union
+			SELECT a.asset_category,
+				   ifnull(sum(case when ifnull(a.disposal_date, 0) != 0
+										and (a.disposal_date < %(from_date)s or a.disposal_date > %(to_date)s) then
+									0
+							   else
+									a.opening_accumulated_depreciation
+							   end), 0) as accumulated_depreciation_as_on_from_date,
+				   ifnull(sum(case when a.disposal_date >= %(from_date)s and a.disposal_date <= %(to_date)s then
+								   a.opening_accumulated_depreciation
+							  else
+								   0
+							  end), 0) as depreciation_eliminated_during_the_period,
+				   0 as depreciation_amount_during_the_period
+			from `tabAsset` a
+			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s
+			and not exists(select * from `tabDepreciation Schedule` ds where a.name = ds.parent)
+			group by a.asset_category) as results
+		group by results.asset_category
+		""", {"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company}, as_dict=1)
 
-		if not asset.schedules: # if no schedule,
-			if asset.disposal_date:
-				# and disposal is NOT within the period, then opening accumulated depreciation not included
-				if getdate(asset.disposal_date) < getdate(filters.from_date) or getdate(asset.disposal_date) > getdate(filters.to_date):
-					asset_depreciations[d.asset_category]['accumulated_depreciation_as_on_from_date'] = 0
 
-				# if no schedule, and disposal is within period, accumulated dep is the amount eliminated
-				if getdate(asset.disposal_date) >= getdate(filters.from_date) and getdate(asset.disposal_date) <= getdate(filters.to_date):
-					depr.depreciation_eliminated_during_the_period += asset.opening_accumulated_depreciation
-		
-		for schedule in asset.get("schedules"):
-			if getdate(schedule.schedule_date) < getdate(filters.from_date):
-				if not asset.disposal_date or getdate(asset.disposal_date) >= getdate(filters.from_date):
-					depr.accumulated_depreciation_as_on_from_date += flt(schedule.depreciation_amount)
-			elif getdate(schedule.schedule_date) <= getdate(filters.to_date):
-				if not asset.disposal_date:
-					depr.depreciation_amount_during_the_period += flt(schedule.depreciation_amount)
-				else:
-					if getdate(schedule.schedule_date) <= getdate(asset.disposal_date):
-						depr.depreciation_amount_during_the_period += flt(schedule.depreciation_amount)
-
-			if asset.disposal_date and getdate(asset.disposal_date) >= getdate(filters.from_date) and getdate(asset.disposal_date) <= getdate(filters.to_date):
-				if getdate(schedule.schedule_date) <= getdate(asset.disposal_date):
-					depr.depreciation_eliminated_during_the_period += flt(schedule.depreciation_amount)
-		
-	return asset_depreciations
-	
 def get_columns(filters):
 	return [
 		{

From 7a5b9a7bbe94ca8213473c91b2f2080854a7d8bf Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 24 Dec 2019 17:39:15 +0530
Subject: [PATCH 098/193] fix: translations and route fixes

---
 erpnext/hub_node/api.py              |  2 +-
 erpnext/public/js/hub/pages/Home.vue |  4 +++-
 erpnext/public/js/hub/pages/Item.vue | 10 +++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
index 06ad2220345..3f260f03c44 100644
--- a/erpnext/hub_node/api.py
+++ b/erpnext/hub_node/api.py
@@ -138,7 +138,7 @@ def publish_selected_items(items_to_publish):
 			items_to_update.append(item)
 			hub_tracked_item = frappe.get_doc('Hub Tracked Item', item_code)
 			hub_tracked_item.update(hub_dict)
-			hub_tracked_items.save()
+			hub_tracked_item.save()
 		else:
 			frappe.get_doc(hub_dict).insert(ignore_if_duplicate=True)
 
diff --git a/erpnext/public/js/hub/pages/Home.vue b/erpnext/public/js/hub/pages/Home.vue
index 79cfe46e158..2aa4f296f46 100644
--- a/erpnext/public/js/hub/pages/Home.vue
+++ b/erpnext/public/js/hub/pages/Home.vue
@@ -60,7 +60,9 @@ export default {
 	},
 	mounted() {
 		frappe.route.on('change', () => {
-			this.get_items();
+			if (frappe.get_route_str() === 'marketplace/home') {
+				this.get_items();
+			}
 		})
 	},
 	methods: {
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
index d0c0ebe603e..6d738ebad4b 100644
--- a/erpnext/public/js/hub/pages/Item.vue
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -205,9 +205,7 @@ export default {
 					hub_user: frappe.session.user
 				})
 				.then(() => {
-					const saved_items_link = `<b><a href="#marketplace/saved-items">${__(
-						'Saved'
-					)}</a></b>`;
+					const saved_items_link = `<b><a href="#marketplace/saved-items">${__('Saved')}</a></b>`;
 					frappe.show_alert(saved_items_link);
 					erpnext.hub.trigger('action:item_save');
 				})
@@ -223,9 +221,7 @@ export default {
 					hub_user: frappe.session.user
 				})
 				.then(() => {
-					const featured_items_link = `<b><a href="#marketplace/featured-items">${__(
-						'Added to Featured Items'
-					)}</a></b>`;
+					const featured_items_link = `<b><a href="#marketplace/featured-items">${__('Added to Featured Items')}</a></b>`;
 					frappe.show_alert(featured_items_link);
 					erpnext.hub.trigger('action:item_feature');
 				})
@@ -309,7 +305,7 @@ export default {
 		},
 
 		unpublish_item() {
-			frappe.confirm(__(`Unpublish ${this.item.item_name}?`), () => {
+			frappe.confirm(__(`Unpublish {0}?`, [this.item.item_name]), () => {
 				frappe
 					.call('erpnext.hub_node.api.unpublish_item', {
 						item_code: this.item.item_code,

From 0143f7c59de4dbd53e1c3e73cd830f0903c5e5cf Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 24 Dec 2019 17:45:57 +0530
Subject: [PATCH 099/193] patch: set published in hub track item

---
 erpnext/patches.txt                                  |  3 ++-
 .../v12_0/set_published_in_hub_tracked_item.py       | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 erpnext/patches/v12_0/set_published_in_hub_tracked_item.py

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index daedca7a28c..a033abc143d 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -647,4 +647,5 @@ erpnext.patches.v12_0.update_owner_fields_in_acc_dimension_custom_fields
 erpnext.patches.v12_0.set_default_for_add_taxes_from_item_tax_template
 erpnext.patches.v12_0.remove_denied_leaves_from_leave_ledger
 erpnext.patches.v12_0.update_price_or_product_discount
-erpnext.patches.v12_0.set_production_capacity_in_workstation
\ No newline at end of file
+erpnext.patches.v12_0.set_production_capacity_in_workstation
+erpnext.patches.v12_0.set_published_in_hub_tracked_item
\ No newline at end of file
diff --git a/erpnext/patches/v12_0/set_published_in_hub_tracked_item.py b/erpnext/patches/v12_0/set_published_in_hub_tracked_item.py
new file mode 100644
index 00000000000..7c4c0115847
--- /dev/null
+++ b/erpnext/patches/v12_0/set_published_in_hub_tracked_item.py
@@ -0,0 +1,12 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc("Hub Node", "doctype", "Hub Tracked Item")
+	if frappe.db.a_row_exists("Hub Tracked Item"):
+		return
+
+	frappe.db.sql('''
+		Update `tabHub Tracked Item`
+		SET published = 1
+	''')
\ No newline at end of file

From fee8340f9896a4884f077445924ea1a17e475843 Mon Sep 17 00:00:00 2001
From: Mitchy25 <42224026+Mitchy25@users.noreply.github.com>
Date: Wed, 25 Dec 2019 01:32:18 +1300
Subject: [PATCH 100/193] fix: Bank Reconciliation Allows to Over Reconcile
 (#19461)

* Update bank_reconciliation.py

* fix: improve error message while over reconciling

* fix: only check over-reconciliation when against payment entry

Co-authored-by: Saqib <thefalconx33@gmail.com>
---
 .../page/bank_reconciliation/bank_reconciliation.py         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
index bd4b4d7e0b1..69f9907a8d8 100644
--- a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
@@ -18,6 +18,10 @@ def reconcile(bank_transaction, payment_doctype, payment_name):
 	account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
 	gl_entry = frappe.get_doc("GL Entry", dict(account=account, voucher_type=payment_doctype, voucher_no=payment_name))
 
+	if payment_doctype == "Payment Entry" and payment_entry.unallocated_amount > transaction.unallocated_amount:
+		frappe.throw(_("The unallocated amount of Payment Entry {0} \
+			is greater than the Bank Transaction's unallocated amount").format(payment_name))
+		
 	if transaction.unallocated_amount == 0:
 		frappe.throw(_("This bank transaction is already fully reconciled"))
 
@@ -373,4 +377,4 @@ def sales_invoices_query(doctype, txt, searchfield, start, page_len, filters):
 			'start': start,
 			'page_len': page_len
 		}
-	)
\ No newline at end of file
+	)

From dd42dbc6a34cec136d8a1f500bcc3f3807150784 Mon Sep 17 00:00:00 2001
From: Khushal Trivedi <khushal.t@indictranstech.com>
Date: Tue, 24 Dec 2019 18:07:09 +0530
Subject: [PATCH 101/193] fix: date validation on student form, instructor
 duplicate fix on student grp, instructor with same employee id fix (#20072)

* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix: joining and relieving Date can be on same date as valid use case

* fix-education: date of birth validation

* fix:Sibling child table filtering for duplacacy on student form

* fix:Sibling child table filtering for duplacacy on student form

* fix:Sibling child table filtering for duplacacy on student form

* fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix

* fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix

* fix: Exclude current record while validating duplicate employee

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
---
 erpnext/education/doctype/instructor/instructor.py   |  9 +++++++++
 erpnext/education/doctype/student/student.py         |  3 +++
 .../education/doctype/student_group/student_group.js | 12 ++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/erpnext/education/doctype/instructor/instructor.py b/erpnext/education/doctype/instructor/instructor.py
index 0756b5f01a4..28df2fcdc11 100644
--- a/erpnext/education/doctype/instructor/instructor.py
+++ b/erpnext/education/doctype/instructor/instructor.py
@@ -22,3 +22,12 @@ class Instructor(Document):
 				self.name = self.employee
 			elif naming_method == 'Full Name':
 				self.name = self.instructor_name
+
+	def validate(self):
+		self.validate_duplicate_employee()
+
+	def validate_duplicate_employee(self):
+		if self.employee and frappe.db.get_value("Instructor", {'employee': self.employee, 'name': ['!=', self.name]}, 'name'):
+			frappe.throw(_("Employee ID is linked with another instructor"))
+
+
diff --git a/erpnext/education/doctype/student/student.py b/erpnext/education/doctype/student/student.py
index 8e4b4e16f9a..99c4c0e9089 100644
--- a/erpnext/education/doctype/student/student.py
+++ b/erpnext/education/doctype/student/student.py
@@ -25,6 +25,9 @@ class Student(Document):
 		if self.date_of_birth and getdate(self.date_of_birth) >= getdate(today()):
 			frappe.throw(_("Date of Birth cannot be greater than today."))
 
+		if self.joining_date and self.date_of_leaving and getdate(self.joining_date) > getdate(self.date_of_leaving):
+			frappe.throw(_("Joining Date can not be greater than Leaving Date"))
+
 	def update_student_name_in_linked_doctype(self):
 		linked_doctypes = get_linked_doctypes("Student")
 		for d in linked_doctypes:
diff --git a/erpnext/education/doctype/student_group/student_group.js b/erpnext/education/doctype/student_group/student_group.js
index c29c134843e..4165ce0f2e7 100644
--- a/erpnext/education/doctype/student_group/student_group.js
+++ b/erpnext/education/doctype/student_group/student_group.js
@@ -122,3 +122,15 @@ frappe.ui.form.on("Student Group", {
 		}
 	}
 });
+
+frappe.ui.form.on('Student Group Instructor', {
+	instructors_add: function(frm){
+		frm.fields_dict['instructors'].grid.get_field('instructor').get_query = function(doc){
+			let instructor_list = [];
+			$.each(doc.instructors, function(idx, val){
+				instructor_list.push(val.instructor);
+			});
+			return { filters: [['Instructor', 'name', 'not in', instructor_list]] };
+		};
+	}
+});
\ No newline at end of file

From df3b4e48fe32a96f0e7e710b87f0c42306c894ea Mon Sep 17 00:00:00 2001
From: DeeMysterio <dikshajadhav11.dj@gmail.com>
Date: Tue, 24 Dec 2019 18:10:18 +0530
Subject: [PATCH 102/193] fix(adress): get the address title at the top and
 mandatory in display (#20074)

---
 erpnext/public/js/templates/address_list.html | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/erpnext/public/js/templates/address_list.html b/erpnext/public/js/templates/address_list.html
index 2379ef6b487..0f967b67a0f 100644
--- a/erpnext/public/js/templates/address_list.html
+++ b/erpnext/public/js/templates/address_list.html
@@ -1,23 +1,22 @@
 <div class="clearfix"></div>
 {% for(var i=0, l=addr_list.length; i<l; i++) { %}
-    <div class="address-box">
-    <p class="h6">
-        {%= i+1 %}. {%= addr_list[i].address_type!="Other" ? __(addr_list[i].address_type) : addr_list[i].address_title %}
-        {% if(addr_list[i].is_primary_address) { %}
-            <span class="text-muted">({%= __("Primary") %})</span>{% } %}
-        {% if(addr_list[i].is_shipping_address) { %}
-            <span class="text-muted">({%= __("Shipping") %})</span>{% } %}
+<div class="address-box">
+	<p class="h6">
+		{%= i+1 %}. {%= addr_list[i].address_title %}{% if(addr_list[i].address_type!="Other") { %}
+		<span class="text-muted">({%= __(addr_list[i].address_type) %})</span>{% } %}
+		{% if(addr_list[i].is_primary_address) { %}
+		<span class="text-muted">({%= __("Primary") %})</span>{% } %}
+		{% if(addr_list[i].is_shipping_address) { %}
+		<span class="text-muted">({%= __("Shipping") %})</span>{% } %}
 
-        <a href="#Form/Address/{%= encodeURIComponent(addr_list[i].name) %}"
-            class="btn btn-default btn-xs pull-right"
-				style="margin-top:-3px; margin-right: -5px;">
-            {%= __("Edit") %}</a>
-    </p>
-        <p>{%= addr_list[i].display %}</p>
-    </div>
+		<a href="#Form/Address/{%= encodeURIComponent(addr_list[i].name) %}" class="btn btn-default btn-xs pull-right"
+			style="margin-top:-3px; margin-right: -5px;">
+			{%= __("Edit") %}</a>
+	</p>
+	<p>{%= addr_list[i].display %}</p>
+</div>
 {% } %}
 {% if(!addr_list.length) { %}
 <p class="text-muted small">{%= __("No address added yet.") %}</p>
 {% } %}
-<p><button class="btn btn-xs btn-default btn-address">{{ __("New Address") }}</button></p>
-
+<p><button class="btn btn-xs btn-default btn-address">{{ __("New Address") }}</button></p>
\ No newline at end of file

From 737267204430483db1bd138a69faa5398725f1c5 Mon Sep 17 00:00:00 2001
From: Rohan <Alchez@users.noreply.github.com>
Date: Tue, 24 Dec 2019 18:19:58 +0530
Subject: [PATCH 103/193] fix: pull serial numbers linked to batches + pull
 warehouse correctly (develop) (#19022)

* fix: pull serial numbers according to set warehouses

* fix: handle purchase returns
---
 erpnext/public/js/controllers/transaction.js  | 34 +++++++++++++++++--
 .../js/utils/serial_no_batch_selector.js      |  2 ++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 6ca095869f7..3b907daa1b5 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1808,14 +1808,44 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 	}
 });
 
-erpnext.show_serial_batch_selector = function(frm, d, callback, on_close, show_dialog) {
+erpnext.show_serial_batch_selector = function (frm, d, callback, on_close, show_dialog) {
+	let warehouse, receiving_stock, existing_stock;
+	if (frm.doc.is_return) {
+		if (["Purchase Receipt", "Purchase Invoice"].includes(frm.doc.doctype)) {
+			existing_stock = true;
+			warehouse = d.warehouse;
+		} else if (["Delivery Note", "Sales Invoice"].includes(frm.doc.doctype)) {
+			receiving_stock = true;
+		}
+	} else {
+		if (frm.doc.doctype == "Stock Entry") {
+			if (frm.doc.purpose == "Material Receipt") {
+				receiving_stock = true;
+			} else {
+				existing_stock = true;
+				warehouse = d.s_warehouse;
+			}
+		} else {
+			existing_stock = true;
+			warehouse = d.warehouse;
+		}
+	}
+
+	if (!warehouse) {
+		if (receiving_stock) {
+			warehouse = ["like", ""];
+		} else if (existing_stock) {
+			warehouse = ["!=", ""];
+		}
+	}
+
 	frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
 		new erpnext.SerialNoBatchSelector({
 			frm: frm,
 			item: d,
 			warehouse_details: {
 				type: "Warehouse",
-				name: d.warehouse
+				name: warehouse
 			},
 			callback: callback,
 			on_close: on_close
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 41a59d0af5d..61a693933f6 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -389,12 +389,14 @@ erpnext.SerialNoBatchSelector = Class.extend({
 
 		let serial_no_filters = {
 			item_code: me.item_code,
+			batch_no: this.doc.batch_no || null,
 			delivery_document_no: ""
 		}
 
 		if (me.warehouse_details.name) {
 			serial_no_filters['warehouse'] = me.warehouse_details.name;
 		}
+
 		return [
 			{fieldtype: 'Section Break', label: __('Serial Numbers')},
 			{

From 6e8a9286c28aa32997df2ac7756a9f070dd208a9 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Tue, 24 Dec 2019 18:53:32 +0530
Subject: [PATCH 104/193] fix: multiple stock entry issues for the work order
 (#18686)

* fix: multiple stock entry issues for the work order

* Update work_order.py

* Update work_order.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
---
 .../doctype/work_order/work_order.py          |  2 +-
 .../stock/doctype/stock_entry/stock_entry.py  | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index c4238accac7..ff4ebfe8be5 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -856,4 +856,4 @@ def create_pick_list(source_name, target_doc=None, for_qty=None):
 
 	doc.set_item_locations()
 
-	return doc
\ No newline at end of file
+	return doc
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 1b9660e6d2c..47f6cf64f53 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -808,24 +808,26 @@ class StockEntry(StockController):
 
 		if self.bom_no:
 
+			backflush_based_on = frappe.db.get_single_value("Manufacturing Settings",
+				"backflush_raw_materials_based_on")
+
 			if self.purpose in ["Material Issue", "Material Transfer", "Manufacture", "Repack",
 					"Send to Subcontractor", "Material Transfer for Manufacture", "Material Consumption for Manufacture"]:
 
 				if self.work_order and self.purpose == "Material Transfer for Manufacture":
-					item_dict = self.get_pending_raw_materials()
+					item_dict = self.get_pending_raw_materials(backflush_based_on)
 					if self.to_warehouse and self.pro_doc:
 						for item in itervalues(item_dict):
 							item["to_warehouse"] = self.pro_doc.wip_warehouse
 					self.add_to_stock_entry_detail(item_dict)
 
 				elif (self.work_order and (self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture")
-					and not self.pro_doc.skip_transfer and frappe.db.get_single_value("Manufacturing Settings",
-					"backflush_raw_materials_based_on")== "Material Transferred for Manufacture"):
+					and not self.pro_doc.skip_transfer and backflush_based_on == "Material Transferred for Manufacture"):
 					self.get_transfered_raw_materials()
 
-				elif self.work_order and (self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture") and \
-					frappe.db.get_single_value("Manufacturing Settings", "backflush_raw_materials_based_on")== "BOM" and \
-					frappe.db.get_single_value("Manufacturing Settings", "material_consumption")== 1:
+				elif (self.work_order and backflush_based_on== "BOM" and
+					(self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture")
+					and frappe.db.get_single_value("Manufacturing Settings", "material_consumption")== 1):
 					self.get_unconsumed_raw_materials()
 
 				else:
@@ -1034,10 +1036,6 @@ class StockEntry(StockController):
 				filters={'parent': self.work_order, 'item_code': item_code},
 				fields=["required_qty", "consumed_qty"]
 				)
-			if not req_items:
-				frappe.msgprint(_("Did not found transfered item {0} in Work Order {1}, the item not added in Stock Entry")
-					.format(item_code, self.work_order))
-				continue
 
 			req_qty = flt(req_items[0].required_qty)
 			req_qty_each = flt(req_qty / manufacturing_qty)
@@ -1085,18 +1083,20 @@ class StockEntry(StockController):
 					}
 				})
 
-	def get_pending_raw_materials(self):
+	def get_pending_raw_materials(self, backflush_based_on=None):
 		"""
 			issue (item quantity) that is pending to issue or desire to transfer,
 			whichever is less
 		"""
-		item_dict = self.get_pro_order_required_items()
+		item_dict = self.get_pro_order_required_items(backflush_based_on)
+
 		max_qty = flt(self.pro_doc.qty)
 		for item, item_details in iteritems(item_dict):
 			pending_to_issue = flt(item_details.required_qty) - flt(item_details.transferred_qty)
 			desire_to_transfer = flt(self.fg_completed_qty) * flt(item_details.required_qty) / max_qty
 
-			if desire_to_transfer <= pending_to_issue:
+			if (desire_to_transfer <= pending_to_issue or
+				(desire_to_transfer > 0 and backflush_based_on == "Material Transferred for Manufacture")):
 				item_dict[item]["qty"] = desire_to_transfer
 			elif pending_to_issue > 0:
 				item_dict[item]["qty"] = pending_to_issue
@@ -1114,7 +1114,7 @@ class StockEntry(StockController):
 
 		return item_dict
 
-	def get_pro_order_required_items(self):
+	def get_pro_order_required_items(self, backflush_based_on=None):
 		item_dict = frappe._dict()
 		pro_order = frappe.get_doc("Work Order", self.work_order)
 		if not frappe.db.get_value("Warehouse", pro_order.wip_warehouse, "is_group"):
@@ -1123,7 +1123,8 @@ class StockEntry(StockController):
 			wip_warehouse = None
 
 		for d in pro_order.get("required_items"):
-			if (flt(d.required_qty) > flt(d.transferred_qty) and
+			if ( ((flt(d.required_qty) > flt(d.transferred_qty)) or
+				(backflush_based_on == "Material Transferred for Manufacture")) and
 				(d.include_item_in_manufacturing or self.purpose != "Material Transfer for Manufacture")):
 				item_row = d.as_dict()
 				if d.source_warehouse and not frappe.db.get_value("Warehouse", d.source_warehouse, "is_group"):

From f32fc230f70f7d7bdbdb5a94cbe0c8bace1e16b6 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 25 Dec 2019 13:59:24 +0530
Subject: [PATCH 105/193] fix: rounding adjustment while both inclusive tax and
 discount amount present

---
 erpnext/controllers/taxes_and_totals.py           | 12 ++++++++++--
 erpnext/public/js/controllers/taxes_and_totals.js |  9 +++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 66232d7ff1b..049a837eaf6 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -312,11 +312,19 @@ class calculate_taxes_and_totals(object):
 			last_tax = self.doc.get("taxes")[-1]
 			non_inclusive_tax_amount = sum([flt(d.tax_amount_after_discount_amount)
 				for d in self.doc.get("taxes") if not d.included_in_print_rate])
+
 			diff = self.doc.total + non_inclusive_tax_amount \
 				- flt(last_tax.total, last_tax.precision("total"))
+
+			# If discount amount applied, deduct the discount amount
+			# because self.doc.total is always without discount, but last_tax.total is after discount
+			if self.discount_amount_applied and self.doc.discount_amount:
+				diff -= flt(self.doc.discount_amount)
+
+			diff = flt(diff, self.doc.precision("rounding_adjustment"))
+
 			if diff and abs(diff) <= (5.0 / 10**last_tax.precision("tax_amount")):
-				self.doc.rounding_adjustment = flt(flt(self.doc.rounding_adjustment) +
-					flt(diff), self.doc.precision("rounding_adjustment"))
+				self.doc.rounding_adjustment = diff
 
 	def calculate_totals(self):
 		self.doc.grand_total = flt(self.doc.get("taxes")[-1].total) + flt(self.doc.rounding_adjustment) \
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 2ece7110406..28fb6490254 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -388,9 +388,14 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
 				var diff = me.frm.doc.total + non_inclusive_tax_amount
 					- flt(last_tax.total, precision("grand_total"));
 
+				if(me.discount_amount_applied && me.frm.doc.discount_amount) {
+					diff -= flt(me.frm.doc.discount_amount);
+				}
+
+				diff = flt(diff, precision("rounding_adjustment"));
+
 				if ( diff && Math.abs(diff) <= (5.0 / Math.pow(10, precision("tax_amount", last_tax))) ) {
-					this.frm.doc.rounding_adjustment = flt(flt(this.frm.doc.rounding_adjustment) + diff,
-						precision("rounding_adjustment"));
+					me.frm.doc.rounding_adjustment = diff;
 				}
 			}
 		}

From 8c4cf12c933d09846fa470aa316684bbf7fd235a Mon Sep 17 00:00:00 2001
From: "Parth J. Kharwar" <parthjk98@gmail.com>
Date: Wed, 25 Dec 2019 15:14:52 +0530
Subject: [PATCH 106/193] Setting preferred driver email in delivery trip
 (#19832)

* fix: add driver's preferred contact email in delivery trip

* fix: modify driver's preferred email patch and blank field checks

* fix: patch file fix

* fix: patch changes to improve speed

* fix: removal of conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
---
 erpnext/hr/doctype/employee/employee.py         |  6 ++++++
 erpnext/patches.txt                             |  1 +
 .../v12_0/set_employee_preferred_emails.py      | 16 ++++++++++++++++
 .../doctype/delivery_trip/delivery_trip.js      | 17 ++++++++++++++++-
 .../doctype/delivery_trip/delivery_trip.json    | 11 ++++++++++-
 .../doctype/delivery_trip/delivery_trip.py      |  6 ++++++
 6 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 erpnext/patches/v12_0/set_employee_preferred_emails.py

diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 242531bd177..4d49503d2dc 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -164,6 +164,12 @@ class Employee(NestedSet):
 		if self.personal_email:
 			validate_email_address(self.personal_email, True)
 
+	def set_preferred_email(self):
+		preferred_email_field = frappe.scrub(self.prefered_contact_email)
+		if preferred_email_field:
+			preferred_email = self.get(preferred_email_field)
+			self.prefered_email = preferred_email
+
 	def validate_status(self):
 		if self.status == 'Left':
 			reports_to = frappe.db.get_all('Employee',
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index ab8e942ba79..89be499f6f3 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -649,6 +649,7 @@ erpnext.patches.v12_0.add_export_type_field_in_party_master
 erpnext.patches.v12_0.remove_denied_leaves_from_leave_ledger
 erpnext.patches.v12_0.update_price_or_product_discount
 erpnext.patches.v12_0.set_production_capacity_in_workstation
+erpnext.patches.v12_0.set_employee_preferred_emails
 erpnext.patches.v12_0.set_against_blanket_order_in_sales_and_purchase_order
 erpnext.patches.v12_0.set_cost_center_in_child_table_of_expense_claim
 erpnext.patches.v12_0.set_lead_title_field
diff --git a/erpnext/patches/v12_0/set_employee_preferred_emails.py b/erpnext/patches/v12_0/set_employee_preferred_emails.py
new file mode 100644
index 00000000000..27635612f98
--- /dev/null
+++ b/erpnext/patches/v12_0/set_employee_preferred_emails.py
@@ -0,0 +1,16 @@
+import frappe
+
+
+def execute():
+	employees = frappe.get_all("Employee",
+		filters={"prefered_email": ""},
+		fields=["name", "prefered_contact_email", "company_email", "personal_email", "user_id"])
+
+	for employee in employees:
+		preferred_email_field = frappe.scrub(employee.prefered_contact_email)
+
+		if not preferred_email_field:
+			continue
+
+		preferred_email = employee.get(preferred_email_field)
+		frappe.db.set_value("Employee", employee.name, "prefered_email", preferred_email, update_modified=False)
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.js b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
index 6a7eecfba63..a025f06711b 100755
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.js
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.js
@@ -79,6 +79,21 @@ frappe.ui.form.on('Delivery Trip', {
 		}, () => {
 			frm.reload_doc();
 		});
+	},
+
+	driver: function (frm) {
+		if (frm.doc.driver) {
+			frappe.call({
+				method: "erpnext.stock.doctype.delivery_trip.delivery_trip.get_driver_email",
+				args: {
+					driver: frm.doc.driver
+				},
+				callback: (data) => {
+					frm.set_value("driver_email", data.message.email);
+				}
+			});
+		};
+	},
 
 	},
 
@@ -196,4 +211,4 @@ frappe.ui.form.on('Delivery Stop', {
 			frappe.model.set_value(cdt, cdn, "customer_contact", "");
 		}
 	}
-});
\ No newline at end of file
+});
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.json b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
index 0a526243bc4..1bacf465fa0 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.json
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "naming_series:",
  "creation": "2017-10-16 16:45:48.293335",
  "doctype": "DocType",
@@ -13,6 +14,7 @@
   "section_break_3",
   "driver",
   "driver_name",
+  "driver_email",
   "driver_address",
   "total_distance",
   "uom",
@@ -167,10 +169,17 @@
    "fieldtype": "Link",
    "label": "Driver Address",
    "options": "Address"
+  },
+  {
+   "fieldname": "driver_email",
+   "fieldtype": "Data",
+   "label": "Driver Email",
+   "read_only": 1
   }
  ],
  "is_submittable": 1,
- "modified": "2019-09-27 15:43:01.975139",
+ "links": [],
+ "modified": "2019-12-06 17:06:59.681952",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Trip",
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index 77d322ed28d..e2c5b91f514 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -387,3 +387,9 @@ def get_attachments(delivery_stop):
 		file_name="Delivery Note", print_format=dispatch_attachment)
 
 	return [attachments]
+
+@frappe.whitelist()
+def get_driver_email(driver):
+	employee = frappe.db.get_value("Driver", driver, "employee")
+	email = frappe.db.get_value("Employee", employee, "prefered_email")
+	return {"email": email}

From e2ea11c43721f752c6d46f8e0bc48f2318f7c72b Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 25 Dec 2019 15:15:35 +0530
Subject: [PATCH 107/193] fix: remove quote (#20076)

---
 erpnext/stock/doctype/batch/batch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 114925469b5..0524eee2d53 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -270,5 +270,5 @@ def get_batches(item_code, warehouse, qty=1, throw=False):
 		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
-		order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC'
+		order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC
 	""", (item_code, warehouse), as_dict=True)
\ No newline at end of file

From 682273a00b86f670be8511cd8cf5de5a9bd24dc1 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Mon, 9 Dec 2019 17:51:32 +0530
Subject: [PATCH 108/193] feat: provision to select the custom fields in the
 online POS

---
 .../accounts/doctype/pos_field/__init__.py    |   0
 .../accounts/doctype/pos_field/pos_field.json |  77 ++++++++
 .../accounts/doctype/pos_field/pos_field.py   |  10 +
 .../doctype/pos_settings/pos_settings.js      |  41 +++-
 .../doctype/pos_settings/pos_settings.json    | 175 ++++++------------
 .../gst_pos_invoice/gst_pos_invoice.json      |  39 ++--
 .../print_format/pos_invoice/pos_invoice.json |  37 ++--
 .../v8_7/set_offline_in_pos_settings.py       |   1 +
 .../page/point_of_sale/point_of_sale.js       |  92 ++++++++-
 .../page/point_of_sale/point_of_sale.py       |   5 +
 10 files changed, 314 insertions(+), 163 deletions(-)
 create mode 100644 erpnext/accounts/doctype/pos_field/__init__.py
 create mode 100644 erpnext/accounts/doctype/pos_field/pos_field.json
 create mode 100644 erpnext/accounts/doctype/pos_field/pos_field.py

diff --git a/erpnext/accounts/doctype/pos_field/__init__.py b/erpnext/accounts/doctype/pos_field/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/doctype/pos_field/pos_field.json b/erpnext/accounts/doctype/pos_field/pos_field.json
new file mode 100644
index 00000000000..13edabd985d
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_field/pos_field.json
@@ -0,0 +1,77 @@
+{
+ "creation": "2019-08-22 14:35:39.043242",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "fieldname",
+  "label",
+  "fieldtype",
+  "column_break_7",
+  "options",
+  "default_value",
+  "reqd",
+  "read_only"
+ ],
+ "fields": [
+  {
+   "fieldname": "fieldname",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Fieldname"
+  },
+  {
+   "fieldname": "fieldtype",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Fieldtype",
+   "read_only": 1
+  },
+  {
+   "fieldname": "label",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Label",
+   "read_only": 1
+  },
+  {
+   "fieldname": "options",
+   "fieldtype": "Text",
+   "in_list_view": 1,
+   "label": "Options",
+   "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "reqd",
+   "fieldtype": "Check",
+   "label": "Mandatory"
+  },
+  {
+   "default": "0",
+   "fieldname": "read_only",
+   "fieldtype": "Check",
+   "label": "Read Only"
+  },
+  {
+   "fieldname": "column_break_7",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "default_value",
+   "fieldtype": "Data",
+   "label": "Default Value"
+  }
+ ],
+ "istable": 1,
+ "modified": "2019-08-23 13:59:34.025523",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "POS Field",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_field/pos_field.py b/erpnext/accounts/doctype/pos_field/pos_field.py
new file mode 100644
index 00000000000..b4720b309bd
--- /dev/null
+++ b/erpnext/accounts/doctype/pos_field/pos_field.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, 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 POSField(Document):
+	pass
diff --git a/erpnext/accounts/doctype/pos_settings/pos_settings.js b/erpnext/accounts/doctype/pos_settings/pos_settings.js
index 1a146185139..f5b681bd41d 100644
--- a/erpnext/accounts/doctype/pos_settings/pos_settings.js
+++ b/erpnext/accounts/doctype/pos_settings/pos_settings.js
@@ -2,7 +2,46 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('POS Settings', {
-	refresh: function() {
+	onload: function(frm) {
+		frm.trigger("get_invoice_fields");
+	},
 
+	use_pos_in_offline_mode: function(frm) {
+		frm.trigger("get_invoice_fields");
+	},
+
+	get_invoice_fields: function(frm) {
+		if (!frm.doc.use_pos_in_offline_mode) {
+			frappe.model.with_doctype("Sales Invoice", () => {
+				var fields = $.map(frappe.get_doc("DocType", "Sales Invoice").fields, function(d) {
+					if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1 ||
+						d.fieldtype === 'Table') {
+						return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname };
+					} else {
+						return null;
+					}
+				});
+
+				frappe.meta.get_docfield("POS Field", "fieldname", frm.doc.name).options = [""].concat(fields);
+			});
+		} else {
+			frappe.meta.get_docfield("POS Field", "fieldname", frm.doc.name).options = [""];
+		}
+	}
+});
+
+frappe.ui.form.on("POS Field", {
+	fieldname: function(frm, doctype, name) {
+		var doc = frappe.get_doc(doctype, name);
+		var df = $.map(frappe.get_doc("DocType", "Sales Invoice").fields, function(d) {
+			return doc.fieldname == d.fieldname ? d : null;
+		})[0];
+
+		doc.label = df.label;
+		doc.reqd = df.reqd;
+		doc.options = df.options;
+		doc.fieldtype = df.fieldtype;
+		doc.default_value = df.default;
+		frm.refresh_field("fields");
 	}
 });
diff --git a/erpnext/accounts/doctype/pos_settings/pos_settings.json b/erpnext/accounts/doctype/pos_settings/pos_settings.json
index 8f5b631c89a..1d55880415f 100644
--- a/erpnext/accounts/doctype/pos_settings/pos_settings.json
+++ b/erpnext/accounts/doctype/pos_settings/pos_settings.json
@@ -1,133 +1,68 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-08-28 16:46:41.732676", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-08-28 16:46:41.732676",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "use_pos_in_offline_mode",
+  "section_break_2",
+  "fields"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "use_pos_in_offline_mode", 
-   "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": "Use POS in Offline Mode", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "default": "0",
+   "fieldname": "use_pos_in_offline_mode",
+   "fieldtype": "Check",
+   "label": "Use POS in Offline Mode"
+  },
+  {
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break"
+  },
+  {
+   "depends_on": "eval:!doc.use_pos_in_offline_mode",
+   "fieldname": "fields",
+   "fieldtype": "Table",
+   "label": "POS Field",
+   "options": "POS Field"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-09-11 13:57:28.787023", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "POS Settings", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2019-12-26 11:50:47.122997",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "POS Settings",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Accounts User",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Sales User",
+   "share": 1,
    "write": 1
   }
- ], 
- "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
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json b/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json
index 8a313688b98..1c5a195132d 100644
--- a/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json
+++ b/erpnext/accounts/print_format/gst_pos_invoice/gst_pos_invoice.json
@@ -1,22 +1,23 @@
 {
- "align_labels_right": 0, 
- "creation": "2017-08-08 12:33:04.773099", 
- "custom_format": 1, 
- "disabled": 0, 
- "doc_type": "Sales Invoice", 
- "docstatus": 0, 
- "doctype": "Print Format", 
- "font": "Default", 
- "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ doc.company }}<br>\n\t{% if doc.company_address_display %}\n\t\t{% set company_address = doc.company_address_display.replace(\"\\n\", \" \").replace(\"<br>\", \" \") %}\n\t\t{% if \"GSTIN\" not in company_address %}\n\t\t\t{{ company_address }}\n\t\t\t<b>{{ _(\"GSTIN\") }}:</b>{{ doc.company_gstin }}\n\t\t{% else %}\n\t\t\t{{ company_address.replace(\"GSTIN\", \"<br>GSTIN\") }}\n\t\t{% endif %}\n\t{% endif %}\n\t<br>\n\t{% if doc.docstatus == 0 %}\n\t\t<b>{{ doc.status + \" \"+ (doc.select_print_heading or _(\"Invoice\")) }}</b><br>\n\t{% else %}\n\t\t<b>{{ doc.select_print_heading or _(\"Invoice\") }}</b><br>\n\t{% endif %}\n</p>\n<p>\n\t<b>{{ _(\"Receipt No\") }}:</b> {{ doc.name }}<br>\n\t<b>{{ _(\"Date\") }}:</b> {{ doc.get_formatted(\"posting_date\") }}<br>\n\t{% if doc.grand_total > 50000 %}\n\t\t{% set customer_address = doc.address_display.replace(\"\\n\", \" \").replace(\"<br>\", \" \") %}\n\t\t<b>{{ _(\"Customer\") }}:</b><br>\n\t\t{{ doc.customer_name }}<br>\n\t\t{{ customer_address }}\n\t{% endif %}\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"40%\">{{ _(\"Item\") }}</b></th>\n\t\t\t<th width=\"30%\" class=\"text-right\">{{ _(\"Qty\") }}</th>\n\t\t\t<th width=\"30%\" class=\"text-right\">{{ _(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{%- for item in doc.items -%}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t<br>{{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.gst_hsn_code -%}\n\t\t\t\t\t<br><b>{{ _(\"HSN/SAC\") }}:</b> {{ item.gst_hsn_code }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t<br><b>{{ _(\"Serial No\") }}:</b> {{ item.serial_no }}\n\t\t\t\t{%- endif -%}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ item.rate }}</td>\n\t\t\t<td class=\"text-right\">{{ item.get_formatted(\"amount\") }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% else %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% endif %}\n\t\t</tr>\n\t\t{%- for row in doc.taxes -%}\n\t\t  {%- if (not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) and row.tax_amount != 0 -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ row.description }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t</td>\n\t\t\t<tr>\n\t\t  {%- endif -%}\n\t\t{%- endfor -%}\n\t\t{%- if doc.discount_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.rounded_total -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Rounded Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Paid Amount\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t{%- if doc.change_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Change Amount\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t{%- endif -%}\n\t</tbody>\n</table>\n<p>{{ doc.terms or \"\" }}</p>\n<p class=\"text-center\">{{ _(\"Thank you, please visit again.\") }}</p>", 
- "idx": 0, 
- "line_breaks": 0, 
- "modified": "2019-01-24 17:09:27.190929", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "GST POS Invoice", 
- "owner": "Administrator", 
- "print_format_builder": 0, 
- "print_format_type": "Server", 
- "show_section_headings": 0, 
+ "align_labels_right": 0,
+ "creation": "2017-08-08 12:33:04.773099",
+ "custom_format": 1,
+ "disabled": 0,
+ "doc_type": "Sales Invoice",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n{% if letter_head %}\n    {{ letter_head }}\n{% endif %}\n<p class=\"text-center\">\n\t{{ doc.company }}<br>\n\t{% if doc.company_address_display %}\n\t\t{% set company_address = doc.company_address_display.replace(\"\\n\", \" \").replace(\"<br>\", \" \") %}\n\t\t{% if \"GSTIN\" not in company_address %}\n\t\t\t{{ company_address }}\n\t\t\t<b>{{ _(\"GSTIN\") }}:</b>{{ doc.company_gstin }}\n\t\t{% else %}\n\t\t\t{{ company_address.replace(\"GSTIN\", \"<br>GSTIN\") }}\n\t\t{% endif %}\n\t{% endif %}\n\t<br>\n\t{% if doc.docstatus == 0 %}\n\t\t<b>{{ doc.status + \" \"+ (doc.select_print_heading or _(\"Invoice\")) }}</b><br>\n\t{% else %}\n\t\t<b>{{ doc.select_print_heading or _(\"Invoice\") }}</b><br>\n\t{% endif %}\n</p>\n<p>\n\t<b>{{ _(\"Receipt No\") }}:</b> {{ doc.name }}<br>\n\t<b>{{ _(\"Date\") }}:</b> {{ doc.get_formatted(\"posting_date\") }}<br>\n\t{% if doc.grand_total > 50000 %}\n\t\t{% set customer_address = doc.address_display.replace(\"\\n\", \" \").replace(\"<br>\", \" \") %}\n\t\t<b>{{ _(\"Customer\") }}:</b><br>\n\t\t{{ doc.customer_name }}<br>\n\t\t{{ customer_address }}\n\t{% endif %}\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"40%\">{{ _(\"Item\") }}</b></th>\n\t\t\t<th width=\"30%\" class=\"text-right\">{{ _(\"Qty\") }}</th>\n\t\t\t<th width=\"30%\" class=\"text-right\">{{ _(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{%- for item in doc.items -%}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t<br>{{ item.item_name }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.gst_hsn_code -%}\n\t\t\t\t\t<br><b>{{ _(\"HSN/SAC\") }}:</b> {{ item.gst_hsn_code }}\n\t\t\t\t{%- endif -%}\n\t\t\t\t{%- if item.serial_no -%}\n\t\t\t\t\t<br><b>{{ _(\"Serial No\") }}:</b> {{ item.serial_no }}\n\t\t\t\t{%- endif -%}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ item.rate }}</td>\n\t\t\t<td class=\"text-right\">{{ item.get_formatted(\"amount\") }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% else %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% endif %}\n\t\t</tr>\n\t\t{%- for row in doc.taxes -%}\n\t\t  {%- if (not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print) and row.tax_amount != 0 -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ row.description }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t</td>\n\t\t\t<tr>\n\t\t  {%- endif -%}\n\t\t{%- endfor -%}\n\t\t{%- if doc.discount_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.rounded_total -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Rounded Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Paid Amount\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t{%- if doc.change_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Change Amount\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t{%- endif -%}\n\t</tbody>\n</table>\n<p>{{ doc.terms or \"\" }}</p>\n<p class=\"text-center\">{{ _(\"Thank you, please visit again.\") }}</p>",
+ "idx": 0,
+ "line_breaks": 0,
+ "modified": "2019-12-09 17:39:23.356573",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "GST POS Invoice",
+ "owner": "Administrator",
+ "print_format_builder": 0,
+ "print_format_type": "Jinja",
+ "raw_printing": 0,
+ "show_section_headings": 0,
  "standard": "Yes"
 }
\ No newline at end of file
diff --git a/erpnext/accounts/print_format/pos_invoice/pos_invoice.json b/erpnext/accounts/print_format/pos_invoice/pos_invoice.json
index c3450d6a73c..be699228c52 100644
--- a/erpnext/accounts/print_format/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/print_format/pos_invoice/pos_invoice.json
@@ -1,21 +1,22 @@
 {
- "align_labels_right": 0, 
- "creation": "2011-12-21 11:08:55", 
- "custom_format": 1, 
- "disabled": 0, 
- "doc_type": "Sales Invoice", 
- "docstatus": 0, 
- "doctype": "Print Format", 
- "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n<p class=\"text-center\">\n\t{{ doc.company }}<br>\n\t{% if doc.docstatus == 0 %}\n\t\t{{ doc.status + \" \" + (doc.select_print_heading or _(\"Invoice\")) }}<br>\n\t{% else %}\n\t\t{{ doc.select_print_heading or _(\"Invoice\") }}<br>\n\t{% endif %}\n</p>\n<p>\n\t<b>{{ _(\"Receipt No\") }}:</b> {{ doc.name }}<br>\n\t<b>{{ _(\"Date\") }}:</b> {{ doc.get_formatted(\"posting_date\") }}<br>\n\t<b>{{ _(\"Customer\") }}:</b> {{ doc.customer_name }}\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"50%\">{{ _(\"Item\") }}</b></th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ _(\"Qty\") }}</th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ _(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{%- for item in doc.items -%}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t<br>{{ item.item_name }}{%- endif -%}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ item.get_formatted(\"rate\") }}</td>\n\t\t\t<td class=\"text-right\">{{ item.get_formatted(\"amount\") }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% else %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% endif %}\n\t\t</tr>\n\t\t{%- for row in doc.taxes -%}\n\t\t  {%- if not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ row.description }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t</td>\n\t\t\t<tr>\n\t\t  {%- endif -%}\n\t\t{%- endfor -%}\n\n\t\t{%- if doc.discount_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.rounded_total -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Rounded Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Paid Amount\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.change_amount -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t\t<b>{{ _(\"Change Amount\") }}</b>\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t\t</td>\n\t\t\t</tr>\n\t\t{%- endif -%}\n\t\t{%- if doc.pos_total_qty -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Total Qty\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"pos_total_qty\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t</tbody>\n</table>\n<hr>\n<p>{{ doc.terms or \"\" }}</p>\n<p class=\"text-center\">{{ _(\"Thank you, please visit again.\") }}</p>", 
- "idx": 1, 
- "line_breaks": 0, 
- "modified": "2018-03-20 14:24:12.394354", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "POS Invoice", 
- "owner": "Administrator", 
- "print_format_builder": 0, 
- "print_format_type": "Server", 
- "show_section_headings": 0, 
+ "align_labels_right": 0,
+ "creation": "2011-12-21 11:08:55",
+ "custom_format": 1,
+ "disabled": 0,
+ "doc_type": "Sales Invoice",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "html": "<style>\n\t.print-format table, .print-format tr, \n\t.print-format td, .print-format div, .print-format p {\n\t\tfont-family: Monospace;\n\t\tline-height: 200%;\n\t\tvertical-align: middle;\n\t}\n\t@media screen {\n\t\t.print-format {\n\t\t\twidth: 4in;\n\t\t\tpadding: 0.25in;\n\t\t\tmin-height: 8in;\n\t\t}\n\t}\n</style>\n\n{% if letter_head %}\n    {{ letter_head }}\n{% endif %}\n\n<p class=\"text-center\">\n\t{{ doc.company }}<br>\n\t{{ doc.select_print_heading or _(\"Invoice\") }}<br>\n</p>\n<p>\n\t<b>{{ _(\"Receipt No\") }}:</b> {{ doc.name }}<br>\n\t<b>{{ _(\"Date\") }}:</b> {{ doc.get_formatted(\"posting_date\") }}<br>\n\t<b>{{ _(\"Customer\") }}:</b> {{ doc.customer_name }}\n</p>\n\n<hr>\n<table class=\"table table-condensed cart no-border\">\n\t<thead>\n\t\t<tr>\n\t\t\t<th width=\"50%\">{{ _(\"Item\") }}</b></th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ _(\"Qty\") }}</th>\n\t\t\t<th width=\"25%\" class=\"text-right\">{{ _(\"Amount\") }}</th>\n\t\t</tr>\n\t</thead>\n\t<tbody>\n\t\t{%- for item in doc.items -%}\n\t\t<tr>\n\t\t\t<td>\n\t\t\t\t{{ item.item_code }}\n\t\t\t\t{%- if item.item_name != item.item_code -%}\n\t\t\t\t\t<br>{{ item.item_name }}{%- endif -%}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">{{ item.qty }}<br>@ {{ item.get_formatted(\"rate\") }}</td>\n\t\t\t<td class=\"text-right\">{{ item.get_formatted(\"amount\") }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>\n<table class=\"table table-condensed no-border\">\n\t<tbody>\n\t\t<tr>\n\t\t\t{% if doc.flags.show_inclusive_tax_in_print %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total Excl. Tax\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"net_total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% else %}\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ _(\"Total\") }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"total\", doc) }}\n\t\t\t\t</td>\n\t\t\t{% endif %}\n\t\t</tr>\n\t\t{%- for row in doc.taxes -%}\n\t\t  {%- if not row.included_in_print_rate or doc.flags.show_inclusive_tax_in_print -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 70%\">\n\t\t\t\t\t{{ row.description }}\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ row.get_formatted(\"tax_amount\", doc) }}\n\t\t\t\t</td>\n\t\t\t<tr>\n\t\t  {%- endif -%}\n\t\t{%- endfor -%}\n\n\t\t{%- if doc.discount_amount -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t{{ _(\"Discount\") }}\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"discount_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Grand Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"grand_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.rounded_total -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Rounded Total\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"rounded_total\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- endif -%}\n\t\t<tr>\n\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t<b>{{ _(\"Paid Amount\") }}</b>\n\t\t\t</td>\n\t\t\t<td class=\"text-right\">\n\t\t\t\t{{ doc.get_formatted(\"paid_amount\") }}\n\t\t\t</td>\n\t\t</tr>\n\t\t{%- if doc.change_amount -%}\n\t\t\t<tr>\n\t\t\t\t<td class=\"text-right\" style=\"width: 75%\">\n\t\t\t\t\t<b>{{ _(\"Change Amount\") }}</b>\n\t\t\t\t</td>\n\t\t\t\t<td class=\"text-right\">\n\t\t\t\t\t{{ doc.get_formatted(\"change_amount\") }}\n\t\t\t\t</td>\n\t\t\t</tr>\n\t\t{%- endif -%}\n\t</tbody>\n</table>\n<hr>\n<p>{{ doc.terms or \"\" }}</p>\n<p class=\"text-center\">{{ _(\"Thank you, please visit again.\") }}</p>",
+ "idx": 1,
+ "line_breaks": 0,
+ "modified": "2019-12-09 17:40:53.183574",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "POS Invoice",
+ "owner": "Administrator",
+ "print_format_builder": 0,
+ "print_format_type": "Jinja",
+ "raw_printing": 0,
+ "show_section_headings": 0,
  "standard": "Yes"
 }
\ No newline at end of file
diff --git a/erpnext/patches/v8_7/set_offline_in_pos_settings.py b/erpnext/patches/v8_7/set_offline_in_pos_settings.py
index b24fe37a285..7d2882e0641 100644
--- a/erpnext/patches/v8_7/set_offline_in_pos_settings.py
+++ b/erpnext/patches/v8_7/set_offline_in_pos_settings.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+	frappe.reload_doc('accounts', 'doctype', 'pos_field')
 	frappe.reload_doc('accounts', 'doctype', 'pos_settings')
 
 	doc = frappe.get_doc('POS Settings')
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index b213a29ae7e..afa4371a311 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -1,5 +1,6 @@
 /* global Clusterize */
 frappe.provide('erpnext.pos');
+frappe.provide('erpnext.queries');
 
 frappe.pages['point-of-sale'].on_page_load = function(wrapper) {
 	frappe.ui.make_app_page({
@@ -556,6 +557,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
 				if (this.cart) {
 					this.cart.frm = this.frm;
 					this.cart.reset();
+					this.cart.reset_pos_field_value();
 				} else {
 					this.make_items();
 					this.make_cart();
@@ -641,11 +643,6 @@ erpnext.pos.PointOfSale = class PointOfSale {
 		var me = this;
 		this.page.clear_menu();
 
-		// for mobile
-		// this.page.add_menu_item(__("Pay"), function () {
-		//
-		// }).addClass('visible-xs');
-
 		this.page.add_menu_item(__("Form View"), function () {
 			frappe.model.sync(me.frm.doc);
 			frappe.set_route("Form", me.frm.doc.doctype, me.frm.doc.name);
@@ -713,6 +710,7 @@ class POSCart {
 	make() {
 		this.make_dom();
 		this.make_customer_field();
+		this.make_pos_fields();
 		this.make_loyalty_points();
 		this.make_numpad();
 	}
@@ -722,6 +720,13 @@ class POSCart {
 			<div class="pos-cart">
 				<div class="customer-field">
 				</div>
+				<div class="pos-field-section" style="margin-bottom:12px; display:none">
+					<a class="h6 uppercase more-fields-section" disabled> ${__("More Information")} </a>
+					<i class="octicon octicon-chevron-down pos-fields-octicon collapse-indicator"
+						style="color:#cacaca; cursor: pointer"></i>
+					<div class="pos-fields" style ="margin-top:12px">
+					</div>
+				</div>
 				<div class="cart-wrapper">
 					<div class="list-item-table">
 						<div class="list-item list-item--head">
@@ -810,6 +815,22 @@ class POSCart {
 		}
 	}
 
+	reset_pos_field_value() {
+		let value = '';
+		if (this.custom_pos_fields) {
+			this.custom_pos_fields.forEach(r => {
+				value = this.frm.doc[r.fieldname] || r.default_value || '';
+
+				if (this.fields) {
+					this.fields[r.fieldname].set_value(value);
+				}
+			})
+		}
+
+		this.wrapper.find('.pos-fields').toggle(false);
+		this.wrapper.find('.pos-fields-octicon').toggle(true);
+	}
+
 	get_grand_total() {
 		let total = this.get_total_template('Grand Total', 'grand-total-value');
 
@@ -948,6 +969,67 @@ class POSCart {
 		this.customer_field.set_value(this.frm.doc.customer);
 	}
 
+	make_pos_fields() {
+		const me = this;
+
+		this.fields = {};
+		this.wrapper.find('.pos-fields-octicon, .more-fields-section').click(() => {
+			this.wrapper.find('.pos-fields').toggle();
+			this.wrapper.find('.pos-fields-octicon').toggleClass('octicon-chevron-down').toggleClass('octicon-chevron-up');
+		});
+		this.wrapper.find('.pos-fields').toggle(false);
+
+		return new Promise(res => {
+			frappe.call({
+				method: "erpnext.selling.page.point_of_sale.point_of_sale.get_pos_fields",
+				freeze: true,
+			}).then(r => {
+				if(r.message.length) {
+					this.wrapper.find('.pos-field-section').css('display','block');
+					this.custom_pos_fields = r.message;
+					if (r.message.length < 3) {
+						this.wrapper.find('.pos-fields').toggle(true);
+						this.wrapper.find('.pos-fields-octicon').toggleClass('octicon-chevron-down').toggleClass('octicon-chevron-up');
+					}
+
+					r.message.forEach(field => {
+						this.fields[field.fieldname] = frappe.ui.form.make_control({
+							df: {
+								fieldtype: field.fieldtype,
+								label: field.label,
+								fieldname: field.fieldname,
+								options: field.options,
+								reqd: field.reqd || 0,
+								read_only: field.read_only || 0,
+								default: field.default_value,
+								onchange: function() {
+									if (this.value) {
+										me.frm.set_value(this.df.fieldname, this.value);
+									}
+								},
+								get_query: () => {
+									return this.get_query_for_pos_fields(field.fieldname)
+								},
+							},
+							parent: this.wrapper.find('.pos-fields'),
+							render_input: true
+						});
+
+						if (this.frm.doc[field.fieldname]) {
+							this.fields[field.fieldname].set_value(this.frm.doc[field.fieldname]);
+						}
+					});
+				}
+			});
+		});
+	}
+
+	get_query_for_pos_fields(field) {
+		if (this.frm.fields_dict && this.frm.fields_dict[field]
+			&& this.frm.fields_dict[field].get_query) {
+			return this.frm.fields_dict[field].get_query(this.frm.doc);
+		}
+	}
 
 	make_loyalty_points() {
 		this.available_loyalty_points = frappe.ui.form.make_control({
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
index a9d2be5fffc..3425f8f2a56 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -160,3 +160,8 @@ def item_group_query(doctype, txt, searchfield, start, page_len, filters):
 			where {condition} and (name like %(txt)s) limit {start}, {page_len}"""
 		.format(condition = cond, start=start, page_len= page_len),
 			{'txt': '%%%s%%' % txt})
+
+@frappe.whitelist()
+def get_pos_fields():
+	return frappe.get_all("POS Field", fields=["label", "fieldname",
+		"fieldtype", "default_value", "reqd", "read_only", "options"])
\ No newline at end of file

From 7021402a45c5e7dcc20ba7421150ce3172d1fdc1 Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Wed, 16 Oct 2019 23:38:51 +0530
Subject: [PATCH 109/193] [feat] #19334

---
 .../v12_0/set_permission_einvoicing.py        |  12 +
 .../import_supplier_invoice/__init__.py       |   0
 .../import_supplier_invoice.js                |  21 +
 .../import_supplier_invoice.json              |  81 ++++
 .../import_supplier_invoice.py                | 383 ++++++++++++++++++
 .../test_import_supplier_invoice.py           |  10 +
 erpnext/regional/italy/setup.py               |  25 ++
 erpnext/regional/italy/utils.py               |   2 +
 .../purchase_einvoice/__init__.py             |   0
 .../purchase_einvoice/purchase_einvoice.json  |  23 ++
 10 files changed, 557 insertions(+)
 create mode 100644 erpnext/patches/v12_0/set_permission_einvoicing.py
 create mode 100644 erpnext/regional/doctype/import_supplier_invoice/__init__.py
 create mode 100644 erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
 create mode 100644 erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
 create mode 100644 erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
 create mode 100644 erpnext/regional/doctype/import_supplier_invoice/test_import_supplier_invoice.py
 create mode 100644 erpnext/regional/print_format/purchase_einvoice/__init__.py
 create mode 100644 erpnext/regional/print_format/purchase_einvoice/purchase_einvoice.json

diff --git a/erpnext/patches/v12_0/set_permission_einvoicing.py b/erpnext/patches/v12_0/set_permission_einvoicing.py
new file mode 100644
index 00000000000..c01f34a70d2
--- /dev/null
+++ b/erpnext/patches/v12_0/set_permission_einvoicing.py
@@ -0,0 +1,12 @@
+import frappe
+from frappe.permissions import add_permission, update_permission_property
+
+def execute():
+	company = frappe.get_all('Company', filters = {'country': 'Italy'})
+
+	if not company:
+		return
+
+	add_permission('Import Supplier Invoice', 'Accounts Manager', 0)
+	update_permission_property('Import Supplier Invoice', 'Accounts Manager', 0, 'write', 1)
+	update_permission_property('Import Supplier Invoice', 'Accounts Manager', 0, 'create', 1)
\ No newline at end of file
diff --git a/erpnext/regional/doctype/import_supplier_invoice/__init__.py b/erpnext/regional/doctype/import_supplier_invoice/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
new file mode 100644
index 00000000000..efd55db4de8
--- /dev/null
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
@@ -0,0 +1,21 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.ui.form.on('Import Supplier Invoice', {
+	onload: function(frm) {
+		frappe.realtime.on("import_invoice_update", function (data) {
+			frm.dashboard.show_progress(data.title, (data.count / data.total) * 100, data.message);
+			if (data.count == data.total) {
+				window.setTimeout(title => frm.dashboard.hide_progress(title), 1500, data.title);
+			}
+		});
+
+		frm.set_query("tax_account", function() {
+					return {
+						filters: {
+							account_type: 'Tax'
+						}
+					}
+				});
+	}
+});
\ No newline at end of file
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
new file mode 100644
index 00000000000..6d28eac3412
--- /dev/null
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
@@ -0,0 +1,81 @@
+{
+ "creation": "2019-10-15 12:33:21.845329",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "company",
+  "item_code",
+  "supplier_group",
+  "tax_account",
+  "column_break_5",
+  "zip_file",
+  "import_invoices",
+  "status"
+ ],
+ "fields": [
+  {
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company",
+   "options": "Company",
+   "reqd": 1
+  },
+  {
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "options": "Item",
+   "reqd": 1
+  },
+  {
+   "fieldname": "supplier_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Supplier Group",
+   "options": "Supplier Group",
+   "reqd": 1
+  },
+  {
+   "fieldname": "tax_account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Tax Account",
+   "options": "Account",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "zip_file",
+   "fieldtype": "Attach",
+   "label": "Zip File"
+  },
+  {
+   "description": "Click on Import Invoices button once the zip file has been attached to the document. Any errors related to processing will be shown in the Error Log.",
+   "fieldname": "import_invoices",
+   "fieldtype": "Button",
+   "label": "Import Invoices",
+   "options": "process_file_data"
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Data",
+   "label": "Status",
+   "read_only": 1
+  }
+ ],
+ "modified": "2019-10-16 02:00:00.538268",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "Import Supplier Invoice",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
new file mode 100644
index 00000000000..3b43fe77713
--- /dev/null
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -0,0 +1,383 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+from decimal import Decimal
+import json
+import re
+import traceback
+import zipfile
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.custom.doctype.custom_field.custom_field import create_custom_field
+from frappe.utils.data import format_datetime
+from bs4 import BeautifulSoup as bs
+from frappe.utils import cint, flt, today, nowdate, add_days, get_files_path
+import dateutil
+from frappe.utils.file_manager import save_file
+
+class ImportSupplierInvoice(Document):
+
+	def autoname(self):
+		if not self.name:
+			self.name = "Import Invoice on " + format_datetime(self.creation)
+
+	def import_xml_data(self):
+		import_file = frappe.get_doc("File", {"file_url": self.zip_file})
+		self.publish("File Import", _("Processing XML Files"), 1, 3)
+		pi_count = 0
+		with zipfile.ZipFile(get_full_path(self.zip_file)) as zf:
+			file_count = 0
+			for file_name in zf.namelist():
+				items = []
+				taxes = []
+				terms = []
+				encoded_content = zf.read(file_name)
+				try:
+					content = encoded_content.decode("utf-8-sig")
+				except UnicodeDecodeError:
+					content = encoded_content.decode("utf-16")
+				file_content = bs(content, "xml")
+
+				for line in file_content.find_all("DatiTrasmissione"):
+					destination_code = line.CodiceDestinatario.text
+
+				for line in file_content.find_all("DatiGeneraliDocumento"):
+					document_type = line.TipoDocumento.text
+					bill_date = dateutil.parser.parse(line.Data.text).strftime("%Y-%m-%d")
+					invoice_no = line.Numero.text
+					if len(invoice_no) != 0:
+						for line in file_content.find_all("CedentePrestatore"):
+							tax_id = line.DatiAnagrafici.IdPaese.text + line.DatiAnagrafici.IdCodice.text
+							if line.find("CodiceFiscale"):
+								fiscal_code = line.DatiAnagrafici.CodiceFiscale.text
+							else:
+								fiscal_code = ""
+							if line.find("RegimeFiscale"):
+								fiscal_regime = line.DatiAnagrafici.RegimeFiscale.text
+							else:
+								fiscal_regime = ""
+							if line.find("Denominazione"):
+								supplier = line.DatiAnagrafici.Anagrafica.Denominazione.text
+							if line.find("Nome"):
+								supplier = line.DatiAnagrafici.Anagrafica.Nome.text + " " + line.DatiAnagrafici.Anagrafica.Cognome.text
+							address_line1 = line.Sede.Indirizzo.text
+							city = line.Sede.Comune.text
+							if line.find("Provincia"):
+								province = line.Sede.Provincia.text
+							else:
+								province = ""
+							pin_code = line.Sede.CAP.text
+							country = get_country(line.Sede.Nazione.text)
+
+						for line in file_content.find_all("DettaglioLinee"):
+							if line.find("PrezzoUnitario") and line.find("PrezzoTotale"):
+								unit_rate = float(line.PrezzoUnitario.text) or float(0)
+								line_total = float(line.PrezzoTotale.text) or float(0)
+
+								if (unit_rate == 0.0):
+									qty = float(1)
+									uom = "nos"
+									rate = tax_rate = 0
+								else:
+									if (line_total / unit_rate) == 1.0:
+										qty = float(1)
+										uom = "nos"
+									else:
+										if line.find("Quantita"):
+											qty = float(line.Quantita.text) or float(0)
+											if line.find("UnitaMisura"):
+												uom = create_uom(line.UnitaMisura.text)
+											else:
+												uom = "nos"
+
+									if (unit_rate < 0 and line_total < 0):
+										qty *= -1
+										return_invoice = 1
+									else:
+										return_invoice = 0
+
+									rate = unit_rate
+									if line.find("AliquotaIVA"):
+										tax_rate = float(line.AliquotaIVA.text)
+
+								line_str = re.sub('[^A-Za-z0-9]+', '-', line.Descrizione.text)
+								item_name = line_str[0:140]
+								items.append({
+												"item_code": self.item_code,
+												"item_name": item_name,
+												"description": line_str,
+												"qty": float(qty),
+												"uom": uom,
+												"rate": rate,
+												"conversion_factor": float(1),
+												"tax_rate": tax_rate
+											})
+
+						for line in file_content.find_all("DatiRiepilogo"):
+							if line.find("AliquotaIVA"):
+								if line.find("EsigibilitaIVA"):
+									descr = line.EsigibilitaIVA.text
+								else:
+									descr = "None"
+								taxes.append({
+									"charge_type": "Actual",
+									"account_head": self.tax_account,
+									"tax_rate": float(line.AliquotaIVA.text) or float(0),
+									"description": descr,
+									"tax_amount": float(line.Imposta.text) if len(line.find("Imposta"))!=0 else float(0)
+								})
+
+						mop_dict = {'MP01':"MP01-Contanti", 'MP02':"MP02-Assegno", 'MP03':"MP03-Assegno circolare", 'MP04':"MP04-Contanti presso Tesoreria",
+									'MP05':"MP05-Bonifico", 'MP06': "MP06-Vaglia cambiario", 'MP07': "MP07-Bollettino bancario", 'MP08': "MP08-Carta di pagamento",
+									'MP09':"MP09-RID", 'MP10': "MP10-RID utenze", 'MP11': "MP11-RID veloce", 'MP12':"MP12-RIBA", 'MP13':"MP13-MAV",
+									'MP14':"MP14-Quietanza erario", 'MP15':"MP15-Giroconto su conti di contabilità speciale", 'MP16':"MP16-Domiciliazione bancaria",
+									'MP17': "MP17-Domiciliazione postale", 'MP18': "MP18-Bollettino di c/c postale", 'MP19': "MP19-SEPA Direct Debit",
+									'MP20': "MP20-SEPA Direct Debit CORE", 'MP21': "MP21-SEPA Direct Debit B2B", 'MP22':"MP22-Trattenuta su somme già riscosse"}
+				
+						for line in file_content.find_all("DettaglioPagamento"):
+							mop_code = mop_dict.get(line.ModalitaPagamento.text)
+							
+							if line.find("DataScadenzaPagamento"):
+								due_date = dateutil.parser.parse(line.DataScadenzaPagamento.text).strftime("%Y-%m-%d")
+							else:
+								due_date = today()
+							terms.append({
+											"mode_of_payment_code": mop_code,
+											"bank_account_iban": line.IBAN.text if line.find("IBAN") else "",
+											"due_date": due_date,
+											"payment_amount": line.ImportoPagamento.text
+							})
+
+						supplier_name = create_supplier(supplier = supplier, supplier_group = self.supplier_group, 
+														tax_id = tax_id, fiscal_code = fiscal_code,
+														fiscal_regime = fiscal_regime)
+
+						address = create_address(supplier_name = supplier_name, address_line1 = address_line1, 
+												city = city, province = province, 
+												pin_code = pin_code, country = country)
+
+						pi_name = create_purchase_invoice(company = self.company,
+														supplier_name = supplier_name,
+														bill_no = invoice_no,
+														document_type = document_type,
+														bill_date = bill_date,
+														is_return = return_invoice,
+														destination_code = destination_code,
+														items = items,
+														taxes = taxes,
+														terms = terms,
+														file_name = file_name)
+						file_count += 1
+						if pi_name:
+							pi_count += 1
+							file_save = save_file(file_name, encoded_content, "Purchase Invoice", pi_name, folder=None, decode=False, is_private=0, df=None)
+
+		if pi_count == file_count:
+			self.status = "File Import Completed"
+			self.publish("File Import", _("XML Files Processed"), 2, 3)
+		else:
+			self.status = "Partially Completed - Check Error Log"
+			self.publish("File Import", _("XML Files Processed"), 2, 3)
+
+		self.save()
+		self.publish("File Import", _("XML Files Processed"), 3, 3)
+
+	def process_file_data(self):
+		self.status = "Processing File Data"
+		self.save()
+		frappe.enqueue_doc(self.doctype, self.name, "import_xml_data", queue="long", timeout=3600)
+
+	def publish(self, title, message, count, total):
+		frappe.publish_realtime("import_invoice_update", {"title": title, "message": message, "count": count, "total": total})
+
+def create_supplier(**args):
+
+	args = frappe._dict(args)
+	existing_supplier_name = frappe.db.get_value("Supplier",
+				filters={"tax_id": args.tax_id}, fieldname="name")
+	if existing_supplier_name:
+		pass
+	else:
+		existing_supplier_name = frappe.db.get_value("Supplier",
+				filters={"name": args.supplier}, fieldname="name")
+
+	if existing_supplier_name:
+		filters = [
+				["Dynamic Link", "link_doctype", "=", "Supplier"],
+				["Dynamic Link", "link_name", "=", args.existing_supplier_name],
+				["Dynamic Link", "parenttype", "=", "Contact"]
+			]
+
+		existing_contacts = frappe.get_list("Contact", filters)
+
+		if existing_contacts:
+			pass
+		else:
+			new_contact = frappe.new_doc("Contact")
+			new_contact.first_name = args.supplier
+			new_contact.append('links', {
+				"link_doctype": "Supplier",
+				"link_name": existing_supplier_name
+			})
+			new_contact.insert()
+
+		return existing_supplier_name
+	else:
+		
+		new_supplier = frappe.new_doc("Supplier")
+		new_supplier.supplier_name = args.supplier
+		new_supplier.supplier_group = args.supplier_group
+		new_supplier.tax_id = args.tax_id
+		new_supplier.fiscal_code = args.fiscal_code
+		new_supplier.fiscal_regime = args.fiscal_regime
+		new_supplier.save()
+
+		new_contact = frappe.new_doc("Contact")
+		new_contact.first_name = args.supplier
+		new_contact.append('links', {
+			"link_doctype": "Supplier",
+			"link_name": new_supplier.name
+		})
+
+		new_contact.insert()
+
+		return new_supplier.name
+
+def create_address(**args):
+
+	args = frappe._dict(args)
+	filters = [
+			["Dynamic Link", "link_doctype", "=", "Supplier"],
+			["Dynamic Link", "link_name", "=", args.supplier_name],
+			["Dynamic Link", "parenttype", "=", "Address"]
+		]
+
+	existing_address = frappe.get_list("Address", filters)
+
+	if args.address_line1:
+		make_address = frappe.new_doc("Address")
+		make_address.address_line1 = args.address_line1
+
+		if args.city:
+			make_address.city = args.city
+		else:
+			make_address.city = "Not Provided"
+
+		if args.province:
+			make_address.state_code = args.province
+
+		if args.pincode:
+			make_address.pincode = args.pincode
+
+		if args.country:
+			make_address.country = args.country
+
+		for address in existing_address:
+			address_doc = frappe.get_doc("Address", address["name"])
+			if (address_doc.address_line1 == make_address.address_line1 and
+				address_doc.pincode == make_address.pincode):
+				return address
+
+		make_address.append("links", {
+			"link_doctype": "Supplier",
+			"link_name": args.supplier_name
+		})
+		make_address.address_type = "Billing"
+		make_address.insert()
+		return make_address.name
+	else:
+		return None
+
+def create_purchase_invoice(**args):
+
+	args = frappe._dict(args)
+	pi = frappe.get_doc({
+			"doctype": "Purchase Invoice",
+			"company": args.company,
+			"naming_series": "PINV-",
+			"supplier": args.supplier_name,
+			"is_return": args.is_return,
+			"posting_date": today(),
+			"bill_no": args.bill_no,
+			"bill_date": args.bill_date,
+			"destination_code": args.destination_code,
+			"document_type": args.document_type,
+			"items": args["items"],
+			"taxes": args["taxes"]
+		})
+
+	try:
+		pi.insert(ignore_permissions=True)
+		calc_total = 0
+		adj = 0
+		for term in args.terms:
+			calc_total += float(term["payment_amount"])
+		if float(calc_total - float(pi.grand_total)) != 0:
+			adj = calc_total - float(pi.grand_total)
+		pi.payment_schedule = []
+		for term in args.terms:
+			pi.append('payment_schedule',{"mode_of_payment_code": term["mode_of_payment_code"],
+			"bank_account_iban": term["bank_account_iban"],
+			"due_date": term["due_date"],
+			"payment_amount": float(term["payment_amount"]) - adj })
+			adj = 0
+		pi.imported_grand_total = calc_total
+		pi.save()
+		return pi.name
+	except Exception as e:
+		frappe.log_error(message=e, title="Create Purchase Invoice: " + args.bill_no + "File Name: " + args.file_name)
+		return None
+
+def get_country(code):
+
+	existing_country_name = frappe.db.get_value("Country",
+			filters={"code": code}, fieldname="name")
+	if existing_country_name:
+		return existing_country_name
+	else:
+		frappe.throw(_("Country Code in File does not match with country code set up in the system"))
+
+def create_uom(uom):
+
+	existing_uom = frappe.db.get_value("UOM",
+			filters={"uom_name": uom}, fieldname="uom_name")
+	if existing_uom:
+		return existing_uom
+	else:
+		new_uom = frappe.new_doc("UOM")
+		new_uom.uom_name = uom
+		new_uom.save()
+		return new_uom.uom_name
+
+def check_bill_no(invoice_no):
+
+	existing_bill_no = frappe.db.get_value("Purchase Invoice",
+				filters={"bill_no": invoice_no, "docstatus": 1}, fieldname="name")
+	if existing_bill_no:
+		return existing_bill_no
+	else:
+		return None
+
+def get_full_path(file_name):
+	"""Returns file path from given file name"""
+	file_path = file_name
+
+	if "/" not in file_path:
+		file_path = "/files/" + file_path
+
+	if file_path.startswith("/private/files/"):
+		file_path = get_files_path(*file_path.split("/private/files/", 1)[1].split("/"), is_private=1)
+
+	elif file_path.startswith("/files/"):
+		file_path = get_files_path(*file_path.split("/files/", 1)[1].split("/"))
+
+	elif file_path.startswith("http"):
+		pass
+
+	elif not self.file_url:
+		frappe.throw(_("There is some problem with the file url: {0}").format(file_path))
+
+	return file_path
\ No newline at end of file
diff --git a/erpnext/regional/doctype/import_supplier_invoice/test_import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/test_import_supplier_invoice.py
new file mode 100644
index 00000000000..d1caf77fc2c
--- /dev/null
+++ b/erpnext/regional/doctype/import_supplier_invoice/test_import_supplier_invoice.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestImportSupplierInvoice(unittest.TestCase):
+	pass
diff --git a/erpnext/regional/italy/setup.py b/erpnext/regional/italy/setup.py
index 1526d6f62f0..2d0ad66b0a0 100644
--- a/erpnext/regional/italy/setup.py
+++ b/erpnext/regional/italy/setup.py
@@ -155,6 +155,31 @@ def make_custom_fields(update=True):
 				fetch_from="country.code"),
 			dict(fieldname='state_code', label='State Code',
 				fieldtype='Data', insert_after='state', print_hide=1)
+		],
+		'Purchase Invoice': [
+			dict(fieldname='document_type', label='Document Type',
+				fieldtype='Data', insert_after='company', print_hide=1, read_only=1
+				),
+			dict(fieldname='destination_code', label='Destination Code',
+				fieldtype='Data', insert_after='company', print_hide=1, read_only=1
+				),
+			dict(fieldname='imported_grand_total', label='Imported Grand Total',
+				fieldtype='Data', insert_after='update_auto_repeat_reference', print_hide=1, read_only=1
+				)
+		],
+		'Purchase Taxes and Charges': [
+			dict(fieldname='tax_rate', label='Tax Rate',
+				fieldtype='Data', insert_after='parenttype', print_hide=1, read_only=0
+				)
+		],
+		'Supplier': [
+			dict(fieldname='fiscal_code', label='Fiscal Code',
+				fieldtype='Data', insert_after='tax_id', print_hide=1, read_only=1
+				),
+			dict(fieldname='fiscal_regime', label='Fiscal Regime',
+				fieldtype='Select', insert_after='fiscal_code', print_hide=1, read_only=1,
+				options= "\nRF01\nRF02\nRF04\nRF05\nRF06\nRF07\nRF08\nRF09\nRF10\nRF11\nRF12\nRF13\nRF14\nRF15\nRF16\nRF17\nRF18\nRF19"
+				)
 		]
 	}
 
diff --git a/erpnext/regional/italy/utils.py b/erpnext/regional/italy/utils.py
index bc8d00d8b8b..2af72f8e276 100644
--- a/erpnext/regional/italy/utils.py
+++ b/erpnext/regional/italy/utils.py
@@ -13,6 +13,8 @@ from erpnext.regional.italy import state_codes
 def update_itemised_tax_data(doc):
 	if not doc.taxes: return
 
+	if doc.doctype == "Purchase Invoice": return
+
 	itemised_tax = get_itemised_tax(doc.taxes)
 
 	for row in doc.items:
diff --git a/erpnext/regional/print_format/purchase_einvoice/__init__.py b/erpnext/regional/print_format/purchase_einvoice/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/regional/print_format/purchase_einvoice/purchase_einvoice.json b/erpnext/regional/print_format/purchase_einvoice/purchase_einvoice.json
new file mode 100644
index 00000000000..88f31dd1308
--- /dev/null
+++ b/erpnext/regional/print_format/purchase_einvoice/purchase_einvoice.json
@@ -0,0 +1,23 @@
+{
+ "align_labels_right": 0,
+ "creation": "2019-10-16 00:47:08.877767",
+ "custom_format": 0,
+ "disabled": 1,
+ "doc_type": "Purchase Invoice",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"<div class=\\\"print-heading\\\">\\t\\t\\t\\t<h2>Purchase Invoice<br><small>{{ doc.name }}</small>\\t\\t\\t\\t</h2></div>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<table border=\\\"1\\\" width=\\\"100%\\\">\\n<head>\\n<th>\\nCedente/prestatore (fornitore)\\n</th>\\n<th>\\nCessionario/committente (cliente)\\n</th>\\n</head>\\n<body>\\n<tr>\\n<td style=\\\"width: 50%;white-space:nowrap;\\\">\\n<p>Identificstivo fiscale ai fini IVA: {{frappe.db.get_value(\\\"Supplier\\\", doc.supplier, \\\"tax_id\\\")}}</p>\\n<p>Codice fiscale: {{frappe.db.get_value(\\\"Supplier\\\", doc.supplier, \\\"fiscal_code\\\")}}</p>\\n<p>Denominazione: {{frappe.db.get_value(\\\"Supplier\\\", doc.supplier, \\\"supplier_name\\\")}}</p>\\n<p>Regime fiscale: {{frappe.db.get_value(\\\"Supplier\\\", doc.supplier, \\\"fiscal_regime\\\")}}</p>\\n<p>Indrizo: {{frappe.db.get_value(\\\"Address\\\", doc.supplier_address, \\\"address_line1\\\")}}</p>\\n<p>Commune: {{frappe.db.get_value(\\\"Address\\\", doc.supplier_address, \\\"city\\\")}} Provincia: {{frappe.db.get_value(\\\"Address\\\", doc.supplier_address, \\\"state_code\\\")}}</p>\\n<p>Cap: {{(frappe.db.get_value(\\\"Address\\\", doc.supplier_address, \\\"pincode\\\")) or \\\" \\\"}} Nazione: {{frappe.db.get_value(\\\"Address\\\", doc.supplier_address, \\\"country\\\")}}</p>\\n</td>\\n<td style=\\\"width: 50%;white-space:nowrap;\\\">\\n<p>Identificstivo fiscale ai fini IVA: {{frappe.db.get_value(\\\"Company\\\", doc.company, \\\"tax_id\\\")}}</p>\\n<p>Codice fiscale: {{frappe.db.get_value(\\\"Company\\\", doc.company, \\\"fiscal_code\\\")}}</p>\\n<p>Denominazione: {{doc.company}}</p>\\n<p>Indrizo: {{frappe.db.get_value(\\\"Address\\\", doc.shipping_address, \\\"address_line1\\\")}}</p>\\n<p>Commune: {{frappe.db.get_value(\\\"Address\\\", doc.shipping_address, \\\"city\\\")}} Provincia: {{frappe.db.get_value(\\\"Address\\\", doc.shipping_address, \\\"state_code\\\")}}</p>\\n<p>Cap: {{frappe.db.get_value(\\\"Address\\\", doc.shipping_address, \\\"pincode\\\")}} Nazione: {{frappe.db.get_value(\\\"Address\\\", doc.shipping_address, \\\"country\\\")}}</p>\\n</td>\\n</td>\\n</tr>\\n</body>\\n</table>\\n<br>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<table border=\\\"1\\\" width=\\\"100%\\\">\\n<head>\\n<th>\\nTipologla\\n</th>\\n<th>\\nArt. 73\\n</th>\\n<th>\\nNumero documento\\n</th>\\n<th>\\nData documento\\n</th>\\n<th>\\nCodice destinatario\\n</th>\\n</head>\\n<body>\\n<tr>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{doc.document_type or \\\" \\\"}}\\n</td>\\n<td style=\\\"width: 10%;white-space:nowrap;\\\">\\n{{\\\" \\\"}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{doc.bill_no or \\\" \\\"}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{doc.get_formatted(\\\"bill_date\\\") or \\\" \\\"}}\\n</td>\\n<td style=\\\"width: 30%;white-space:nowrap;\\\">\\n{{doc.destination_code or \\\" \\\"}}\\n</td>\\n</tr>\\n</body>\\n</table>\\n<br>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<table border=\\\"1\\\" width=\\\"100%\\\">\\n<head>\\n<th>\\nDescrizione\\n</th>\\n<th>\\nQuantita\\n</th>\\n<th>\\nPrezzo unitario\\n</th>\\n<th>\\nUM\\n</th>\\n<th>\\n%IVA\\n</th>\\n<th>\\nPrezzo totale\\n</th>\\n</head>\\n\\n<body>\\n{%- for row in doc.items -%}\\n<tr>\\n<td style=\\\"width: 30%;\\\">\\n{{row.description or \\\" \\\"}}\\n</td>\\n<td style=\\\"width: 15%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"qty\\\", doc)}}\\n</td>\\n<td style=\\\"width: 15%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"rate\\\", doc)}}\\n</td>\\n<td style=\\\"width: 5%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"uom\\\", doc)}}\\n</td>\\n<td style=\\\"width: 15%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"tax_rate\\\", doc)}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"amount\\\", doc)}}\\n</td>\\n{%- endfor -%}\\n</body>\\n</table>\\n<br>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<table border=\\\"1\\\" width=\\\"100%\\\">\\n<head>\\n<th>\\nesigibilita immediata / riferimenti normativi\\n</th>\\n<th>\\n%IVA\\n</th>\\n<th>\\nSpese accessorie\\n</th>\\n<th>\\nArr.\\n</th>\\n<th>\\nTotale imponibile\\n</th>\\n<th>\\nTotale Imposta\\n</th>\\n</head>\\n\\n<body>\\n{%- for row in doc.taxes -%}\\n<tr>\\n<td style=\\\"width: 30%;white-space:nowrap;\\\">\\n{% if 'None' in row.description %}\\n    {{ \\\" \\\" }}\\n{% else %}\\n{{row.description}}\\n{% endif %}\\n</td>\\n<td style=\\\"width: 10%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"tax_rate\\\", doc)}}\\n</td>\\n<td style=\\\"width: 10%;white-space:nowrap;\\\">\\n{{\\\"0,00\\\"}}\\n</td>\\n<td style=\\\"width: 10%;white-space:nowrap;\\\">\\n{{\\\" \\\"}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{doc.get_formatted(\\\"base_net_total\\\")}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"tax_amount\\\", doc)}}\\n</td>\\n{%- endfor -%}\\n</body>\\n</table>\\n<br>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<table border=\\\"1\\\" width=\\\"100%\\\">\\n<head>\\n<th>\\nImporto bolio\\n</th>\\n<th>\\nSconto/Magglorazione\\n</th>\\n<th>\\nArr.\\n</th>\\n<th>\\nTotale documento\\n</th>\\n</head>\\n\\n<body>\\n<tr>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{\\\" \\\"}}\\n</td>\\n<td style=\\\"width: 30%;white-space:nowrap;\\\">\\n{{\\\" \\\"}}\\n</td>\\n<td style=\\\"width: 10%;white-space:nowrap;\\\">\\n{{\\\" \\\"}}\\n</td>\\n<td style=\\\"width: 40%;white-space:nowrap;\\\">\\n{{doc.get_formatted(\\\"base_grand_total\\\")}}\\n</td>\\n</body>\\n</table>\\n<br>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"<table border=\\\"1\\\" width=\\\"100%\\\">\\n<head>\\n<th>\\nModalita pagamento\\n</th>\\n<th>\\nIBAN\\n</th>\\n<th>\\nInstituto\\n</th>\\n<th>\\nData scadenza\\n</th>\\n<th>\\nImporto\\n</th>\\n</head>\\n\\n<body>\\n{%- for row in doc.payment_schedule -%}\\n<tr>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"mode_of_payment_code\\\",doc)}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"bank_account_iban\\\",doc)}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{\\\" \\\"}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"due_date\\\",doc)}}\\n</td>\\n<td style=\\\"width: 20%;white-space:nowrap;\\\">\\n{{row.get_formatted(\\\"payment_amount\\\",doc)}}\\n</td>\\n{%- endfor -%}\\n</body>\\n</table>\"}]",
+ "idx": 0,
+ "line_breaks": 0,
+ "modified": "2019-10-16 23:32:37.709344",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "Purchase eInvoice",
+ "owner": "Administrator",
+ "print_format_builder": 1,
+ "print_format_type": "Jinja",
+ "raw_printing": 0,
+ "show_section_headings": 0,
+ "standard": "Yes"
+}
\ No newline at end of file

From 9964ad787002b4f9b0794280bc6294afa89b6fae Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Thu, 17 Oct 2019 07:38:50 +0530
Subject: [PATCH 110/193] python 2.7 fixes

---
 .../import_supplier_invoice.py                     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 3b43fe77713..8b0c894bcf4 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -27,7 +27,12 @@ class ImportSupplierInvoice(Document):
 	def import_xml_data(self):
 		import_file = frappe.get_doc("File", {"file_url": self.zip_file})
 		self.publish("File Import", _("Processing XML Files"), 1, 3)
+
 		pi_count = 0
+		mop_options = frappe.get_meta('Mode of Payment').fields['4'].options
+		mop_str = re.sub('\n', ',', mop_options)
+		mop_dict = dict(item.split("-") for item in mop_str.split(","))
+
 		with zipfile.ZipFile(get_full_path(self.zip_file)) as zf:
 			file_count = 0
 			for file_name in zf.namelist():
@@ -129,16 +134,9 @@ class ImportSupplierInvoice(Document):
 									"description": descr,
 									"tax_amount": float(line.Imposta.text) if len(line.find("Imposta"))!=0 else float(0)
 								})
-
-						mop_dict = {'MP01':"MP01-Contanti", 'MP02':"MP02-Assegno", 'MP03':"MP03-Assegno circolare", 'MP04':"MP04-Contanti presso Tesoreria",
-									'MP05':"MP05-Bonifico", 'MP06': "MP06-Vaglia cambiario", 'MP07': "MP07-Bollettino bancario", 'MP08': "MP08-Carta di pagamento",
-									'MP09':"MP09-RID", 'MP10': "MP10-RID utenze", 'MP11': "MP11-RID veloce", 'MP12':"MP12-RIBA", 'MP13':"MP13-MAV",
-									'MP14':"MP14-Quietanza erario", 'MP15':"MP15-Giroconto su conti di contabilità speciale", 'MP16':"MP16-Domiciliazione bancaria",
-									'MP17': "MP17-Domiciliazione postale", 'MP18': "MP18-Bollettino di c/c postale", 'MP19': "MP19-SEPA Direct Debit",
-									'MP20': "MP20-SEPA Direct Debit CORE", 'MP21': "MP21-SEPA Direct Debit B2B", 'MP22':"MP22-Trattenuta su somme già riscosse"}
 				
 						for line in file_content.find_all("DettaglioPagamento"):
-							mop_code = mop_dict.get(line.ModalitaPagamento.text)
+							mop_code = line.ModalitaPagamento.text + '-' + mop_dict.get(line.ModalitaPagamento.text)
 							
 							if line.find("DataScadenzaPagamento"):
 								due_date = dateutil.parser.parse(line.DataScadenzaPagamento.text).strftime("%Y-%m-%d")

From fa8159efa3efef6ac16120c7caa3441d9d196358 Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Thu, 17 Oct 2019 07:45:23 +0530
Subject: [PATCH 111/193] mop options fix

---
 .../doctype/import_supplier_invoice/import_supplier_invoice.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 8b0c894bcf4..5144be1ae72 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -29,7 +29,7 @@ class ImportSupplierInvoice(Document):
 		self.publish("File Import", _("Processing XML Files"), 1, 3)
 
 		pi_count = 0
-		mop_options = frappe.get_meta('Mode of Payment').fields['4'].options
+		mop_options = frappe.get_meta('Mode of Payment').fields[4].options
 		mop_str = re.sub('\n', ',', mop_options)
 		mop_dict = dict(item.split("-") for item in mop_str.split(","))
 

From 5fadd355dfab01cc8883d5b0b179cf5d10f79a3d Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Sat, 19 Oct 2019 00:19:21 +0530
Subject: [PATCH 112/193] add naming series option

---
 .../import_supplier_invoice.json                       | 10 +++++++++-
 .../import_supplier_invoice/import_supplier_invoice.py |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
index 6d28eac3412..aabf9de3cdf 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
@@ -4,6 +4,7 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "invoice_series",
   "company",
   "item_code",
   "supplier_group",
@@ -67,9 +68,16 @@
    "fieldtype": "Data",
    "label": "Status",
    "read_only": 1
+  },
+  {
+   "fieldname": "invoice_series",
+   "fieldtype": "Select",
+   "label": "Invoice Series",
+   "options": "ACC-PINV-.YYYY.-",
+   "reqd": 1
   }
  ],
- "modified": "2019-10-16 02:00:00.538268",
+ "modified": "2019-10-19 00:15:11.404733",
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "Import Supplier Invoice",
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 5144be1ae72..dc580ad24b7 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -158,6 +158,7 @@ class ImportSupplierInvoice(Document):
 												pin_code = pin_code, country = country)
 
 						pi_name = create_purchase_invoice(company = self.company,
+														naming_series = self.invoice_series,
 														supplier_name = supplier_name,
 														bill_no = invoice_no,
 														document_type = document_type,
@@ -295,7 +296,7 @@ def create_purchase_invoice(**args):
 	pi = frappe.get_doc({
 			"doctype": "Purchase Invoice",
 			"company": args.company,
-			"naming_series": "PINV-",
+			"naming_series": args.naming_series,
 			"supplier": args.supplier_name,
 			"is_return": args.is_return,
 			"posting_date": today(),

From 309913bbdf61f6bbab4da2194c77a9aee434735a Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Sat, 19 Oct 2019 07:23:22 +0530
Subject: [PATCH 113/193] fix codacy issues

---
 .../import_supplier_invoice/import_supplier_invoice.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
index efd55db4de8..f347cd7bd82 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
@@ -11,11 +11,11 @@ frappe.ui.form.on('Import Supplier Invoice', {
 		});
 
 		frm.set_query("tax_account", function() {
-					return {
-						filters: {
-							account_type: 'Tax'
+			return {
+				filters: {
+					account_type: 'Tax'
 						}
-					}
-				});
+			};
+		});
 	}
 });
\ No newline at end of file

From c8e64235c0cb21fe66313ebf0fb6ccd82c81901b Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Sat, 19 Oct 2019 08:05:05 +0530
Subject: [PATCH 114/193] codacy fixes

---
 .../import_supplier_invoice/import_supplier_invoice.js        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
index f347cd7bd82..3669b6f483e 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
@@ -12,9 +12,7 @@ frappe.ui.form.on('Import Supplier Invoice', {
 
 		frm.set_query("tax_account", function() {
 			return {
-				filters: {
-					account_type: 'Tax'
-						}
+				filters: { account_type: 'Tax' }
 			};
 		});
 	}

From 90f170c376e4e193ebbed3cb4fbe7a67c4fc38b7 Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Sat, 19 Oct 2019 12:00:25 +0530
Subject: [PATCH 115/193] code improvement

---
 .../doctype/import_supplier_invoice/import_supplier_invoice.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
index 3669b6f483e..bbc0f92cc7b 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
@@ -9,7 +9,8 @@ frappe.ui.form.on('Import Supplier Invoice', {
 				window.setTimeout(title => frm.dashboard.hide_progress(title), 1500, data.title);
 			}
 		});
-
+	},
+	setup: function(frm) {
 		frm.set_query("tax_account", function() {
 			return {
 				filters: { account_type: 'Tax' }

From 5b33765a8c155fa050f4c0406b56a3b72f16b479 Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Mon, 21 Oct 2019 18:54:08 +0530
Subject: [PATCH 116/193] discount handling

---
 .../import_supplier_invoice.py                     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index dc580ad24b7..293d6c908e3 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -77,6 +77,8 @@ class ImportSupplierInvoice(Document):
 							pin_code = line.Sede.CAP.text
 							country = get_country(line.Sede.Nazione.text)
 
+						total_discount = 0
+
 						for line in file_content.find_all("DettaglioLinee"):
 							if line.find("PrezzoUnitario") and line.find("PrezzoTotale"):
 								unit_rate = float(line.PrezzoUnitario.text) or float(0)
@@ -121,6 +123,11 @@ class ImportSupplierInvoice(Document):
 												"tax_rate": tax_rate
 											})
 
+								for disc_line in line.find_all("ScontoMaggiorazione"):
+									if disc_line.find("Percentuale"):
+										discount = float(disc_line.Percentuale.text) or float(0)
+										total_discount += float((discount / 100) * (rate * qty))
+
 						for line in file_content.find_all("DatiRiepilogo"):
 							if line.find("AliquotaIVA"):
 								if line.find("EsigibilitaIVA"):
@@ -165,6 +172,7 @@ class ImportSupplierInvoice(Document):
 														bill_date = bill_date,
 														is_return = return_invoice,
 														destination_code = destination_code,
+														total_discount = total_discount,
 														items = items,
 														taxes = taxes,
 														terms = terms,
@@ -310,6 +318,12 @@ def create_purchase_invoice(**args):
 
 	try:
 		pi.insert(ignore_permissions=True)
+
+		if args.total_discount > 0:
+			pi.apply_discount_on = "Grand Total"
+			pi.discount_amount = args.total_discount
+			pi.save()
+
 		calc_total = 0
 		adj = 0
 		for term in args.terms:

From 9e0762e8c2c3643268c98c62253fa5a7210af71b Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Wed, 23 Oct 2019 19:14:14 +0530
Subject: [PATCH 117/193] code review changes

---
 .../import_supplier_invoice.py                | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 293d6c908e3..33884787a2a 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -164,19 +164,13 @@ class ImportSupplierInvoice(Document):
 												city = city, province = province, 
 												pin_code = pin_code, country = country)
 
-						pi_name = create_purchase_invoice(company = self.company,
-														naming_series = self.invoice_series,
-														supplier_name = supplier_name,
-														bill_no = invoice_no,
-														document_type = document_type,
-														bill_date = bill_date,
-														is_return = return_invoice,
-														destination_code = destination_code,
-														total_discount = total_discount,
-														items = items,
-														taxes = taxes,
-														terms = terms,
-														file_name = file_name)
+						pi_name = create_purchase_invoice(company = self.company, naming_series = self.invoice_series,
+														supplier_name = supplier_name, bill_no = invoice_no,
+														document_type = document_type, bill_date = bill_date,
+														is_return = return_invoice, destination_code = destination_code,
+														total_discount = total_discount, items = items,
+														taxes = taxes, terms = terms,file_name = file_name)
+
 						file_count += 1
 						if pi_name:
 							pi_count += 1
@@ -365,15 +359,6 @@ def create_uom(uom):
 		new_uom.save()
 		return new_uom.uom_name
 
-def check_bill_no(invoice_no):
-
-	existing_bill_no = frappe.db.get_value("Purchase Invoice",
-				filters={"bill_no": invoice_no, "docstatus": 1}, fieldname="name")
-	if existing_bill_no:
-		return existing_bill_no
-	else:
-		return None
-
 def get_full_path(file_name):
 	"""Returns file path from given file name"""
 	file_path = file_name

From eb87566fa627e5794aaf335caa30faa09c2f7143 Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Sat, 9 Nov 2019 16:28:54 +0530
Subject: [PATCH 118/193] log encoding exception

---
 .../import_supplier_invoice/import_supplier_invoice.py     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 33884787a2a..e28d305e869 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -40,10 +40,15 @@ class ImportSupplierInvoice(Document):
 				taxes = []
 				terms = []
 				encoded_content = zf.read(file_name)
+
 				try:
 					content = encoded_content.decode("utf-8-sig")
 				except UnicodeDecodeError:
-					content = encoded_content.decode("utf-16")
+					try:
+						content = encoded_content.decode("utf-16")
+					except UnicodeDecodeError as e:
+						frappe.log_error(message=e, title="UTF-16 encoding error for File Name: " + file_name)
+
 				file_content = bs(content, "xml")
 
 				for line in file_content.find_all("DatiTrasmissione"):

From e9377e25131891a79f959a9dc90299fa4a4a2799 Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Mon, 11 Nov 2019 16:14:28 +0530
Subject: [PATCH 119/193] review changes

---
 .../import_supplier_invoice.py                | 101 ++++++++++--------
 1 file changed, 54 insertions(+), 47 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index e28d305e869..f65c7f169af 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -33,6 +33,11 @@ class ImportSupplierInvoice(Document):
 		mop_str = re.sub('\n', ',', mop_options)
 		mop_dict = dict(item.split("-") for item in mop_str.split(","))
 
+		default_uom = frappe.db.get_value("Stock Settings", fieldname="stock_uom")
+
+		if not default_uom:
+			frappe.throw(_("Please set default UOM in Stock Settings"))
+
 		with zipfile.ZipFile(get_full_path(self.zip_file)) as zf:
 			file_count = 0
 			for file_name in zf.namelist():
@@ -54,6 +59,7 @@ class ImportSupplierInvoice(Document):
 				for line in file_content.find_all("DatiTrasmissione"):
 					destination_code = line.CodiceDestinatario.text
 
+				#read address information from file
 				for line in file_content.find_all("DatiGeneraliDocumento"):
 					document_type = line.TipoDocumento.text
 					bill_date = dateutil.parser.parse(line.Data.text).strftime("%Y-%m-%d")
@@ -84,26 +90,27 @@ class ImportSupplierInvoice(Document):
 
 						total_discount = 0
 
+						#read item information from file
 						for line in file_content.find_all("DettaglioLinee"):
 							if line.find("PrezzoUnitario") and line.find("PrezzoTotale"):
-								unit_rate = float(line.PrezzoUnitario.text) or float(0)
-								line_total = float(line.PrezzoTotale.text) or float(0)
+								unit_rate = flt(line.PrezzoUnitario.text) or 0
+								line_total = flt(line.PrezzoTotale.text) or 0
 
 								if (unit_rate == 0.0):
-									qty = float(1)
-									uom = "nos"
+									qty = 1.0
+									uom = default_uom
 									rate = tax_rate = 0
 								else:
 									if (line_total / unit_rate) == 1.0:
-										qty = float(1)
-										uom = "nos"
+										qty = 1.0
+										uom = default_uom
 									else:
 										if line.find("Quantita"):
-											qty = float(line.Quantita.text) or float(0)
+											qty = flt(line.Quantita.text) or 0
 											if line.find("UnitaMisura"):
 												uom = create_uom(line.UnitaMisura.text)
 											else:
-												uom = "nos"
+												uom = default_uom
 
 									if (unit_rate < 0 and line_total < 0):
 										qty *= -1
@@ -113,7 +120,7 @@ class ImportSupplierInvoice(Document):
 
 									rate = unit_rate
 									if line.find("AliquotaIVA"):
-										tax_rate = float(line.AliquotaIVA.text)
+										tax_rate = flt(line.AliquotaIVA.text)
 
 								line_str = re.sub('[^A-Za-z0-9]+', '-', line.Descrizione.text)
 								item_name = line_str[0:140]
@@ -121,18 +128,19 @@ class ImportSupplierInvoice(Document):
 												"item_code": self.item_code,
 												"item_name": item_name,
 												"description": line_str,
-												"qty": float(qty),
+												"qty": qty,
 												"uom": uom,
 												"rate": rate,
-												"conversion_factor": float(1),
+												"conversion_factor": 1.0,
 												"tax_rate": tax_rate
 											})
 
 								for disc_line in line.find_all("ScontoMaggiorazione"):
 									if disc_line.find("Percentuale"):
-										discount = float(disc_line.Percentuale.text) or float(0)
-										total_discount += float((discount / 100) * (rate * qty))
+										discount = flt(disc_line.Percentuale.text) or 0
+										total_discount += flt((discount / 100) * (rate * qty))
 
+						#read taxes from file
 						for line in file_content.find_all("DatiRiepilogo"):
 							if line.find("AliquotaIVA"):
 								if line.find("EsigibilitaIVA"):
@@ -142,11 +150,12 @@ class ImportSupplierInvoice(Document):
 								taxes.append({
 									"charge_type": "Actual",
 									"account_head": self.tax_account,
-									"tax_rate": float(line.AliquotaIVA.text) or float(0),
+									"tax_rate": flt(line.AliquotaIVA.text) or 0,
 									"description": descr,
-									"tax_amount": float(line.Imposta.text) if len(line.find("Imposta"))!=0 else float(0)
+									"tax_amount": flt(line.Imposta.text) if len(line.find("Imposta"))!=0 else 0
 								})
-				
+
+						#read payment data from file
 						for line in file_content.find_all("DettaglioPagamento"):
 							mop_code = line.ModalitaPagamento.text + '-' + mop_dict.get(line.ModalitaPagamento.text)
 							
@@ -162,19 +171,18 @@ class ImportSupplierInvoice(Document):
 							})
 
 						supplier_name = create_supplier(supplier = supplier, supplier_group = self.supplier_group, 
-														tax_id = tax_id, fiscal_code = fiscal_code,
-														fiscal_regime = fiscal_regime)
+											tax_id = tax_id, fiscal_code = fiscal_code,
+											fiscal_regime = fiscal_regime)
 
 						address = create_address(supplier_name = supplier_name, address_line1 = address_line1, 
-												city = city, province = province, 
-												pin_code = pin_code, country = country)
+									city = city, province = province, 
+									pin_code = pin_code, country = country)
 
 						pi_name = create_purchase_invoice(company = self.company, naming_series = self.invoice_series,
-														supplier_name = supplier_name, bill_no = invoice_no,
-														document_type = document_type, bill_date = bill_date,
-														is_return = return_invoice, destination_code = destination_code,
-														total_discount = total_discount, items = items,
-														taxes = taxes, terms = terms,file_name = file_name)
+									supplier_name = supplier_name, bill_no = invoice_no,document_type = document_type, 
+									bill_date = bill_date,is_return = return_invoice, destination_code = destination_code,
+									total_discount = total_discount, items = items,taxes = taxes, terms = terms,
+									file_name = file_name)
 
 						file_count += 1
 						if pi_name:
@@ -264,36 +272,31 @@ def create_address(**args):
 	existing_address = frappe.get_list("Address", filters)
 
 	if args.address_line1:
-		make_address = frappe.new_doc("Address")
-		make_address.address_line1 = args.address_line1
+		new_address_doc = frappe.new_doc("Address")
+		new_address_doc.address_line1 = args.address_line1
 
 		if args.city:
-			make_address.city = args.city
+			new_address_doc.city = args.city
 		else:
-			make_address.city = "Not Provided"
+			new_address_doc.city = "Not Provided"
 
-		if args.province:
-			make_address.state_code = args.province
-
-		if args.pincode:
-			make_address.pincode = args.pincode
-
-		if args.country:
-			make_address.country = args.country
+		for field in ["province", "pincode", "country"]:
+			if args.get(field):
+				new_address_doc.set(field, args.get(field))
 
 		for address in existing_address:
 			address_doc = frappe.get_doc("Address", address["name"])
-			if (address_doc.address_line1 == make_address.address_line1 and
-				address_doc.pincode == make_address.pincode):
+			if (address_doc.address_line1 == new_address_doc.address_line1 and
+				address_doc.pincode == new_address_doc.pincode):
 				return address
 
-		make_address.append("links", {
+		new_address_doc.append("links", {
 			"link_doctype": "Supplier",
 			"link_name": args.supplier_name
 		})
-		make_address.address_type = "Billing"
-		make_address.insert()
-		return make_address.name
+		new_address_doc.address_type = "Billing"
+		new_address_doc.insert()
+		return new_address_doc.name
 	else:
 		return None
 
@@ -316,28 +319,32 @@ def create_purchase_invoice(**args):
 		})
 
 	try:
+		pi.set_missing_values()
 		pi.insert(ignore_permissions=True)
 
+		#if discount exists in file, apply any discount on grand total
 		if args.total_discount > 0:
 			pi.apply_discount_on = "Grand Total"
 			pi.discount_amount = args.total_discount
 			pi.save()
 
+		#adjust payment amount to match with grand total calculated
 		calc_total = 0
 		adj = 0
 		for term in args.terms:
-			calc_total += float(term["payment_amount"])
-		if float(calc_total - float(pi.grand_total)) != 0:
-			adj = calc_total - float(pi.grand_total)
+			calc_total += flt(term["payment_amount"])
+		if flt(calc_total - flt(pi.grand_total)) != 0:
+			adj = calc_total - flt(pi.grand_total)
 		pi.payment_schedule = []
 		for term in args.terms:
 			pi.append('payment_schedule',{"mode_of_payment_code": term["mode_of_payment_code"],
 			"bank_account_iban": term["bank_account_iban"],
 			"due_date": term["due_date"],
-			"payment_amount": float(term["payment_amount"]) - adj })
+			"payment_amount": flt(term["payment_amount"]) - adj })
 			adj = 0
 		pi.imported_grand_total = calc_total
 		pi.save()
+
 		return pi.name
 	except Exception as e:
 		frappe.log_error(message=e, title="Create Purchase Invoice: " + args.bill_no + "File Name: " + args.file_name)

From 39b54cb8893f0ef06a012335ea3c412126e4d37e Mon Sep 17 00:00:00 2001
From: "hello@openetech.com" <pawan@erpnext.com>
Date: Sat, 23 Nov 2019 06:50:51 +0530
Subject: [PATCH 120/193] validation change

---
 .../import_supplier_invoice.py                    | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index f65c7f169af..43c6454e4da 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -19,6 +19,9 @@ import dateutil
 from frappe.utils.file_manager import save_file
 
 class ImportSupplierInvoice(Document):
+	def validate(self):
+		if not frappe.db.get_value("Stock Settings", fieldname="stock_uom"):
+			frappe.throw(_("Please set default UOM in Stock Settings"))
 
 	def autoname(self):
 		if not self.name:
@@ -35,9 +38,6 @@ class ImportSupplierInvoice(Document):
 
 		default_uom = frappe.db.get_value("Stock Settings", fieldname="stock_uom")
 
-		if not default_uom:
-			frappe.throw(_("Please set default UOM in Stock Settings"))
-
 		with zipfile.ZipFile(get_full_path(self.zip_file)) as zf:
 			file_count = 0
 			for file_name in zf.namelist():
@@ -158,7 +158,6 @@ class ImportSupplierInvoice(Document):
 						#read payment data from file
 						for line in file_content.find_all("DettaglioPagamento"):
 							mop_code = line.ModalitaPagamento.text + '-' + mop_dict.get(line.ModalitaPagamento.text)
-							
 							if line.find("DataScadenzaPagamento"):
 								due_date = dateutil.parser.parse(line.DataScadenzaPagamento.text).strftime("%Y-%m-%d")
 							else:
@@ -208,7 +207,6 @@ class ImportSupplierInvoice(Document):
 		frappe.publish_realtime("import_invoice_update", {"title": title, "message": message, "count": count, "total": total})
 
 def create_supplier(**args):
-
 	args = frappe._dict(args)
 	existing_supplier_name = frappe.db.get_value("Supplier",
 				filters={"tax_id": args.tax_id}, fieldname="name")
@@ -261,7 +259,6 @@ def create_supplier(**args):
 		return new_supplier.name
 
 def create_address(**args):
-
 	args = frappe._dict(args)
 	filters = [
 			["Dynamic Link", "link_doctype", "=", "Supplier"],
@@ -301,7 +298,6 @@ def create_address(**args):
 		return None
 
 def create_purchase_invoice(**args):
-
 	args = frappe._dict(args)
 	pi = frappe.get_doc({
 			"doctype": "Purchase Invoice",
@@ -321,13 +317,11 @@ def create_purchase_invoice(**args):
 	try:
 		pi.set_missing_values()
 		pi.insert(ignore_permissions=True)
-
 		#if discount exists in file, apply any discount on grand total
 		if args.total_discount > 0:
 			pi.apply_discount_on = "Grand Total"
 			pi.discount_amount = args.total_discount
 			pi.save()
-
 		#adjust payment amount to match with grand total calculated
 		calc_total = 0
 		adj = 0
@@ -344,14 +338,12 @@ def create_purchase_invoice(**args):
 			adj = 0
 		pi.imported_grand_total = calc_total
 		pi.save()
-
 		return pi.name
 	except Exception as e:
 		frappe.log_error(message=e, title="Create Purchase Invoice: " + args.bill_no + "File Name: " + args.file_name)
 		return None
 
 def get_country(code):
-
 	existing_country_name = frappe.db.get_value("Country",
 			filters={"code": code}, fieldname="name")
 	if existing_country_name:
@@ -360,7 +352,6 @@ def get_country(code):
 		frappe.throw(_("Country Code in File does not match with country code set up in the system"))
 
 def create_uom(uom):
-
 	existing_uom = frappe.db.get_value("UOM",
 			filters={"uom_name": uom}, fieldname="uom_name")
 	if existing_uom:

From c3bb04ccb8283356b6b5ebd2a9915c65f937ebd6 Mon Sep 17 00:00:00 2001
From: Pawan Mehta <pawan@openetech.com>
Date: Mon, 2 Dec 2019 15:27:19 +0530
Subject: [PATCH 121/193] code improvements

---
 .../import_supplier_invoice.py                | 271 ++++++++++--------
 1 file changed, 153 insertions(+), 118 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 43c6454e4da..62a5329dbb9 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -28,16 +28,10 @@ class ImportSupplierInvoice(Document):
 			self.name = "Import Invoice on " + format_datetime(self.creation)
 
 	def import_xml_data(self):
+		pi_count = 0
 		import_file = frappe.get_doc("File", {"file_url": self.zip_file})
 		self.publish("File Import", _("Processing XML Files"), 1, 3)
 
-		pi_count = 0
-		mop_options = frappe.get_meta('Mode of Payment').fields[4].options
-		mop_str = re.sub('\n', ',', mop_options)
-		mop_dict = dict(item.split("-") for item in mop_str.split(","))
-
-		default_uom = frappe.db.get_value("Stock Settings", fieldname="stock_uom")
-
 		with zipfile.ZipFile(get_full_path(self.zip_file)) as zf:
 			file_count = 0
 			for file_name in zf.namelist():
@@ -56,126 +50,26 @@ class ImportSupplierInvoice(Document):
 
 				file_content = bs(content, "xml")
 
-				for line in file_content.find_all("DatiTrasmissione"):
-					destination_code = line.CodiceDestinatario.text
-
-				#read address information from file
 				for line in file_content.find_all("DatiGeneraliDocumento"):
 					document_type = line.TipoDocumento.text
 					bill_date = dateutil.parser.parse(line.Data.text).strftime("%Y-%m-%d")
 					invoice_no = line.Numero.text
 					if len(invoice_no) != 0:
-						for line in file_content.find_all("CedentePrestatore"):
-							tax_id = line.DatiAnagrafici.IdPaese.text + line.DatiAnagrafici.IdCodice.text
-							if line.find("CodiceFiscale"):
-								fiscal_code = line.DatiAnagrafici.CodiceFiscale.text
-							else:
-								fiscal_code = ""
-							if line.find("RegimeFiscale"):
-								fiscal_regime = line.DatiAnagrafici.RegimeFiscale.text
-							else:
-								fiscal_regime = ""
-							if line.find("Denominazione"):
-								supplier = line.DatiAnagrafici.Anagrafica.Denominazione.text
-							if line.find("Nome"):
-								supplier = line.DatiAnagrafici.Anagrafica.Nome.text + " " + line.DatiAnagrafici.Anagrafica.Cognome.text
-							address_line1 = line.Sede.Indirizzo.text
-							city = line.Sede.Comune.text
-							if line.find("Provincia"):
-								province = line.Sede.Provincia.text
-							else:
-								province = ""
-							pin_code = line.Sede.CAP.text
-							country = get_country(line.Sede.Nazione.text)
-
 						total_discount = 0
 
-						#read item information from file
-						for line in file_content.find_all("DettaglioLinee"):
-							if line.find("PrezzoUnitario") and line.find("PrezzoTotale"):
-								unit_rate = flt(line.PrezzoUnitario.text) or 0
-								line_total = flt(line.PrezzoTotale.text) or 0
+						supp_dict = get_supplier_info_from_file(file_content)
+						destination_code = get_destination_code_from_file(file_content)
+						items, return_invoice, total_discount = get_item_from_file(file_content, self.item_code)
+						taxes = get_taxes_from_file(file_content, self.tax_account)
+						terms = get_payment_terms_from_file(file_content)
 
-								if (unit_rate == 0.0):
-									qty = 1.0
-									uom = default_uom
-									rate = tax_rate = 0
-								else:
-									if (line_total / unit_rate) == 1.0:
-										qty = 1.0
-										uom = default_uom
-									else:
-										if line.find("Quantita"):
-											qty = flt(line.Quantita.text) or 0
-											if line.find("UnitaMisura"):
-												uom = create_uom(line.UnitaMisura.text)
-											else:
-												uom = default_uom
+						supplier_name = create_supplier(supplier = supp_dict.get('supplier'), supplier_group = self.supplier_group, 
+											tax_id = supp_dict.get('tax_id'), fiscal_code = supp_dict.get('fiscal_code'),
+											fiscal_regime = supp_dict.get('fiscal_regime'))
 
-									if (unit_rate < 0 and line_total < 0):
-										qty *= -1
-										return_invoice = 1
-									else:
-										return_invoice = 0
-
-									rate = unit_rate
-									if line.find("AliquotaIVA"):
-										tax_rate = flt(line.AliquotaIVA.text)
-
-								line_str = re.sub('[^A-Za-z0-9]+', '-', line.Descrizione.text)
-								item_name = line_str[0:140]
-								items.append({
-												"item_code": self.item_code,
-												"item_name": item_name,
-												"description": line_str,
-												"qty": qty,
-												"uom": uom,
-												"rate": rate,
-												"conversion_factor": 1.0,
-												"tax_rate": tax_rate
-											})
-
-								for disc_line in line.find_all("ScontoMaggiorazione"):
-									if disc_line.find("Percentuale"):
-										discount = flt(disc_line.Percentuale.text) or 0
-										total_discount += flt((discount / 100) * (rate * qty))
-
-						#read taxes from file
-						for line in file_content.find_all("DatiRiepilogo"):
-							if line.find("AliquotaIVA"):
-								if line.find("EsigibilitaIVA"):
-									descr = line.EsigibilitaIVA.text
-								else:
-									descr = "None"
-								taxes.append({
-									"charge_type": "Actual",
-									"account_head": self.tax_account,
-									"tax_rate": flt(line.AliquotaIVA.text) or 0,
-									"description": descr,
-									"tax_amount": flt(line.Imposta.text) if len(line.find("Imposta"))!=0 else 0
-								})
-
-						#read payment data from file
-						for line in file_content.find_all("DettaglioPagamento"):
-							mop_code = line.ModalitaPagamento.text + '-' + mop_dict.get(line.ModalitaPagamento.text)
-							if line.find("DataScadenzaPagamento"):
-								due_date = dateutil.parser.parse(line.DataScadenzaPagamento.text).strftime("%Y-%m-%d")
-							else:
-								due_date = today()
-							terms.append({
-											"mode_of_payment_code": mop_code,
-											"bank_account_iban": line.IBAN.text if line.find("IBAN") else "",
-											"due_date": due_date,
-											"payment_amount": line.ImportoPagamento.text
-							})
-
-						supplier_name = create_supplier(supplier = supplier, supplier_group = self.supplier_group, 
-											tax_id = tax_id, fiscal_code = fiscal_code,
-											fiscal_regime = fiscal_regime)
-
-						address = create_address(supplier_name = supplier_name, address_line1 = address_line1, 
-									city = city, province = province, 
-									pin_code = pin_code, country = country)
+						address = create_address(supplier_name = supplier_name, address_line1 = supp_dict.get('address_line1'), 
+									city = supp_dict.get('city'), province = supp_dict.get('province'), 
+									pin_code = supp_dict.get('pin_code'), country = supp_dict.get('country'))
 
 						pi_name = create_purchase_invoice(company = self.company, naming_series = self.invoice_series,
 									supplier_name = supplier_name, bill_no = invoice_no,document_type = document_type, 
@@ -206,6 +100,147 @@ class ImportSupplierInvoice(Document):
 	def publish(self, title, message, count, total):
 		frappe.publish_realtime("import_invoice_update", {"title": title, "message": message, "count": count, "total": total})
 
+def get_supplier_info_from_file(file_content):
+	supplier_info = {}
+	for line in file_content.find_all("CedentePrestatore"):
+		tax_id = line.DatiAnagrafici.IdPaese.text + line.DatiAnagrafici.IdCodice.text
+		if line.find("CodiceFiscale"):
+			fiscal_code = line.DatiAnagrafici.CodiceFiscale.text
+		else:
+			fiscal_code = ""
+		if line.find("RegimeFiscale"):
+			fiscal_regime = line.DatiAnagrafici.RegimeFiscale.text
+		else:
+			fiscal_regime = ""
+		if line.find("Denominazione"):
+			supplier = line.DatiAnagrafici.Anagrafica.Denominazione.text
+		if line.find("Nome"):
+			supplier = line.DatiAnagrafici.Anagrafica.Nome.text + " " + line.DatiAnagrafici.Anagrafica.Cognome.text
+		address_line1 = line.Sede.Indirizzo.text
+		city = line.Sede.Comune.text
+		if line.find("Provincia"):
+			province = line.Sede.Provincia.text
+		else:
+			province = ""
+		pin_code = line.Sede.CAP.text
+		country = get_country(line.Sede.Nazione.text)
+		#set the dict values
+		supplier_info['tax_id'] = tax_id
+		supplier_info['fiscal_code'] = fiscal_code
+		supplier_info['fiscal_regime'] = fiscal_regime
+		supplier_info['supplier'] = supplier
+		supplier_info['address_line1'] = address_line1
+		supplier_info['city'] = city
+		supplier_info['province'] = province
+		supplier_info['pin_code'] = pin_code
+		supplier_info['country'] = country
+
+		return supplier_info
+
+def get_item_from_file(file_content, item_code):
+	items = []
+	total_discount = 0
+	default_uom = frappe.db.get_value("Stock Settings", fieldname="stock_uom")
+	#read file for item information
+	for line in file_content.find_all("DettaglioLinee"):
+		if line.find("PrezzoUnitario") and line.find("PrezzoTotale"):
+			unit_rate = flt(line.PrezzoUnitario.text) or 0
+			line_total = flt(line.PrezzoTotale.text) or 0
+
+			if (unit_rate == 0.0):
+				qty = 1.0
+				uom = default_uom
+				rate = tax_rate = 0
+			else:
+				if (line_total / unit_rate) == 1.0:
+					qty = 1.0
+					uom = default_uom
+				else:
+					if line.find("Quantita"):
+						qty = flt(line.Quantita.text) or 0
+						if line.find("UnitaMisura"):
+							uom = create_uom(line.UnitaMisura.text)
+						else:
+							uom = default_uom
+
+				if (unit_rate < 0 and line_total < 0):
+					qty *= -1
+					return_invoice = 1
+					unit_rate *= -1
+				else:
+					return_invoice = 0
+
+				rate = unit_rate
+				if line.find("AliquotaIVA"):
+					tax_rate = flt(line.AliquotaIVA.text)
+
+			line_str = re.sub('[^A-Za-z0-9]+', '-', line.Descrizione.text)
+			item_name = line_str[0:140]
+			items.append({
+							"item_code": item_code,
+							"item_name": item_name,
+							"description": line_str,
+							"qty": qty,
+							"uom": uom,
+							"rate": rate,
+							"conversion_factor": 1.0,
+							"tax_rate": tax_rate
+						})
+
+			for disc_line in line.find_all("ScontoMaggiorazione"):
+				if disc_line.find("Percentuale"):
+					discount = flt(disc_line.Percentuale.text) or 0
+					total_discount += flt((discount / 100) * (rate * qty))
+
+	return items, return_invoice, total_discount
+
+def get_taxes_from_file(file_content, tax_account):
+	taxes = []
+	#read file for taxes information
+	for line in file_content.find_all("DatiRiepilogo"):
+		if line.find("AliquotaIVA"):
+			if line.find("EsigibilitaIVA"):
+				descr = line.EsigibilitaIVA.text
+			else:
+				descr = "None"
+			taxes.append({
+				"charge_type": "Actual",
+				"account_head": tax_account,
+				"tax_rate": flt(line.AliquotaIVA.text) or 0,
+				"description": descr,
+				"tax_amount": flt(line.Imposta.text) if len(line.find("Imposta"))!=0 else 0
+			})
+
+	return taxes
+
+def get_payment_terms_from_file(file_content):
+	terms = []
+	#Get mode of payment dict from setup
+	mop_options = frappe.get_meta('Mode of Payment').fields[4].options
+	mop_str = re.sub('\n', ',', mop_options)
+	mop_dict = dict(item.split("-") for item in mop_str.split(","))
+	#read file for payment information
+	for line in file_content.find_all("DettaglioPagamento"):
+		mop_code = line.ModalitaPagamento.text + '-' + mop_dict.get(line.ModalitaPagamento.text)
+		if line.find("DataScadenzaPagamento"):
+			due_date = dateutil.parser.parse(line.DataScadenzaPagamento.text).strftime("%Y-%m-%d")
+		else:
+			due_date = today()
+		terms.append({
+						"mode_of_payment_code": mop_code,
+						"bank_account_iban": line.IBAN.text if line.find("IBAN") else "",
+						"due_date": due_date,
+						"payment_amount": line.ImportoPagamento.text
+		})
+
+	return terms
+
+def get_destination_code_from_file(file_content):
+	for line in file_content.find_all("DatiTrasmissione"):
+		destination_code = line.CodiceDestinatario.text
+
+	return destination_code
+
 def create_supplier(**args):
 	args = frappe._dict(args)
 	existing_supplier_name = frappe.db.get_value("Supplier",

From bc40161d08ad683f71dafd925f50152f9da4768c Mon Sep 17 00:00:00 2001
From: Pawan Mehta <pawan@openetech.com>
Date: Wed, 4 Dec 2019 17:28:48 +0530
Subject: [PATCH 122/193] add ignore mandatory flag

---
 .../import_supplier_invoice/import_supplier_invoice.py    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 62a5329dbb9..15e6344fa70 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -269,7 +269,7 @@ def create_supplier(**args):
 				"link_doctype": "Supplier",
 				"link_name": existing_supplier_name
 			})
-			new_contact.insert()
+			new_contact.insert(ignore_mandatory=True)
 
 		return existing_supplier_name
 	else:
@@ -289,7 +289,7 @@ def create_supplier(**args):
 			"link_name": new_supplier.name
 		})
 
-		new_contact.insert()
+		new_contact.insert(ignore_mandatory=True)
 
 		return new_supplier.name
 
@@ -327,7 +327,7 @@ def create_address(**args):
 			"link_name": args.supplier_name
 		})
 		new_address_doc.address_type = "Billing"
-		new_address_doc.insert()
+		new_address_doc.insert(ignore_mandatory=True)
 		return new_address_doc.name
 	else:
 		return None
@@ -351,7 +351,7 @@ def create_purchase_invoice(**args):
 
 	try:
 		pi.set_missing_values()
-		pi.insert(ignore_permissions=True)
+		pi.insert(ignore_mandatory=True)
 		#if discount exists in file, apply any discount on grand total
 		if args.total_discount > 0:
 			pi.apply_discount_on = "Grand Total"

From 2c13a0533b652e0b020c0557501a4a730f42c3fd Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Tue, 10 Dec 2019 17:07:03 +0530
Subject: [PATCH 123/193] code cleanup

---
 erpnext/patches.txt                           |   1 +
 .../v12_0/set_permission_einvoicing.py        |   3 +
 .../import_supplier_invoice.js                |  15 +-
 .../import_supplier_invoice.json              |  20 +-
 .../import_supplier_invoice.py                | 307 ++++++++----------
 5 files changed, 179 insertions(+), 167 deletions(-)

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 89be499f6f3..6d15d5432d9 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -653,3 +653,4 @@ erpnext.patches.v12_0.set_employee_preferred_emails
 erpnext.patches.v12_0.set_against_blanket_order_in_sales_and_purchase_order
 erpnext.patches.v12_0.set_cost_center_in_child_table_of_expense_claim
 erpnext.patches.v12_0.set_lead_title_field
+erpnext.patches.v12_0.set_permission_einvoicing
diff --git a/erpnext/patches/v12_0/set_permission_einvoicing.py b/erpnext/patches/v12_0/set_permission_einvoicing.py
index c01f34a70d2..1095c8c43e7 100644
--- a/erpnext/patches/v12_0/set_permission_einvoicing.py
+++ b/erpnext/patches/v12_0/set_permission_einvoicing.py
@@ -1,4 +1,5 @@
 import frappe
+from erpnext.regional.italy.setup import make_custom_fields
 from frappe.permissions import add_permission, update_permission_property
 
 def execute():
@@ -7,6 +8,8 @@ def execute():
 	if not company:
 		return
 
+	make_custom_fields()
+
 	add_permission('Import Supplier Invoice', 'Accounts Manager', 0)
 	update_permission_property('Import Supplier Invoice', 'Accounts Manager', 0, 'write', 1)
 	update_permission_property('Import Supplier Invoice', 'Accounts Manager', 0, 'create', 1)
\ No newline at end of file
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
index bbc0f92cc7b..9f1a092d175 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
@@ -11,9 +11,20 @@ frappe.ui.form.on('Import Supplier Invoice', {
 		});
 	},
 	setup: function(frm) {
-		frm.set_query("tax_account", function() {
+		frm.set_query("tax_account", function(doc) {
 			return {
-				filters: { account_type: 'Tax' }
+				filters: {
+					account_type: 'Tax',
+					company: doc.company
+				}
+			};
+		});
+
+		frm.set_query("default_buying_price_list", function(doc) {
+			return {
+				filters: {
+					currency: frappe.get_doc(":Company", doc.company).default_currency
+				}
 			};
 		});
 	}
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
index aabf9de3cdf..59e955c23f4 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-10-15 12:33:21.845329",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -7,9 +8,11 @@
   "invoice_series",
   "company",
   "item_code",
+  "column_break_5",
   "supplier_group",
   "tax_account",
-  "column_break_5",
+  "default_buying_price_list",
+  "upload_xml_invoices_section",
   "zip_file",
   "import_invoices",
   "status"
@@ -75,9 +78,22 @@
    "label": "Invoice Series",
    "options": "ACC-PINV-.YYYY.-",
    "reqd": 1
+  },
+  {
+   "fieldname": "default_buying_price_list",
+   "fieldtype": "Link",
+   "label": "Default Buying Price List",
+   "options": "Price List",
+   "reqd": 1
+  },
+  {
+   "fieldname": "upload_xml_invoices_section",
+   "fieldtype": "Section Break",
+   "label": "Upload XML Invoices"
   }
  ],
- "modified": "2019-10-19 00:15:11.404733",
+ "links": [],
+ "modified": "2019-12-10 16:37:26.793398",
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "Import Supplier Invoice",
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 15e6344fa70..1d21d397984 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -8,13 +8,13 @@ import json
 import re
 import traceback
 import zipfile
-import frappe
+import frappe, erpnext
 from frappe import _
 from frappe.model.document import Document
 from frappe.custom.doctype.custom_field.custom_field import create_custom_field
 from frappe.utils.data import format_datetime
 from bs4 import BeautifulSoup as bs
-from frappe.utils import cint, flt, today, nowdate, add_days, get_files_path
+from frappe.utils import cint, flt, today, nowdate, add_days, get_files_path, get_datetime_str
 import dateutil
 from frappe.utils.file_manager import save_file
 
@@ -28,61 +28,20 @@ class ImportSupplierInvoice(Document):
 			self.name = "Import Invoice on " + format_datetime(self.creation)
 
 	def import_xml_data(self):
-		pi_count = 0
 		import_file = frappe.get_doc("File", {"file_url": self.zip_file})
 		self.publish("File Import", _("Processing XML Files"), 1, 3)
 
+		self.file_count = 0
+		self.purchase_invoices_count = 0
+		self.default_uom = frappe.db.get_value("Stock Settings", fieldname="stock_uom")
+
 		with zipfile.ZipFile(get_full_path(self.zip_file)) as zf:
-			file_count = 0
 			for file_name in zf.namelist():
-				items = []
-				taxes = []
-				terms = []
-				encoded_content = zf.read(file_name)
-
-				try:
-					content = encoded_content.decode("utf-8-sig")
-				except UnicodeDecodeError:
-					try:
-						content = encoded_content.decode("utf-16")
-					except UnicodeDecodeError as e:
-						frappe.log_error(message=e, title="UTF-16 encoding error for File Name: " + file_name)
-
+				content = get_file_content(file_name, zf)
 				file_content = bs(content, "xml")
+				self.prepare_data_for_import(file_content, file_name, content)
 
-				for line in file_content.find_all("DatiGeneraliDocumento"):
-					document_type = line.TipoDocumento.text
-					bill_date = dateutil.parser.parse(line.Data.text).strftime("%Y-%m-%d")
-					invoice_no = line.Numero.text
-					if len(invoice_no) != 0:
-						total_discount = 0
-
-						supp_dict = get_supplier_info_from_file(file_content)
-						destination_code = get_destination_code_from_file(file_content)
-						items, return_invoice, total_discount = get_item_from_file(file_content, self.item_code)
-						taxes = get_taxes_from_file(file_content, self.tax_account)
-						terms = get_payment_terms_from_file(file_content)
-
-						supplier_name = create_supplier(supplier = supp_dict.get('supplier'), supplier_group = self.supplier_group, 
-											tax_id = supp_dict.get('tax_id'), fiscal_code = supp_dict.get('fiscal_code'),
-											fiscal_regime = supp_dict.get('fiscal_regime'))
-
-						address = create_address(supplier_name = supplier_name, address_line1 = supp_dict.get('address_line1'), 
-									city = supp_dict.get('city'), province = supp_dict.get('province'), 
-									pin_code = supp_dict.get('pin_code'), country = supp_dict.get('country'))
-
-						pi_name = create_purchase_invoice(company = self.company, naming_series = self.invoice_series,
-									supplier_name = supplier_name, bill_no = invoice_no,document_type = document_type, 
-									bill_date = bill_date,is_return = return_invoice, destination_code = destination_code,
-									total_discount = total_discount, items = items,taxes = taxes, terms = terms,
-									file_name = file_name)
-
-						file_count += 1
-						if pi_name:
-							pi_count += 1
-							file_save = save_file(file_name, encoded_content, "Purchase Invoice", pi_name, folder=None, decode=False, is_private=0, df=None)
-
-		if pi_count == file_count:
+		if self.purchase_invoices_count == self.file_count:
 			self.status = "File Import Completed"
 			self.publish("File Import", _("XML Files Processed"), 2, 3)
 		else:
@@ -92,6 +51,78 @@ class ImportSupplierInvoice(Document):
 		self.save()
 		self.publish("File Import", _("XML Files Processed"), 3, 3)
 
+	def prepare_data_for_import(self, file_content, file_name, encoded_content):
+		for line in file_content.find_all("DatiGeneraliDocumento"):
+			invoices_args = {
+				"company": self.company,
+				"naming_series": self.invoice_series,
+				"document_type": line.TipoDocumento.text,
+				"bill_date": get_datetime_str(line.Data.text),
+				"invoice_no": line.Numero.text,
+				"total_discount": 0,
+				"items": [],
+				"buying_price_list": self.default_buying_price_list
+			}
+
+			if not invoices_args.get("invoice_no", ''): return
+
+			supp_dict = get_supplier_details(file_content)
+			invoices_args["destination_code"] = get_destination_code_from_file(file_content)
+			invoices_args["taxes"] = get_taxes_from_file(file_content, self.tax_account)
+			invoices_args["terms"] = get_payment_terms_from_file(file_content)
+			self.prepare_items_for_invoice(file_content, invoices_args)
+
+			supplier_name = create_supplier(self.supplier_group, supp_dict)
+			address = create_address(supplier_name, supp_dict)
+			pi_name = create_purchase_invoice(supplier_name, file_name, invoices_args)
+
+			self.file_count += 1
+			if pi_name:
+				self.purchase_invoices_count += 1
+				file_save = save_file(file_name, encoded_content, "Purchase Invoice",
+					pi_name, folder=None, decode=False, is_private=0, df=None)
+
+	def prepare_items_for_invoice(self, file_content, invoices_args):
+		qty = 1
+		rate, tax_rate = [0 ,0]
+		uom = self.default_uom
+
+		#read file for item information
+		for line in file_content.find_all("DettaglioLinee"):
+			if line.find("PrezzoUnitario") and line.find("PrezzoTotale"):
+				rate = flt(line.PrezzoUnitario.text) or 0
+				line_total = flt(line.PrezzoTotale.text) or 0
+
+				if rate and flt(line_total) / rate != 1.0 and line.find("Quantita"):
+					qty = flt(line.Quantita.text) or 0
+					if line.find("UnitaMisura"):
+						uom = create_uom(line.UnitaMisura.text)
+
+				if (rate < 0 and line_total < 0):
+					qty *= -1
+					invoices_args["return_invoice"] = 1
+
+				if line.find("AliquotaIVA"):
+					tax_rate = flt(line.AliquotaIVA.text)
+
+				line_str = re.sub('[^A-Za-z0-9]+', '-', line.Descrizione.text)
+				item_name = line_str[0:140]
+
+				invoices_args['items'].append({
+					"item_code": self.item_code,
+					"item_name": item_name,
+					"description": line_str,
+					"qty": qty,
+					"uom": uom,
+					"rate": abs(rate),
+					"conversion_factor": 1.0,
+					"tax_rate": tax_rate
+				})
+
+				for disc_line in line.find_all("ScontoMaggiorazione"):
+					if disc_line.find("Percentuale"):
+						invoices_args["total_discount"] += flt((flt(disc_line.Percentuale.text) / 100) * (rate * qty))
+
 	def process_file_data(self):
 		self.status = "Processing File Data"
 		self.save()
@@ -100,100 +131,47 @@ class ImportSupplierInvoice(Document):
 	def publish(self, title, message, count, total):
 		frappe.publish_realtime("import_invoice_update", {"title": title, "message": message, "count": count, "total": total})
 
-def get_supplier_info_from_file(file_content):
+def get_file_content(file_name, zip_file_object):
+	content = ''
+	encoded_content = zip_file_object.read(file_name)
+
+	try:
+		content = encoded_content.decode("utf-8-sig")
+	except UnicodeDecodeError:
+		try:
+			content = encoded_content.decode("utf-16")
+		except UnicodeDecodeError as e:
+			frappe.log_error(message=e, title="UTF-16 encoding error for File Name: " + file_name)
+
+	return content
+
+def get_supplier_details(file_content):
 	supplier_info = {}
 	for line in file_content.find_all("CedentePrestatore"):
-		tax_id = line.DatiAnagrafici.IdPaese.text + line.DatiAnagrafici.IdCodice.text
+		supplier_info['tax_id'] = line.DatiAnagrafici.IdPaese.text + line.DatiAnagrafici.IdCodice.text
 		if line.find("CodiceFiscale"):
-			fiscal_code = line.DatiAnagrafici.CodiceFiscale.text
-		else:
-			fiscal_code = ""
+			supplier_info['fiscal_code'] = line.DatiAnagrafici.CodiceFiscale.text
+
 		if line.find("RegimeFiscale"):
-			fiscal_regime = line.DatiAnagrafici.RegimeFiscale.text
-		else:
-			fiscal_regime = ""
+			supplier_info['fiscal_regime'] = line.DatiAnagrafici.RegimeFiscale.text
+
 		if line.find("Denominazione"):
-			supplier = line.DatiAnagrafici.Anagrafica.Denominazione.text
+			supplier_info['supplier'] = line.DatiAnagrafici.Anagrafica.Denominazione.text
+
 		if line.find("Nome"):
-			supplier = line.DatiAnagrafici.Anagrafica.Nome.text + " " + line.DatiAnagrafici.Anagrafica.Cognome.text
-		address_line1 = line.Sede.Indirizzo.text
-		city = line.Sede.Comune.text
+			supplier_info['supplier'] = (line.DatiAnagrafici.Anagrafica.Nome.text
+				+ " " + line.DatiAnagrafici.Anagrafica.Cognome.text)
+
+		supplier_info['address_line1'] = line.Sede.Indirizzo.text
+		supplier_info['city'] = line.Sede.Comune.text
 		if line.find("Provincia"):
-			province = line.Sede.Provincia.text
-		else:
-			province = ""
-		pin_code = line.Sede.CAP.text
-		country = get_country(line.Sede.Nazione.text)
-		#set the dict values
-		supplier_info['tax_id'] = tax_id
-		supplier_info['fiscal_code'] = fiscal_code
-		supplier_info['fiscal_regime'] = fiscal_regime
-		supplier_info['supplier'] = supplier
-		supplier_info['address_line1'] = address_line1
-		supplier_info['city'] = city
-		supplier_info['province'] = province
-		supplier_info['pin_code'] = pin_code
-		supplier_info['country'] = country
+			supplier_info['province'] = line.Sede.Provincia.text
+
+		supplier_info['pin_code'] = line.Sede.CAP.text
+		supplier_info['country'] = get_country(line.Sede.Nazione.text)
 
 		return supplier_info
 
-def get_item_from_file(file_content, item_code):
-	items = []
-	total_discount = 0
-	default_uom = frappe.db.get_value("Stock Settings", fieldname="stock_uom")
-	#read file for item information
-	for line in file_content.find_all("DettaglioLinee"):
-		if line.find("PrezzoUnitario") and line.find("PrezzoTotale"):
-			unit_rate = flt(line.PrezzoUnitario.text) or 0
-			line_total = flt(line.PrezzoTotale.text) or 0
-
-			if (unit_rate == 0.0):
-				qty = 1.0
-				uom = default_uom
-				rate = tax_rate = 0
-			else:
-				if (line_total / unit_rate) == 1.0:
-					qty = 1.0
-					uom = default_uom
-				else:
-					if line.find("Quantita"):
-						qty = flt(line.Quantita.text) or 0
-						if line.find("UnitaMisura"):
-							uom = create_uom(line.UnitaMisura.text)
-						else:
-							uom = default_uom
-
-				if (unit_rate < 0 and line_total < 0):
-					qty *= -1
-					return_invoice = 1
-					unit_rate *= -1
-				else:
-					return_invoice = 0
-
-				rate = unit_rate
-				if line.find("AliquotaIVA"):
-					tax_rate = flt(line.AliquotaIVA.text)
-
-			line_str = re.sub('[^A-Za-z0-9]+', '-', line.Descrizione.text)
-			item_name = line_str[0:140]
-			items.append({
-							"item_code": item_code,
-							"item_name": item_name,
-							"description": line_str,
-							"qty": qty,
-							"uom": uom,
-							"rate": rate,
-							"conversion_factor": 1.0,
-							"tax_rate": tax_rate
-						})
-
-			for disc_line in line.find_all("ScontoMaggiorazione"):
-				if disc_line.find("Percentuale"):
-					discount = flt(disc_line.Percentuale.text) or 0
-					total_discount += flt((discount / 100) * (rate * qty))
-
-	return items, return_invoice, total_discount
-
 def get_taxes_from_file(file_content, tax_account):
 	taxes = []
 	#read file for taxes information
@@ -227,22 +205,24 @@ def get_payment_terms_from_file(file_content):
 		else:
 			due_date = today()
 		terms.append({
-						"mode_of_payment_code": mop_code,
-						"bank_account_iban": line.IBAN.text if line.find("IBAN") else "",
-						"due_date": due_date,
-						"payment_amount": line.ImportoPagamento.text
+			"mode_of_payment_code": mop_code,
+			"bank_account_iban": line.IBAN.text if line.find("IBAN") else "",
+			"due_date": due_date,
+			"payment_amount": line.ImportoPagamento.text
 		})
 
 	return terms
 
 def get_destination_code_from_file(file_content):
+	destination_code = ''
 	for line in file_content.find_all("DatiTrasmissione"):
 		destination_code = line.CodiceDestinatario.text
 
 	return destination_code
 
-def create_supplier(**args):
+def create_supplier(supplier_group, args):
 	args = frappe._dict(args)
+
 	existing_supplier_name = frappe.db.get_value("Supplier",
 				filters={"tax_id": args.tax_id}, fieldname="name")
 	if existing_supplier_name:
@@ -258,11 +238,7 @@ def create_supplier(**args):
 				["Dynamic Link", "parenttype", "=", "Contact"]
 			]
 
-		existing_contacts = frappe.get_list("Contact", filters)
-
-		if existing_contacts:
-			pass
-		else:
+		if not frappe.get_list("Contact", filters):
 			new_contact = frappe.new_doc("Contact")
 			new_contact.first_name = args.supplier
 			new_contact.append('links', {
@@ -276,7 +252,7 @@ def create_supplier(**args):
 		
 		new_supplier = frappe.new_doc("Supplier")
 		new_supplier.supplier_name = args.supplier
-		new_supplier.supplier_group = args.supplier_group
+		new_supplier.supplier_group = supplier_group
 		new_supplier.tax_id = args.tax_id
 		new_supplier.fiscal_code = args.fiscal_code
 		new_supplier.fiscal_regime = args.fiscal_regime
@@ -293,11 +269,12 @@ def create_supplier(**args):
 
 		return new_supplier.name
 
-def create_address(**args):
+def create_address(supplier_name, args):
 	args = frappe._dict(args)
+
 	filters = [
 			["Dynamic Link", "link_doctype", "=", "Supplier"],
-			["Dynamic Link", "link_name", "=", args.supplier_name],
+			["Dynamic Link", "link_name", "=", supplier_name],
 			["Dynamic Link", "parenttype", "=", "Address"]
 		]
 
@@ -324,7 +301,7 @@ def create_address(**args):
 
 		new_address_doc.append("links", {
 			"link_doctype": "Supplier",
-			"link_name": args.supplier_name
+			"link_name": supplier_name
 		})
 		new_address_doc.address_type = "Billing"
 		new_address_doc.insert(ignore_mandatory=True)
@@ -332,26 +309,29 @@ def create_address(**args):
 	else:
 		return None
 
-def create_purchase_invoice(**args):
+def create_purchase_invoice(supplier_name, file_name, args):
 	args = frappe._dict(args)
 	pi = frappe.get_doc({
-			"doctype": "Purchase Invoice",
-			"company": args.company,
-			"naming_series": args.naming_series,
-			"supplier": args.supplier_name,
-			"is_return": args.is_return,
-			"posting_date": today(),
-			"bill_no": args.bill_no,
-			"bill_date": args.bill_date,
-			"destination_code": args.destination_code,
-			"document_type": args.document_type,
-			"items": args["items"],
-			"taxes": args["taxes"]
-		})
+		"doctype": "Purchase Invoice",
+		"company": args.company,
+		"currency": erpnext.get_company_currency(args.company),
+		"naming_series": args.naming_series,
+		"supplier": supplier_name,
+		"is_return": args.is_return,
+		"posting_date": today(),
+		"bill_no": args.bill_no,
+		"buying_price_list": args.buying_price_list,
+		"bill_date": args.bill_date,
+		"destination_code": args.destination_code,
+		"document_type": args.document_type,
+		"items": args["items"],
+		"taxes": args["taxes"]
+	})
 
 	try:
 		pi.set_missing_values()
 		pi.insert(ignore_mandatory=True)
+
 		#if discount exists in file, apply any discount on grand total
 		if args.total_discount > 0:
 			pi.apply_discount_on = "Grand Total"
@@ -375,7 +355,8 @@ def create_purchase_invoice(**args):
 		pi.save()
 		return pi.name
 	except Exception as e:
-		frappe.log_error(message=e, title="Create Purchase Invoice: " + args.bill_no + "File Name: " + args.file_name)
+		frappe.log_error(message=e,
+			title="Create Purchase Invoice: " + args.bill_no + "File Name: " + file_name)
 		return None
 
 def get_country(code):

From 6e1ba43c3c3ad5491fe692a1029a6714a7e663a3 Mon Sep 17 00:00:00 2001
From: Pawan Mehta <pawan@openetech.com>
Date: Tue, 10 Dec 2019 23:30:33 +0530
Subject: [PATCH 124/193] code fixes

---
 .../doctype/import_supplier_invoice/import_supplier_invoice.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 1d21d397984..9478ce2b190 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -68,9 +68,9 @@ class ImportSupplierInvoice(Document):
 
 			supp_dict = get_supplier_details(file_content)
 			invoices_args["destination_code"] = get_destination_code_from_file(file_content)
+			self.prepare_items_for_invoice(file_content, invoices_args)
 			invoices_args["taxes"] = get_taxes_from_file(file_content, self.tax_account)
 			invoices_args["terms"] = get_payment_terms_from_file(file_content)
-			self.prepare_items_for_invoice(file_content, invoices_args)
 
 			supplier_name = create_supplier(self.supplier_group, supp_dict)
 			address = create_address(supplier_name, supp_dict)

From 2469fb9e351b23ebdd205fb512424d7d37b323d1 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 26 Dec 2019 13:26:39 +0530
Subject: [PATCH 125/193] fix: rounded total issue

---
 .../import_supplier_invoice.js                    | 15 +++++++++++++++
 .../import_supplier_invoice.py                    |  8 +++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
index 9f1a092d175..c2d6edfc773 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.js
@@ -27,5 +27,20 @@ frappe.ui.form.on('Import Supplier Invoice', {
 				}
 			};
 		});
+	},
+
+	refresh: function(frm) {
+		frm.trigger("toggle_read_only_fields");
+	},
+
+	toggle_read_only_fields: function(frm) {
+		if (in_list(["File Import Completed", "Processing File Data"], frm.doc.status)) {
+			cur_frm.set_read_only();
+			cur_frm.refresh_fields();
+			frm.set_df_property("import_invoices", "hidden", 1);
+		} else {
+			frm.set_df_property("import_invoices", "hidden", 0);
+		}
 	}
+
 });
\ No newline at end of file
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index 9478ce2b190..72fe17fb379 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -74,7 +74,7 @@ class ImportSupplierInvoice(Document):
 
 			supplier_name = create_supplier(self.supplier_group, supp_dict)
 			address = create_address(supplier_name, supp_dict)
-			pi_name = create_purchase_invoice(supplier_name, file_name, invoices_args)
+			pi_name = create_purchase_invoice(supplier_name, file_name, invoices_args, self.name)
 
 			self.file_count += 1
 			if pi_name:
@@ -309,7 +309,7 @@ def create_address(supplier_name, args):
 	else:
 		return None
 
-def create_purchase_invoice(supplier_name, file_name, args):
+def create_purchase_invoice(supplier_name, file_name, args, name):
 	args = frappe._dict(args)
 	pi = frappe.get_doc({
 		"doctype": "Purchase Invoice",
@@ -324,6 +324,7 @@ def create_purchase_invoice(supplier_name, file_name, args):
 		"bill_date": args.bill_date,
 		"destination_code": args.destination_code,
 		"document_type": args.document_type,
+		"disable_rounded_total": 1,
 		"items": args["items"],
 		"taxes": args["taxes"]
 	})
@@ -355,8 +356,9 @@ def create_purchase_invoice(supplier_name, file_name, args):
 		pi.save()
 		return pi.name
 	except Exception as e:
+		frappe.db.set_value("Import Supplier Invoice", name, "status", "Error")
 		frappe.log_error(message=e,
-			title="Create Purchase Invoice: " + args.bill_no + "File Name: " + file_name)
+			title="Create Purchase Invoice: " + args.get("bill_no") + "File Name: " + file_name)
 		return None
 
 def get_country(code):

From e6387f9dca2ce99de868ff0cd1ac4f610d7b90ae Mon Sep 17 00:00:00 2001
From: Robin Rosenstock <robin@erp.lan>
Date: Thu, 26 Dec 2019 08:09:47 +0000
Subject: [PATCH 126/193] fix to issue #20089

---
 erpnext/stock/report/stock_ledger/stock_ledger.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 36fdcfdc737..fc49db50888 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -51,10 +51,10 @@ def execute(filters=None):
 				finished_product = frappe.db.get_value("Work Order", work_order, "item_name")
 				finished_qty = fg_completed_qty
 
-			sle.update({
-				"finished_product": finished_product,
-				"finished_qty": finished_qty,
-			})
+				sle.update({
+					"finished_product": finished_product,
+					"finished_qty": finished_qty,
+				})
 
 		data.append(sle)
 

From 6291ca8e40fb30766f4f5d2ba3b0aa9ba0bca5c6 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Thu, 26 Dec 2019 13:55:35 +0530
Subject: [PATCH 127/193] fix: only show doctypes which impact accounting in
 accounting period

---
 .../accounts/doctype/accounting_period/accounting_period.py   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.py b/erpnext/accounts/doctype/accounting_period/accounting_period.py
index 180460c091c..f48d6dfc953 100644
--- a/erpnext/accounts/doctype/accounting_period/accounting_period.py
+++ b/erpnext/accounts/doctype/accounting_period/accounting_period.py
@@ -41,8 +41,8 @@ class AccountingPeriod(Document):
 
 	def get_doctypes_for_closing(self):
 		docs_for_closing = []
-		doctypes = ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Payroll Entry", "Bank Reconciliation",
-			"Asset", "Purchase Order", "Sales Order", "Leave Application", "Leave Allocation", "Stock Entry"]
+		doctypes = ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Payroll Entry", \
+			"Bank Reconciliation", "Asset", "Stock Entry"]
 		closed_doctypes = [{"document_type": doctype, "closed": 1} for doctype in doctypes]
 		for closed_doctype in closed_doctypes:
 			docs_for_closing.append(closed_doctype)

From 81d08615068564101b99a52b47ffb70633b6e552 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Thu, 26 Dec 2019 13:15:52 +0530
Subject: [PATCH 128/193] fix: undefined dr_or_cr_notes in case of party type
 Employee

---
 .../doctype/payment_reconciliation/payment_reconciliation.py    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index d85344e8b7a..2c04a27b0cd 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -23,6 +23,8 @@ class PaymentReconciliation(Document):
 
 		if self.party_type in ["Customer", "Supplier"]:
 			dr_or_cr_notes = self.get_dr_or_cr_notes()
+		else:
+			dr_or_cr_notes = []
 
 		self.add_payment_entries(payment_entries + journal_entries + dr_or_cr_notes)
 

From 8857d87c5bd695a613bbb05a4c8251ed412d44fa Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 26 Dec 2019 17:34:02 +0530
Subject: [PATCH 129/193] fix: Travis

---
 .../set_against_blanket_order_in_sales_and_purchase_order.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py b/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
index 555d8ae7976..3fccbfa7003 100644
--- a/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
+++ b/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
@@ -1,7 +1,10 @@
 import frappe
 def execute():
+
+	frappe.reload_doc('selling', 'doctype', frappe.scrub('Sales Order Item'))
+	frappe.reload_doc('buying', 'doctype', frappe.scrub('Purchase Order Item'))
+
 	for doctype in ['Sales Order Item', 'Purchase Order Item']:
-		frappe.reload_doctype(doctype)
 		frappe.db.sql("""
 			UPDATE `tab{0}`
 			SET against_blanket_order = 1

From 0b9a98ad43391c5aa0424a0aa1d8598335828e9e Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 26 Dec 2019 18:15:13 +0530
Subject: [PATCH 130/193] fix: Add against blanket order field in sales order

---
 .../selling/doctype/sales_order_item/sales_order_item.json  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index aad37d321e9..5a18a31a06d 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -757,6 +757,12 @@
    "fieldname": "additional_notes",
    "fieldtype": "Text",
    "label": "Additional Notes"
+  },
+  {
+   "default": "0",
+   "fieldname": "against_blanket_order",
+   "fieldtype": "Check",
+   "label": "Against Blanket Order"
   }
  ],
  "idx": 1,

From bd1da65098f14ac71bb7709af0ac09c6179c5952 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 26 Dec 2019 18:26:13 +0530
Subject: [PATCH 131/193] fix: Update modified date

---
 erpnext/selling/doctype/sales_order_item/sales_order_item.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 5a18a31a06d..4c8973eb652 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -767,7 +767,7 @@
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-12-11 18:06:26.238169",
+ "modified": "2019-12-12 18:06:26.238169",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order Item",

From 61bd6ccc2b6b002651d92ce628592b4d03b44b7a Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Thu, 26 Dec 2019 18:23:05 +0530
Subject: [PATCH 132/193] fix: travis failing for leave application test

---
 .../doctype/leave_application/test_leave_application.py   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py
index b9c02101f1b..b6216424de5 100644
--- a/erpnext/hr/doctype/leave_application/test_leave_application.py
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.py
@@ -235,8 +235,8 @@ class TestLeaveApplication(unittest.TestCase):
 			frappe.get_doc(dict(
 				doctype = 'Holiday List',
 				holiday_list_name = holiday_list,
-				from_date = date(date.today().year, 1, 1),
-				to_date = date(date.today().year, 12, 31),
+				from_date = add_months(today, -6),
+				to_date = add_months(today, 6),
 				holidays = [
 					dict(holiday_date = today, description = 'Test')
 				]
@@ -597,8 +597,8 @@ def get_leave_period():
 		return frappe.get_doc(dict(
 				name = 'Test Leave Period',
 				doctype = 'Leave Period',
-				from_date = "{0}-12-01".format(now_datetime().year - 1),
-				to_date = "{0}-12-31".format(now_datetime().year),
+				from_date = add_months(nowdate(), -6),
+				to_date = add_months(nowdate(), 6),
 				company = "_Test Company",
 				is_active = 1
 			)).insert()

From 8768d5d396cd818aac656365db78ef7c77449b75 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 27 Dec 2019 12:14:46 +0530
Subject: [PATCH 133/193] fix: fetch opening accumulated depreciation (#20095)

---
 .../assets/report/fixed_asset_register/fixed_asset_register.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
index 57b68b4ed24..14984441d00 100644
--- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
@@ -122,7 +122,7 @@ def get_data(filters):
 		filters=conditions,
 		fields=["name", "asset_name", "department", "cost_center", "purchase_receipt",
 			"asset_category", "purchase_date", "gross_purchase_amount", "location",
-			"available_for_use_date", "status", "purchase_invoice"])
+			"available_for_use_date", "status", "purchase_invoice", "opening_accumulated_depreciation"])
 
 	for asset in assets_record:
 		asset_value = asset.gross_purchase_amount - flt(asset.opening_accumulated_depreciation) \

From 8774c869d759c996637e4a5a1213db85e0de1a2f Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Fri, 27 Dec 2019 12:15:20 +0530
Subject: [PATCH 134/193] fix: first name not fetched from job offer applicant
 name (#20093)

---
 erpnext/hr/doctype/job_offer/job_offer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/hr/doctype/job_offer/job_offer.py b/erpnext/hr/doctype/job_offer/job_offer.py
index ef8004eedb7..32f1b89f49e 100644
--- a/erpnext/hr/doctype/job_offer/job_offer.py
+++ b/erpnext/hr/doctype/job_offer/job_offer.py
@@ -58,7 +58,8 @@ def get_staffing_plan_detail(designation, company, offer_date):
 @frappe.whitelist()
 def make_employee(source_name, target_doc=None):
 	def set_missing_values(source, target):
-		target.personal_email = frappe.db.get_value("Job Applicant", source.job_applicant, "email_id")
+		target.personal_email, target.first_name = frappe.db.get_value("Job Applicant", \
+			source.job_applicant, ["email_id", "applicant_name"])
 	doc = get_mapped_doc("Job Offer", source_name, {
 			"Job Offer": {
 				"doctype": "Employee",

From a99f926a4b23ce4d1c2fb65cff833eef5177902a Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Fri, 27 Dec 2019 12:21:15 +0530
Subject: [PATCH 135/193] fix: incorrect validation for scrap items (#20109)

---
 erpnext/stock/doctype/stock_entry/stock_entry.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 47f6cf64f53..18af062147f 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -585,12 +585,18 @@ class StockEntry(StockController):
 
 	def validate_finished_goods(self):
 		"""validation: finished good quantity should be same as manufacturing quantity"""
+		if not self.work_order: return
+
 		items_with_target_warehouse = []
 		allowance_percentage = flt(frappe.db.get_single_value("Manufacturing Settings",
 			"overproduction_percentage_for_work_order"))
 
+		production_item, wo_qty = frappe.db.get_value("Work Order",
+			self.work_order, ["production_item", "qty"])
+
 		for d in self.get('items'):
-			if self.purpose != "Send to Subcontractor" and d.bom_no and flt(d.transfer_qty) > flt(self.fg_completed_qty) and (d.t_warehouse != getattr(self, "pro_doc", frappe._dict()).scrap_warehouse):
+			if (self.purpose != "Send to Subcontractor" and d.bom_no
+				and flt(d.transfer_qty) > flt(self.fg_completed_qty) and d.item_code == production_item):
 				frappe.throw(_("Quantity in row {0} ({1}) must be same as manufactured quantity {2}"). \
 					format(d.idx, d.transfer_qty, self.fg_completed_qty))
 
@@ -598,9 +604,6 @@ class StockEntry(StockController):
 				items_with_target_warehouse.append(d.item_code)
 
 		if self.work_order and self.purpose == "Manufacture":
-			production_item, wo_qty = frappe.db.get_value("Work Order",
-				self.work_order, ["production_item", "qty"])
-
 			allowed_qty = wo_qty + (allowance_percentage/100 * wo_qty)
 			if self.fg_completed_qty > allowed_qty:
 				frappe.throw(_("For quantity {0} should not be grater than work order quantity {1}")

From e944f7ac05afa2baad38c20567226d23dadba985 Mon Sep 17 00:00:00 2001
From: Rohan <Alchez@users.noreply.github.com>
Date: Fri, 27 Dec 2019 12:34:36 +0530
Subject: [PATCH 136/193] fix: Add Serial No button prompt (#20099)

---
 erpnext/public/js/utils/serial_no_batch_selector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 61a693933f6..e64d5458b30 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -139,7 +139,7 @@ erpnext.SerialNoBatchSelector = Class.extend({
 				this.dialog.set_value('serial_no', d.serial_no);
 			}
 
-			if (d.batch_no) {
+			if (d.has_batch_no && d.batch_no) {
 				this.frm.doc.items.forEach(data => {
 					if(data.item_code == d.item_code) {
 						this.dialog.fields_dict.batches.df.data.push({

From 616431d7c3e64ef4057c2a97dfeb5585aef6caa5 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Fri, 27 Dec 2019 12:35:58 +0530
Subject: [PATCH 137/193] fix: incorrect reorder level in stock balance report
 (#20111)

---
 erpnext/stock/report/stock_balance/stock_balance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index a74253e8722..ccba8b0e239 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -55,7 +55,7 @@ def execute(filters=None):
 				'item_code': item,
 				'warehouse': warehouse,
 				'company': company,
-				'reorder_level': item_reorder_qty,
+				'reorder_level': item_reorder_level,
 				'reorder_qty': item_reorder_qty,
 			}
 			report_data.update(item_map[item])

From 467dba1954436c7ef9135726cb3ce81928a13ddd Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Fri, 27 Dec 2019 12:58:19 +0530
Subject: [PATCH 138/193] fix: Patch incorrect GST category in invoices
 (#20084)

* fix: Patch to set GST category for unregistered invoice

* fix: Move patch up in line
---
 erpnext/patches.txt                          |  1 +
 erpnext/patches/v12_0/update_gst_category.py | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 erpnext/patches/v12_0/update_gst_category.py

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 6d15d5432d9..1e80b2beaf8 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -586,6 +586,7 @@ erpnext.patches.v11_0.add_permissions_in_gst_settings
 erpnext.patches.v11_1.setup_guardian_role
 execute:frappe.delete_doc('DocType', 'Notification Control')
 erpnext.patches.v12_0.set_gst_category
+erpnext.patches.v12_0.update_gst_category
 erpnext.patches.v11_0.remove_barcodes_field_from_copy_fields_to_variants
 erpnext.patches.v12_0.set_task_status
 erpnext.patches.v11_0.make_italian_localization_fields # 26-03-2019
diff --git a/erpnext/patches/v12_0/update_gst_category.py b/erpnext/patches/v12_0/update_gst_category.py
new file mode 100644
index 00000000000..963edad150e
--- /dev/null
+++ b/erpnext/patches/v12_0/update_gst_category.py
@@ -0,0 +1,19 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+
+    company = frappe.get_all('Company', filters = {'country': 'India'})
+    if not company:
+        return
+
+    frappe.db.sql(""" UPDATE `tabSales Invoice` set gst_category = 'Unregistered'
+        where gst_category = 'Registered Regular'
+        and ifnull(customer_gstin, '')=''
+        and ifnull(billing_address_gstin,'')=''
+    """)
+
+    frappe.db.sql(""" UPDATE `tabPurchase Invoice` set gst_category = 'Unregistered'
+        where gst_category = 'Registered Regular'
+        and ifnull(supplier_gstin, '')=''
+    """)
\ No newline at end of file

From 7e57ede35b01629f26b8399e654db7c6a671faa8 Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Fri, 27 Dec 2019 13:02:13 +0530
Subject: [PATCH 139/193] fix: unpaid invoices are created even if current
 invoice is paid (#20081)

---
 .../accounts/doctype/subscription/subscription.py    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py
index f13ca4c49e8..54827503759 100644
--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -338,6 +338,16 @@ class Subscription(Document):
 
 		# Check invoice dates and make sure it doesn't have outstanding invoices
 		return getdate(nowdate()) >= getdate(self.current_invoice_start) and not self.has_outstanding_invoice()
+	
+	def is_current_invoice_paid(self):
+		if self.is_new_subscription():
+			return False
+
+		last_invoice = frappe.get_doc('Sales Invoice', self.invoices[-1].invoice)
+		if getdate(last_invoice.posting_date) == getdate(self.current_invoice_start) and last_invoice.status == 'Paid':
+			return True
+		
+		return False
 
 	def process_for_active(self):
 		"""
@@ -348,7 +358,7 @@ class Subscription(Document):
 		2. Change the `Subscription` status to 'Past Due Date'
 		3. Change the `Subscription` status to 'Cancelled'
 		"""
-		if self.is_postpaid_to_invoice() or self.is_prepaid_to_invoice():
+		if not self.is_current_invoice_paid() and (self.is_postpaid_to_invoice() or self.is_prepaid_to_invoice()):
 			self.generate_invoice()
 			if self.current_invoice_is_past_due():
 				self.status = 'Past Due Date'

From c7ce597b7f391db72b834b8644755a7ac9eb1196 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 27 Dec 2019 14:48:14 +0530
Subject: [PATCH 140/193] fix: return when Hub Tracked Item is empty

---
 erpnext/patches/v12_0/set_published_in_hub_tracked_item.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/patches/v12_0/set_published_in_hub_tracked_item.py b/erpnext/patches/v12_0/set_published_in_hub_tracked_item.py
index 7c4c0115847..e54c7f315c6 100644
--- a/erpnext/patches/v12_0/set_published_in_hub_tracked_item.py
+++ b/erpnext/patches/v12_0/set_published_in_hub_tracked_item.py
@@ -3,10 +3,10 @@ import frappe
 
 def execute():
 	frappe.reload_doc("Hub Node", "doctype", "Hub Tracked Item")
-	if frappe.db.a_row_exists("Hub Tracked Item"):
+	if not frappe.db.a_row_exists("Hub Tracked Item"):
 		return
 
 	frappe.db.sql('''
 		Update `tabHub Tracked Item`
 		SET published = 1
-	''')
\ No newline at end of file
+	''')

From 47ab9850e6ce1f76a848f0a6eb1ee50b3bc6d0e1 Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Fri, 27 Dec 2019 15:31:08 +0530
Subject: [PATCH 141/193] fix: Show both warehouse columns in Stock Entry Grid
 view. (#20113)

---
 erpnext/stock/doctype/stock_entry/stock_entry.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 79ce2312f64..38e1bc4723e 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -922,8 +922,6 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 		this.frm.toggle_enable("from_warehouse", doc.purpose!='Material Receipt');
 		this.frm.toggle_enable("to_warehouse", doc.purpose!='Material Issue');
 
-		this.frm.fields_dict["items"].grid.set_column_disp("s_warehouse", doc.purpose!='Material Receipt');
-		this.frm.fields_dict["items"].grid.set_column_disp("t_warehouse", doc.purpose!='Material Issue');
 		this.frm.fields_dict["items"].grid.set_column_disp("retain_sample", doc.purpose=='Material Receipt');
 		this.frm.fields_dict["items"].grid.set_column_disp("sample_quantity", doc.purpose=='Material Receipt');
 

From 2073eeb8fa58d9b0aa1399205d7080bcae473d97 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Fri, 27 Dec 2019 16:26:03 +0530
Subject: [PATCH 142/193] fix: don't allow deletion of items which has work
 order assigned to it

---
 erpnext/controllers/accounts_controller.py         | 9 +++++++--
 erpnext/selling/doctype/sales_order/sales_order.js | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 86f5d53b33c..7faf792d203 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1163,8 +1163,13 @@ def check_and_delete_children(parent, data):
 			deleted_children.append(item)
 
 	for d in deleted_children:
-		if parent.doctype == "Sales Order" and flt(d.delivered_qty):
-			frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been delivered").format(d.idx, d.item_code))
+		if parent.doctype == "Sales Order":
+			if flt(d.delivered_qty):
+				frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been delivered").format(d.idx, d.item_code))
+			if flt(d.work_order_qty):
+				frappe.throw(_("Row #{0}: Cannot delete item {1} which has work order assigned to it.").format(d.idx, d.item_code))
+			if flt(d.ordered_qty):
+				frappe.throw(_("Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order.").format(d.idx, d.item_code))
 
 		if parent.doctype == "Purchase Order" and flt(d.received_qty):
 			frappe.throw(_("Row #{0}: Cannot delete item {1} which has already been received").format(d.idx, d.item_code))
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 2dae0d8063d..cb016a1a744 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -12,7 +12,8 @@ frappe.ui.form.on("Sales Order", {
 			'Material Request': 'Material Request',
 			'Purchase Order': 'Purchase Order',
 			'Project': 'Project',
-			'Payment Entry': "Payment"
+			'Payment Entry': "Payment",
+			'Work Order': "Work Order"
 		}
 		frm.add_fetch('customer', 'tax_id', 'tax_id');
 

From f4fbdf98d1a8c521ef49b3af1d05264531d25c84 Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Fri, 27 Dec 2019 16:53:05 +0530
Subject: [PATCH 143/193] fix: Removed unneccesary Duplicate Entry Error.
 (#20120)

---
 erpnext/stock/doctype/item/item.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 151be110fca..a1f06b29958 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -551,7 +551,7 @@ class Item(WebsiteGenerator):
 						"""select parent from `tabItem Barcode` where barcode = %s and parent != %s""", (item_barcode.barcode, self.name))
 					if duplicate:
 						frappe.throw(_("Barcode {0} already used in Item {1}").format(
-							item_barcode.barcode, duplicate[0][0]), frappe.DuplicateEntryError)
+							item_barcode.barcode, duplicate[0][0]))
 
 					item_barcode.barcode_type = "" if item_barcode.barcode_type not in options else item_barcode.barcode_type
 					if item_barcode.barcode_type and item_barcode.barcode_type.upper() in ('EAN', 'UPC-A', 'EAN-13', 'EAN-8'):

From b2a1ae77ce058d6e1513d598593f9c532b4077f7 Mon Sep 17 00:00:00 2001
From: Ishan Loya <ishanloya@users.noreply.github.com>
Date: Fri, 27 Dec 2019 17:06:34 +0530
Subject: [PATCH 144/193] Remove default BOM filter in Work Order (#20117)

Not all companies use default BOM (e.g. construction companies, etc.)
---
 erpnext/manufacturing/doctype/work_order/work_order.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index 176ca2e4f52..80bd89d5919 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -77,8 +77,7 @@ frappe.ui.form.on("Work Order", {
 			return {
 				query: "erpnext.controllers.queries.item_query",
 				filters:[
-					['is_stock_item', '=',1],
-					['default_bom', '!=', '']
+					['is_stock_item', '=',1]
 				]
 			};
 		});

From 901fe4785c317d7bd05ae5fb89bedb54a652c689 Mon Sep 17 00:00:00 2001
From: Rohan <Alchez@users.noreply.github.com>
Date: Fri, 27 Dec 2019 17:07:35 +0530
Subject: [PATCH 145/193] fix: employee preferred email patch (#20116)

---
 erpnext/patches/v12_0/set_employee_preferred_emails.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/erpnext/patches/v12_0/set_employee_preferred_emails.py b/erpnext/patches/v12_0/set_employee_preferred_emails.py
index 27635612f98..f6eb12e2b9f 100644
--- a/erpnext/patches/v12_0/set_employee_preferred_emails.py
+++ b/erpnext/patches/v12_0/set_employee_preferred_emails.py
@@ -7,10 +7,10 @@ def execute():
 		fields=["name", "prefered_contact_email", "company_email", "personal_email", "user_id"])
 
 	for employee in employees:
-		preferred_email_field = frappe.scrub(employee.prefered_contact_email)
-
-		if not preferred_email_field:
+		if not employee.prefered_contact_email:
 			continue
 
+		preferred_email_field = frappe.scrub(employee.prefered_contact_email)
+
 		preferred_email = employee.get(preferred_email_field)
 		frappe.db.set_value("Employee", employee.name, "prefered_email", preferred_email, update_modified=False)

From 126a63af26295b324d4b0e36dbc36b293b4c1051 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Fri, 27 Dec 2019 17:18:27 +0530
Subject: [PATCH 146/193] chore: Added Reports to Stock Module Desk

---
 erpnext/config/stock.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index e24d7b88df1..03e26b2b863 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -336,6 +336,18 @@ def get_data():
 					"is_query_report": True,
 					"name": "Item Variant Details",
 					"doctype": "Item"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Subcontracted Raw Materials To Be Transferred",
+					"doctype": "Purchase Order"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Subcontracted Item To Be Received",
+					"doctype": "Purchase Order"
 				}
 			]
 		},

From 59a835602ab44bae11b076958ade874bdef03e47 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 30 Dec 2019 11:42:06 +0530
Subject: [PATCH 147/193] fix: service item's cost showing incorrect amount in
 stock entry (#20106)

---
 erpnext/manufacturing/doctype/bom/bom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index f8146bb01e0..7000d30eff0 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -768,7 +768,7 @@ def add_additional_cost(stock_entry, work_order):
 
 	items = {}
 	for d in bom.get(table):
-		items.setdefault(d.item_code, d.rate)
+		items.setdefault(d.item_code, d.amount)
 
 	non_stock_items = frappe.get_all('Item',
 		fields="name", filters={'name': ('in', list(items.keys())), 'ifnull(is_stock_item, 0)': 0}, as_list=1)
@@ -777,7 +777,7 @@ def add_additional_cost(stock_entry, work_order):
 		stock_entry.append('additional_costs', {
 			'expense_account': expenses_included_in_valuation,
 			'description': name[0],
-			'amount': items.get(name[0])
+			'amount': flt(items.get(name[0])) * flt(stock_entry.fg_completed_qty) / flt(bom.quantity)
 		})
 
 @frappe.whitelist()

From fe0adc8b2501a05a2fc803eee1a231f587bad0b2 Mon Sep 17 00:00:00 2001
From: Ishan Loya <ishanloya@users.noreply.github.com>
Date: Mon, 30 Dec 2019 12:19:08 +0530
Subject: [PATCH 148/193] fix: read WIP warehouse from work order (#20131)

* fix: read wip_warehouse from work order in stock entry even if skip transfer is checked

* fix: remove skip_transfer in stock entry

Related to #10753
---
 erpnext/manufacturing/doctype/work_order/work_order.py | 3 +--
 erpnext/stock/doctype/stock_entry/stock_entry.py       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index ff4ebfe8be5..6798dd2de8a 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -684,8 +684,7 @@ def set_work_order_ops(name):
 @frappe.whitelist()
 def make_stock_entry(work_order_id, purpose, qty=None):
 	work_order = frappe.get_doc("Work Order", work_order_id)
-	if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group") \
-			and not work_order.skip_transfer:
+	if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group"):
 		wip_warehouse = work_order.wip_warehouse
 	else:
 		wip_warehouse = None
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 18af062147f..400d1f435ac 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -849,7 +849,7 @@ class StockEntry(StockController):
 								and po.name = %s""",self.purchase_order))
 
 					for item in itervalues(item_dict):
-						if self.pro_doc and (cint(self.pro_doc.from_wip_warehouse) or not self.pro_doc.skip_transfer):
+						if self.pro_doc and cint(self.pro_doc.from_wip_warehouse):
 							item["from_warehouse"] = self.pro_doc.wip_warehouse
 						#Get Reserve Warehouse from PO
 						if self.purchase_order and self.purpose=="Send to Subcontractor":

From 9af557f9d7446da9afef41ab57fa11630ae310fe Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 30 Dec 2019 13:26:47 +0530
Subject: [PATCH 149/193] fix: incorrect batch fetched for the serialized items
 (#20119)

* fix: incorrect batch fetched for the serialized items

* Update stock_controller.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
---
 erpnext/controllers/stock_controller.py       | 12 ++++++++
 erpnext/stock/doctype/batch/batch.py          | 30 ++++++++++++++-----
 .../stock/doctype/stock_entry/stock_entry.py  |  1 +
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 542073ebd76..f4a13d583f5 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -20,6 +20,7 @@ class StockController(AccountsController):
 	def validate(self):
 		super(StockController, self).validate()
 		self.validate_inspection()
+		self.validate_serialized_batch()
 
 	def make_gl_entries(self, gl_entries=None, repost_future_gle=True, from_repost=False):
 		if self.docstatus == 2:
@@ -42,6 +43,17 @@ class StockController(AccountsController):
 			gl_entries = self.get_asset_gl_entry(gl_entries)
 			make_gl_entries(gl_entries, from_repost=from_repost)
 
+	def validate_serialized_batch(self):
+		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+		for d in self.get("items"):
+			if hasattr(d, 'serial_no') and hasattr(d, 'batch_no') and d.serial_no and d.batch_no:
+				serial_nos = get_serial_nos(d.serial_no)
+				for serial_no_data in frappe.get_all("Serial No",
+					filters={"name": ("in", serial_nos)}, fields=["batch_no", "name"]):
+					if serial_no_data.batch_no != d.batch_no:
+						frappe.throw(_("Row #{0}: Serial No {1} does not belong to Batch {2}")
+							.format(d.idx, serial_no_data.name, d.batch_no))
+
 	def get_gl_entries(self, warehouse_account=None, default_expense_account=None,
 			default_cost_center=None):
 
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 0524eee2d53..8ae978eaf05 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -226,16 +226,14 @@ def set_batch_nos(doc, warehouse_field, throw=False):
 		warehouse = d.get(warehouse_field, None)
 		if has_batch_no and warehouse and qty > 0:
 			if not d.batch_no:
-				d.batch_no = get_batch_no(d.item_code, warehouse, qty, throw)
+				d.batch_no = get_batch_no(d.item_code, warehouse, qty, throw, d.serial_no)
 			else:
 				batch_qty = get_batch_qty(batch_no=d.batch_no, warehouse=warehouse)
 				if flt(batch_qty, d.precision("qty")) < flt(qty, d.precision("qty")):
 					frappe.throw(_("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").format(d.idx, d.batch_no, batch_qty, qty))
 
-
-
 @frappe.whitelist()
-def get_batch_no(item_code, warehouse, qty=1, throw=False):
+def get_batch_no(item_code, warehouse, qty=1, throw=False, serial_no=None):
 	"""
 	Get batch number using First Expiring First Out method.
 	:param item_code: `item_code` of Item Document
@@ -245,7 +243,7 @@ def get_batch_no(item_code, warehouse, qty=1, throw=False):
 	"""
 
 	batch_no = None
-	batches = get_batches(item_code, warehouse, qty, throw)
+	batches = get_batches(item_code, warehouse, qty, throw, serial_no)
 
 	for batch in batches:
 		if cint(qty) <= cint(batch.qty):
@@ -260,7 +258,23 @@ def get_batch_no(item_code, warehouse, qty=1, throw=False):
 	return batch_no
 
 
-def get_batches(item_code, warehouse, qty=1, throw=False):
+def get_batches(item_code, warehouse, qty=1, throw=False, serial_no=None):
+	from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+	cond = ''
+	if serial_no:
+		batch = frappe.get_all("Serial No",
+			fields = ["distinct batch_no"],
+			filters= {
+				"item_code": item_code,
+				"warehouse": warehouse,
+				"name": ("in", get_serial_nos(serial_no))
+			}
+		)
+
+		if batch and len(batch) > 1:
+			return []
+
+		cond = " and `tabBatch`.name = %s" %(frappe.db.escape(batch[0].batch_no))
 
 	return frappe.db.sql("""
 		select batch_id, sum(`tabStock Ledger Entry`.actual_qty) as qty
@@ -268,7 +282,7 @@ def get_batches(item_code, warehouse, qty=1, throw=False):
 			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)
+			and (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL) {0}
 		group by batch_id
 		order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC
-	""", (item_code, warehouse), as_dict=True)
\ No newline at end of file
+	""".format(cond), (item_code, warehouse), as_dict=True)
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 400d1f435ac..01d54deadf3 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -75,6 +75,7 @@ class StockEntry(StockController):
 			set_batch_nos(self, 's_warehouse')
 
 		self.set_incoming_rate()
+		self.validate_serialized_batch()
 		self.set_actual_qty()
 		self.calculate_rate_and_amount(update_finished_item_rate=False)
 

From 3ac39ba28ddf7e3796d9a52502081f5bb3ca0119 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 30 Dec 2019 15:18:07 +0530
Subject: [PATCH 150/193] fix: format currency field in bank and cash payment
 voucher print format (#20137)

---
 .../bank_and_cash_payment_voucher.html                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html b/erpnext/accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html
index 69e42c3bdbc..6fe69990513 100644
--- a/erpnext/accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html
+++ b/erpnext/accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html
@@ -49,7 +49,7 @@
             {% endfor %}
             <tr>
                     <td class="right" colspan="3" ><strong>Total (debit) </strong></td>
-                    <td class="left" >{{ gl | sum(attribute='debit') }}</td>
+                    <td class="left" >{{ frappe.format((gl | sum(attribute="debit")), {fieldtype: "Currency"}) }}</td>
             </tr>
             <tr>
                     <td class="top-bottom" colspan="5"><strong>Credit</strong></td>
@@ -69,7 +69,7 @@
             {% endfor %}
             <tr>
                     <td class="right" colspan="3"><strong>Total (credit) </strong></td>
-                    <td class="left" >{{ gl | sum(attribute='credit') }}</td>
+                    <td class="left" >{{ frappe.format((gl | sum(attribute="credit")), {fieldtype: "Currency"}) }}</td>
             </tr>
         </table>
     <div>

From 5483f1a27e20a1a2d97a4697e7bb47e25abd22f3 Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Mon, 30 Dec 2019 22:20:02 +0530
Subject: [PATCH 151/193] fix: Field 'other_charges_calculation' column type
 changed. (#20141)

---
 .../purchase_invoice/purchase_invoice.json    |    4 +-
 .../doctype/sales_invoice/sales_invoice.json  |    6 +-
 .../purchase_order/purchase_order.json        |    4 +-
 .../supplier_quotation.json                   | 3854 ++++-------------
 .../selling/doctype/quotation/quotation.json  |    6 +-
 .../doctype/sales_order/sales_order.json      |    6 +-
 .../doctype/delivery_note/delivery_note.json  |    6 +-
 .../purchase_receipt/purchase_receipt.json    |    4 +-
 8 files changed, 852 insertions(+), 3038 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 3715d774139..7725994c6b0 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -707,7 +707,7 @@
   },
   {
    "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
+   "fieldtype": "Long Text",
    "label": "Taxes and Charges Calculation",
    "no_copy": 1,
    "oldfieldtype": "HTML",
@@ -1290,7 +1290,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
- "modified": "2019-12-24 12:51:58.613538",
+ "modified": "2019-12-30 19:13:49.610538",
  "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 96aceac8cd9..33ee7a2974e 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2013-05-24 19:29:05",
@@ -774,7 +775,7 @@
   },
   {
    "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
+   "fieldtype": "Long Text",
    "label": "Taxes and Charges Calculation",
    "no_copy": 1,
    "oldfieldtype": "HTML",
@@ -1567,7 +1568,8 @@
  "icon": "fa fa-file-text",
  "idx": 181,
  "is_submittable": 1,
- "modified": "2019-10-05 21:39:49.235990",
+ "links": [],
+ "modified": "2019-12-30 19:15:59.580414",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index d4c5acee906..9201eef9b49 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -610,7 +610,7 @@
   },
   {
    "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
+   "fieldtype": "Long Text",
    "label": "Taxes and Charges Calculation",
    "no_copy": 1,
    "oldfieldtype": "HTML",
@@ -1055,7 +1055,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2019-12-24 12:44:13.137194",
+ "modified": "2019-12-30 19:11:54.122264",
  "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 b17bed46c4d..82fc6285bcf 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -1,3060 +1,866 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2013-05-21 16:16:45", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-21 16:16:45",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+  "supplier_section",
+  "title",
+  "naming_series",
+  "supplier",
+  "supplier_name",
+  "column_break1",
+  "transaction_date",
+  "amended_from",
+  "company",
+  "address_section",
+  "supplier_address",
+  "contact_person",
+  "address_display",
+  "contact_display",
+  "contact_mobile",
+  "contact_email",
+  "currency_and_price_list",
+  "currency",
+  "conversion_rate",
+  "cb_price_list",
+  "buying_price_list",
+  "price_list_currency",
+  "plc_conversion_rate",
+  "ignore_pricing_rule",
+  "items_section",
+  "items",
+  "link_to_mrs",
+  "pricing_rule_details",
+  "pricing_rules",
+  "section_break_22",
+  "total_qty",
+  "base_total",
+  "base_net_total",
+  "column_break_24",
+  "total",
+  "net_total",
+  "total_net_weight",
+  "taxes_section",
+  "tax_category",
+  "column_break_36",
+  "shipping_rule",
+  "section_break_38",
+  "taxes_and_charges",
+  "taxes",
+  "tax_breakup",
+  "other_charges_calculation",
+  "totals",
+  "base_taxes_and_charges_added",
+  "base_taxes_and_charges_deducted",
+  "base_total_taxes_and_charges",
+  "column_break_37",
+  "taxes_and_charges_added",
+  "taxes_and_charges_deducted",
+  "total_taxes_and_charges",
+  "section_break_41",
+  "apply_discount_on",
+  "base_discount_amount",
+  "column_break_43",
+  "additional_discount_percentage",
+  "discount_amount",
+  "section_break_46",
+  "base_grand_total",
+  "base_rounding_adjustment",
+  "base_in_words",
+  "base_rounded_total",
+  "column_break4",
+  "grand_total",
+  "rounding_adjustment",
+  "rounded_total",
+  "in_words",
+  "disable_rounded_total",
+  "terms_section_break",
+  "tc_name",
+  "terms",
+  "printing_settings",
+  "select_print_heading",
+  "group_same_items",
+  "column_break_72",
+  "letter_head",
+  "language",
+  "subscription_section",
+  "auto_repeat",
+  "update_auto_repeat_reference",
+  "more_info",
+  "status",
+  "column_break_57",
+  "is_subcontracted",
+  "reference",
+  "opportunity"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-user", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "supplier_section",
+   "fieldtype": "Section Break",
+   "options": "fa fa-user"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "{supplier_name}", 
-   "fieldname": "title", 
-   "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": "Title", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "{supplier_name}",
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Title",
+   "no_copy": 1,
+   "print_hide": 1,
+   "report_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "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, 
-   "oldfieldname": "naming_series", 
-   "oldfieldtype": "Select", 
-   "options": "PUR-SQTN-.YYYY.-", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 1, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "no_copy": 1,
+   "oldfieldname": "naming_series",
+   "oldfieldtype": "Select",
+   "options": "PUR-SQTN-.YYYY.-",
+   "print_hide": 1,
+   "reqd": 1,
+   "set_only_once": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "supplier", 
-   "oldfieldtype": "Link", 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "bold": 1,
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Supplier",
+   "oldfieldname": "supplier",
+   "oldfieldtype": "Link",
+   "options": "Supplier",
+   "print_hide": 1,
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "supplier.supplier_name", 
-   "fieldname": "supplier_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "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
-  }, 
+   "bold": 1,
+   "fetch_from": "supplier.supplier_name",
+   "fieldname": "supplier_name",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Name",
+   "read_only": 1
+  },
   {
-   "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, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "print_width": "50%",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "transaction_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "transaction_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Today",
+   "fieldname": "transaction_date",
+   "fieldtype": "Date",
+   "label": "Date",
+   "oldfieldname": "transaction_date",
+   "oldfieldtype": "Date",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "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": 1, 
-   "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": "Supplier Quotation", 
-   "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
-  }, 
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 1,
+   "label": "Amended From",
+   "no_copy": 1,
+   "oldfieldname": "amended_from",
+   "oldfieldtype": "Data",
+   "options": "Supplier Quotation",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Company",
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "print_hide": 1,
+   "remember_last_selected_value": 1,
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "address_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": "Address and Contact", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "collapsible": 1,
+   "fieldname": "address_section",
+   "fieldtype": "Section Break",
+   "label": "Address and Contact"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Address", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "supplier_address",
+   "fieldtype": "Link",
+   "label": "Supplier Address",
+   "options": "Address",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Contact Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Contact", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "contact_person",
+   "fieldtype": "Link",
+   "label": "Contact Person",
+   "options": "Contact",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address", 
-   "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
-  }, 
+   "fieldname": "address_display",
+   "fieldtype": "Small Text",
+   "label": "Address",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Contact", 
-   "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
-  }, 
+   "fieldname": "contact_display",
+   "fieldtype": "Small Text",
+   "in_global_search": 1,
+   "label": "Contact",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_mobile", 
-   "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": "Mobile No", 
-   "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
-  }, 
+   "fieldname": "contact_mobile",
+   "fieldtype": "Small Text",
+   "label": "Mobile No",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_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": "Contact Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "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
-  }, 
+   "fieldname": "contact_email",
+   "fieldtype": "Data",
+   "label": "Contact Email",
+   "options": "Email",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "currency_and_price_list", 
-   "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": "Currency and Price List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-tag", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "currency_and_price_list",
+   "fieldtype": "Section Break",
+   "label": "Currency and Price List",
+   "options": "fa fa-tag"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "currency", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "currency", 
-   "oldfieldtype": "Select", 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "currency",
+   "fieldtype": "Link",
+   "label": "Currency",
+   "oldfieldname": "currency",
+   "oldfieldtype": "Select",
+   "options": "Currency",
+   "print_hide": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "conversion_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Exchange Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "conversion_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "precision": "9", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "conversion_rate",
+   "fieldtype": "Float",
+   "label": "Exchange Rate",
+   "oldfieldname": "conversion_rate",
+   "oldfieldtype": "Currency",
+   "precision": "9",
+   "print_hide": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb_price_list", 
-   "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, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "cb_price_list",
+   "fieldtype": "Column Break",
+   "print_width": "50%",
    "width": "50%"
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "buying_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, 
-   "print_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, 
-   "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": "buying_price_list", 
-   "fieldname": "price_list_currency", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Price List Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Currency", 
-   "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": 0, 
-   "columns": 0, 
-   "depends_on": "buying_price_list", 
-   "fieldname": "plc_conversion_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Price List Exchange Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "9", 
-   "print_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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "ignore_pricing_rule", 
-   "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": "Ignore Pricing Rule", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 1, 
-   "print_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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "items_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-shopping-cart", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 1, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "items", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "po_details", 
-   "oldfieldtype": "Table", 
-   "options": "Supplier Quotation Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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.docstatus===0 && (doc.items && doc.items.length)", 
-   "fieldname": "link_to_mrs", 
-   "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": "Link to material requests", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pricing_rule_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": "Pricing Rules", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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": "pricing_rules", 
-   "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": "Pricing Rule Detail", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Pricing Rule Detail", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 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, 
-   "print_hide": 0, 
-   "print_hide_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": "total_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Quantity", 
-   "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": "base_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": "Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_net_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": "Net Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "net_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_24", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_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": "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": "Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "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": "net_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": "Net Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "net_total_import", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "total_net_weight", 
-   "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 Net Weight", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes_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": "Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-money", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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_category", 
-   "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": "Tax Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Tax Category", 
-   "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, 
-   "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_36", 
-   "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": "shipping_rule", 
-   "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": "Shipping Rule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Shipping Rule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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_38", 
-   "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, 
-   "description": "", 
-   "fieldname": "taxes_and_charges", 
-   "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": "Purchase Taxes and Charges Template", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "purchase_other_charges", 
-   "oldfieldtype": "Link", 
-   "options": "Purchase Taxes and Charges Template", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Purchase Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "purchase_tax_details", 
-   "oldfieldtype": "Table", 
-   "options": "Purchase Taxes and Charges", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "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": "tax_breakup", 
-   "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": "Tax Breakup", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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": "other_charges_calculation", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Taxes and Charges Calculation", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldtype": "HTML", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "totals", 
-   "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", 
-   "options": "fa fa-money", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_taxes_and_charges_added", 
-   "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": "Taxes and Charges Added (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_added", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "base_taxes_and_charges_deducted", 
-   "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": "Taxes and Charges Deducted (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_deducted", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "base_total_taxes_and_charges", 
-   "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 Taxes and Charges (Company Currency)", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "total_tax", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_37", 
-   "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": "taxes_and_charges_added", 
-   "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": "Taxes and Charges Added", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_added_import", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "taxes_and_charges_deducted", 
-   "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": "Taxes and Charges Deducted", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_deducted_import", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "total_taxes_and_charges", 
-   "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 Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "discount_amount", 
-   "columns": 0, 
-   "fieldname": "section_break_41", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Additional Discount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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": "Grand Total", 
-   "fieldname": "apply_discount_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": "Apply Additional Discount On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nGrand Total\nNet Total", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_discount_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": "Additional Discount Amount (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "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_43", 
-   "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": "additional_discount_percentage", 
-   "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": "Additional Discount Percentage", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "discount_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": "Additional Discount Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "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, 
-   "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_46", 
-   "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": "base_grand_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": "Grand Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "grand_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "base_rounding_adjustment", 
-   "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": "Rounding Adjustment (Company Currency", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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": "base_in_words", 
-   "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": "In Words (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "in_words", 
-   "oldfieldtype": "Data", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "base_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 (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "rounded_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "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": 0, 
-   "columns": 0, 
-   "fieldname": "column_break4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "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": "grand_total", 
-   "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": "Grand Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total_import", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "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": "rounding_adjustment", 
-   "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": "Rounding Adjustment", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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": 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": "in_words", 
-   "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": "In Words", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "in_words_import", 
-   "oldfieldtype": "Data", 
-   "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": 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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "terms", 
-   "columns": 0, 
-   "fieldname": "terms_section_break", 
-   "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": "Terms and Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-legal", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "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": "tc_name", 
-   "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": "Terms", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "tc_name", 
-   "oldfieldtype": "Link", 
-   "options": "Terms and Conditions", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "terms", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Terms and Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "terms", 
-   "oldfieldtype": "Text Editor", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_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": "printing_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": "Printing 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": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "select_print_heading", 
-   "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": "Print Heading", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "select_print_heading", 
-   "oldfieldtype": "Link", 
-   "options": "Print Heading", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "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": "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, 
-   "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_72", 
-   "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": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "letter_head", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Letter Head", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "letter_head", 
-   "oldfieldtype": "Select", 
-   "options": "Letter Head", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "language", 
-   "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": "Print Language", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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": "Auto Repeat 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": "auto_repeat", 
-   "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": "Auto Repeat", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Auto Repeat", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: doc.auto_repeat", 
-   "fieldname": "update_auto_repeat_reference", 
-   "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": "Update Auto Repeat Reference", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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": "more_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "More Information", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-file-text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "status", 
-   "oldfieldtype": "Select", 
-   "options": "\nDraft\nSubmitted\nStopped\nCancelled", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 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": "column_break_57", 
-   "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, 
-   "default": "No", 
-   "fieldname": "is_subcontracted", 
-   "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": "Is Subcontracted", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nYes\nNo", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference", 
-   "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": "Reference", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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": "opportunity", 
-   "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": "Opportunity", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Opportunity", 
-   "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
+  },
+  {
+   "fieldname": "buying_price_list",
+   "fieldtype": "Link",
+   "label": "Price List",
+   "options": "Price List",
+   "print_hide": 1
+  },
+  {
+   "depends_on": "buying_price_list",
+   "fieldname": "price_list_currency",
+   "fieldtype": "Link",
+   "label": "Price List Currency",
+   "options": "Currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "depends_on": "buying_price_list",
+   "fieldname": "plc_conversion_rate",
+   "fieldtype": "Float",
+   "label": "Price List Exchange Rate",
+   "precision": "9",
+   "print_hide": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "ignore_pricing_rule",
+   "fieldtype": "Check",
+   "label": "Ignore Pricing Rule",
+   "no_copy": 1,
+   "permlevel": 1,
+   "print_hide": 1
+  },
+  {
+   "fieldname": "items_section",
+   "fieldtype": "Section Break",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-shopping-cart"
+  },
+  {
+   "allow_bulk_edit": 1,
+   "fieldname": "items",
+   "fieldtype": "Table",
+   "label": "Items",
+   "oldfieldname": "po_details",
+   "oldfieldtype": "Table",
+   "options": "Supplier Quotation Item",
+   "reqd": 1
+  },
+  {
+   "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)",
+   "fieldname": "link_to_mrs",
+   "fieldtype": "Button",
+   "label": "Link to material requests"
+  },
+  {
+   "fieldname": "pricing_rule_details",
+   "fieldtype": "Section Break",
+   "label": "Pricing Rules"
+  },
+  {
+   "fieldname": "pricing_rules",
+   "fieldtype": "Table",
+   "label": "Pricing Rule Detail",
+   "options": "Pricing Rule Detail",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_22",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "total_qty",
+   "fieldtype": "Float",
+   "label": "Total Quantity",
+   "read_only": 1
+  },
+  {
+   "fieldname": "base_total",
+   "fieldtype": "Currency",
+   "label": "Total (Company Currency)",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "base_net_total",
+   "fieldtype": "Currency",
+   "label": "Net Total (Company Currency)",
+   "no_copy": 1,
+   "oldfieldname": "net_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_24",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "total",
+   "fieldtype": "Currency",
+   "label": "Total",
+   "options": "currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "net_total",
+   "fieldtype": "Currency",
+   "label": "Net Total",
+   "oldfieldname": "net_total_import",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "total_net_weight",
+   "fieldtype": "Float",
+   "label": "Total Net Weight",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "taxes_section",
+   "fieldtype": "Section Break",
+   "label": "Taxes and Charges",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-money"
+  },
+  {
+   "fieldname": "tax_category",
+   "fieldtype": "Link",
+   "label": "Tax Category",
+   "options": "Tax Category",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "column_break_36",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "shipping_rule",
+   "fieldtype": "Link",
+   "label": "Shipping Rule",
+   "options": "Shipping Rule"
+  },
+  {
+   "fieldname": "section_break_38",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "taxes_and_charges",
+   "fieldtype": "Link",
+   "label": "Purchase Taxes and Charges Template",
+   "no_copy": 1,
+   "oldfieldname": "purchase_other_charges",
+   "oldfieldtype": "Link",
+   "options": "Purchase Taxes and Charges Template",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "taxes",
+   "fieldtype": "Table",
+   "label": "Purchase Taxes and Charges",
+   "oldfieldname": "purchase_tax_details",
+   "oldfieldtype": "Table",
+   "options": "Purchase Taxes and Charges"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "tax_breakup",
+   "fieldtype": "Section Break",
+   "label": "Tax Breakup"
+  },
+  {
+   "fieldname": "other_charges_calculation",
+   "fieldtype": "Long Text",
+   "label": "Taxes and Charges Calculation",
+   "no_copy": 1,
+   "oldfieldtype": "HTML",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "totals",
+   "fieldtype": "Section Break",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-money"
+  },
+  {
+   "fieldname": "base_taxes_and_charges_added",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Added (Company Currency)",
+   "oldfieldname": "other_charges_added",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "base_taxes_and_charges_deducted",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Deducted (Company Currency)",
+   "oldfieldname": "other_charges_deducted",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "base_total_taxes_and_charges",
+   "fieldtype": "Currency",
+   "label": "Total Taxes and Charges (Company Currency)",
+   "no_copy": 1,
+   "oldfieldname": "total_tax",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_37",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "taxes_and_charges_added",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Added",
+   "oldfieldname": "other_charges_added_import",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "taxes_and_charges_deducted",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Deducted",
+   "oldfieldname": "other_charges_deducted_import",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "total_taxes_and_charges",
+   "fieldtype": "Currency",
+   "label": "Total Taxes and Charges",
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "collapsible": 1,
+   "collapsible_depends_on": "discount_amount",
+   "fieldname": "section_break_41",
+   "fieldtype": "Section Break",
+   "label": "Additional Discount"
+  },
+  {
+   "default": "Grand Total",
+   "fieldname": "apply_discount_on",
+   "fieldtype": "Select",
+   "label": "Apply Additional Discount On",
+   "options": "\nGrand Total\nNet Total",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "base_discount_amount",
+   "fieldtype": "Currency",
+   "label": "Additional Discount Amount (Company Currency)",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_43",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "additional_discount_percentage",
+   "fieldtype": "Float",
+   "label": "Additional Discount Percentage",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "discount_amount",
+   "fieldtype": "Currency",
+   "label": "Additional Discount Amount",
+   "options": "currency",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "section_break_46",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "base_grand_total",
+   "fieldtype": "Currency",
+   "label": "Grand Total (Company Currency)",
+   "no_copy": 1,
+   "oldfieldname": "grand_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "base_rounding_adjustment",
+   "fieldtype": "Currency",
+   "label": "Rounding Adjustment (Company Currency",
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "base_in_words",
+   "fieldtype": "Data",
+   "label": "In Words (Company Currency)",
+   "oldfieldname": "in_words",
+   "oldfieldtype": "Data",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "base_rounded_total",
+   "fieldtype": "Currency",
+   "label": "Rounded Total (Company Currency)",
+   "oldfieldname": "rounded_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break4",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break"
+  },
+  {
+   "fieldname": "grand_total",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Grand Total",
+   "oldfieldname": "grand_total_import",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "rounding_adjustment",
+   "fieldtype": "Currency",
+   "label": "Rounding Adjustment",
+   "no_copy": 1,
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "rounded_total",
+   "fieldtype": "Currency",
+   "label": "Rounded Total",
+   "read_only": 1
+  },
+  {
+   "fieldname": "in_words",
+   "fieldtype": "Data",
+   "label": "In Words",
+   "oldfieldname": "in_words_import",
+   "oldfieldtype": "Data",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "disable_rounded_total",
+   "fieldtype": "Check",
+   "label": "Disable Rounded Total"
+  },
+  {
+   "collapsible": 1,
+   "collapsible_depends_on": "terms",
+   "fieldname": "terms_section_break",
+   "fieldtype": "Section Break",
+   "label": "Terms and Conditions",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-legal"
+  },
+  {
+   "fieldname": "tc_name",
+   "fieldtype": "Link",
+   "label": "Terms",
+   "oldfieldname": "tc_name",
+   "oldfieldtype": "Link",
+   "options": "Terms and Conditions",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "terms",
+   "fieldtype": "Text Editor",
+   "label": "Terms and Conditions",
+   "oldfieldname": "terms",
+   "oldfieldtype": "Text Editor"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "printing_settings",
+   "fieldtype": "Section Break",
+   "label": "Printing Settings"
+  },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "select_print_heading",
+   "fieldtype": "Link",
+   "label": "Print Heading",
+   "no_copy": 1,
+   "oldfieldname": "select_print_heading",
+   "oldfieldtype": "Link",
+   "options": "Print Heading",
+   "print_hide": 1,
+   "report_hide": 1
+  },
+  {
+   "allow_on_submit": 1,
+   "default": "0",
+   "fieldname": "group_same_items",
+   "fieldtype": "Check",
+   "label": "Group same items",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "column_break_72",
+   "fieldtype": "Column Break"
+  },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "letter_head",
+   "fieldtype": "Link",
+   "label": "Letter Head",
+   "oldfieldname": "letter_head",
+   "oldfieldtype": "Select",
+   "options": "Letter Head",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "language",
+   "fieldtype": "Data",
+   "label": "Print Language",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "subscription_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat Section"
+  },
+  {
+   "fieldname": "auto_repeat",
+   "fieldtype": "Link",
+   "label": "Auto Repeat",
+   "no_copy": 1,
+   "options": "Auto Repeat",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "allow_on_submit": 1,
+   "depends_on": "eval: doc.auto_repeat",
+   "fieldname": "update_auto_repeat_reference",
+   "fieldtype": "Button",
+   "label": "Update Auto Repeat Reference"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "more_info",
+   "fieldtype": "Section Break",
+   "label": "More Information",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-file-text"
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "label": "Status",
+   "no_copy": 1,
+   "oldfieldname": "status",
+   "oldfieldtype": "Select",
+   "options": "\nDraft\nSubmitted\nStopped\nCancelled",
+   "print_hide": 1,
+   "read_only": 1,
+   "reqd": 1,
+   "search_index": 1
+  },
+  {
+   "fieldname": "column_break_57",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "No",
+   "fieldname": "is_subcontracted",
+   "fieldtype": "Select",
+   "label": "Is Subcontracted",
+   "options": "\nYes\nNo",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "reference",
+   "fieldtype": "Section Break",
+   "label": "Reference"
+  },
+  {
+   "fieldname": "opportunity",
+   "fieldtype": "Link",
+   "label": "Opportunity",
+   "no_copy": 1,
+   "options": "Opportunity",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-shopping-cart", 
- "idx": 29, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2019-02-13 00:52:28.602904", 
- "modified_by": "Administrator", 
- "module": "Buying", 
- "name": "Supplier Quotation", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-shopping-cart",
+ "idx": 29,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-30 19:17:28.208693",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Supplier Quotation",
+ "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": "Manufacturing Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Manufacturing Manager",
+   "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": "Purchase Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Purchase Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Purchase User",
+   "share": 1,
+   "submit": 1,
    "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": 1, 
-   "role": "Stock User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock User"
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Purchase Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "permlevel": 1,
+   "read": 1,
+   "role": "Purchase Manager",
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 1, 
- "search_fields": "status, transaction_date, supplier,grand_total", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "timeline_field": "supplier", 
- "title_field": "title", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
-}
+ ],
+ "search_fields": "status, transaction_date, supplier,grand_total",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "timeline_field": "supplier",
+ "title_field": "title"
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 64ad1b5de95..8e21927fa54 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2013-05-24 19:29:08",
@@ -536,7 +537,7 @@
   },
   {
    "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
+   "fieldtype": "Long Text",
    "label": "Taxes and Charges Calculation",
    "no_copy": 1,
    "oldfieldtype": "HTML",
@@ -927,8 +928,9 @@
  "icon": "fa fa-shopping-cart",
  "idx": 82,
  "is_submittable": 1,
+ "links": [],
  "max_attachments": 1,
- "modified": "2019-11-12 13:19:11.895715",
+ "modified": "2019-12-30 19:14:56.630270",
  "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 0a19fada8ea..54e87f7a3b5 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2013-06-18 12:39:59",
@@ -619,7 +620,7 @@
   },
   {
    "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
+   "fieldtype": "Long Text",
    "label": "Taxes and Charges Calculation",
    "no_copy": 1,
    "oldfieldtype": "HTML",
@@ -1194,7 +1195,8 @@
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
- "modified": "2019-10-23 14:26:42.767189",
+ "links": [],
+ "modified": "2019-12-30 19:15:28.605085",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 3c6fb48cbf2..86200ba26b6 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2013-05-24 19:29:09",
@@ -682,7 +683,7 @@
   },
   {
    "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
+   "fieldtype": "Long Text",
    "label": "Taxes and Charges Calculation",
    "no_copy": 1,
    "oldfieldtype": "HTML",
@@ -1238,7 +1239,8 @@
  "icon": "fa fa-truck",
  "idx": 146,
  "is_submittable": 1,
- "modified": "2019-09-27 14:24:20.269682",
+ "links": [],
+ "modified": "2019-12-30 19:17:13.122644",
  "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 27cd997bcc2..63ef7ca8d82 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -616,7 +616,7 @@
   },
   {
    "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
+   "fieldtype": "Long Text",
    "label": "Taxes and Charges Calculation",
    "no_copy": 1,
    "oldfieldtype": "HTML",
@@ -1059,7 +1059,7 @@
  "idx": 261,
  "is_submittable": 1,
  "links": [],
- "modified": "2019-12-24 12:52:17.216304",
+ "modified": "2019-12-30 19:12:49.709711",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt",

From cb7043fd9dbf5230a690c213a7f7ff44c393a0be Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Tue, 31 Dec 2019 13:55:13 +0530
Subject: [PATCH 152/193] fix: party account currency not fetched from account
 for SO (#20146)

---
 erpnext/accounts/doctype/payment_entry/payment_entry.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 9530fc9556b..214d6088667 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -911,7 +911,10 @@ def get_payment_entry(dt, dn, party_amount=None, bank_account=None, bank_amount=
 	else:
 		party_account = get_party_account(party_type, doc.get(party_type.lower()), doc.company)
 
-	party_account_currency = doc.get("party_account_currency") or get_account_currency(party_account)
+	if dt not in ("Sales Invoice", "Purchase Invoice"):
+		party_account_currency = get_account_currency(party_account)
+	else:
+		party_account_currency = doc.get("party_account_currency") or get_account_currency(party_account)
 
 	# payment type
 	if (dt == "Sales Order" or (dt in ("Sales Invoice", "Fees") and doc.outstanding_amount > 0)) \

From 88de158378c25f6e63d21141f17fea132bb3b0e7 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Tue, 31 Dec 2019 14:34:09 +0530
Subject: [PATCH 153/193] feat: added provision to disable rounded total for
 salary slips

---
 erpnext/hr/doctype/hr_settings/hr_settings.json | 12 +++++++++++-
 erpnext/hr/doctype/hr_settings/hr_settings.py   | 11 +++++++++++
 erpnext/hr/doctype/salary_slip/salary_slip.py   |  6 +++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index a41c887852e..6cb0e211f94 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2013-08-02 13:45:23",
  "doctype": "DocType",
  "document_type": "Other",
@@ -13,6 +14,7 @@
   "expense_approver_mandatory_in_expense_claim",
   "payroll_settings",
   "include_holidays_in_total_working_days",
+  "disable_rounded_total",
   "max_working_hours_against_timesheet",
   "column_break_11",
   "email_salary_slip_to_employee",
@@ -160,12 +162,20 @@
    "fieldname": "auto_leave_encashment",
    "fieldtype": "Check",
    "label": "Auto Leave Encashment"
+  },
+  {
+   "default": "0",
+   "description": "If checked, hides and disables Rounded Total field in Salary Slips",
+   "fieldname": "disable_rounded_total",
+   "fieldtype": "Check",
+   "label": "Disable Rounded Total"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
- "modified": "2019-08-05 13:07:17.993968",
+ "links": [],
+ "modified": "2019-12-31 14:28:32.004121",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.py b/erpnext/hr/doctype/hr_settings/hr_settings.py
index 2ee1b7bdda5..bf919067cae 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.py
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.py
@@ -7,6 +7,8 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.utils import cint
+from frappe.custom.doctype.property_setter.property_setter import make_property_setter
 
 class HRSettings(Document):
 	def validate(self):
@@ -22,3 +24,12 @@ class HRSettings(Document):
 		if self.email_salary_slip_to_employee and self.encrypt_salary_slips_in_emails:
 			if not self.password_policy:
 				frappe.throw(_("Password policy for Salary Slips is not set"))
+	
+	def on_update(self):
+		self.toggle_rounded_total()
+		frappe.clear_cache()
+
+	def toggle_rounded_total(self):
+		self.disable_rounded_total = cint(self.disable_rounded_total)
+		make_property_setter("Salary Slip", "rounded_total", "hidden", self.disable_rounded_total, "Check")
+		make_property_setter("Salary Slip", "rounded_total", "print_hide", self.disable_rounded_total, "Check")
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 46be4fe2873..555f74c64aa 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -50,7 +50,8 @@ class SalarySlip(TransactionBase):
 		self.calculate_net_pay()
 
 		company_currency = erpnext.get_company_currency(self.company)
-		self.total_in_words = money_in_words(self.rounded_total, company_currency)
+		total = self.net_pay if self.is_rounding_total_disabled() else self.rounded_total
+		self.total_in_words = money_in_words(total, company_currency)
 
 		if frappe.db.get_single_value("HR Settings", "max_working_hours_against_timesheet"):
 			max_working_hours = frappe.db.get_single_value("HR Settings", "max_working_hours_against_timesheet")
@@ -90,6 +91,9 @@ class SalarySlip(TransactionBase):
 		if date_diff(self.end_date, self.start_date) < 0:
 			frappe.throw(_("To date cannot be before From date"))
 
+	def is_rounding_total_disabled(self):
+		return cint(frappe.db.get_single_value("HR Settings", "disable_rounded_total"))
+
 	def check_existing(self):
 		if not self.salary_slip_based_on_timesheet:
 			ret_exist = frappe.db.sql("""select name from `tabSalary Slip`

From 71649fe1412f1782b918e588f25d968137f8ef3f Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Tue, 31 Dec 2019 17:05:34 +0530
Subject: [PATCH 154/193] fix: customer credit limit label (#20152)

---
 .../customer_credit_limit/customer_credit_limit.json        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json b/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
index c28021c524a..800cb57f6c3 100644
--- a/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
+++ b/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-08-28 17:29:42.115592",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -34,11 +35,12 @@
    "fieldname": "bypass_credit_limit_check",
    "fieldtype": "Check",
    "in_list_view": 1,
-   "label": "Bypass Credit Limit Check"
+   "label": "Bypass Credit Limit Check at Sales Order"
   }
  ],
  "istable": 1,
- "modified": "2019-09-24 15:05:26.069911",
+ "links": [],
+ "modified": "2019-12-31 15:43:05.822328",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Customer Credit Limit",

From 5cc7648e9c7231f20cf9482c89170709bbb9bfe2 Mon Sep 17 00:00:00 2001
From: Javier Wong <javier.wong@strellagroup.com>
Date: Tue, 31 Dec 2019 19:37:37 +0800
Subject: [PATCH 155/193] [Fix] Allow Print Before Pay in POS (#20151)

Print Button does not show even when Print Before Pay is enabled in the POS Profile.
---
 erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 3 ++-
 erpnext/selling/page/point_of_sale/point_of_sale.js     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 9ea5a51e3f5..703df796c06 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -355,7 +355,8 @@ class SalesInvoice(SellingController):
 				"print_format": print_format,
 				"allow_edit_rate": pos.get("allow_user_to_edit_rate"),
 				"allow_edit_discount": pos.get("allow_user_to_edit_discount"),
-				"campaign": pos.get("campaign")
+				"campaign": pos.get("campaign"),
+				"allow_print_before_pay": pos.get("allow_print_before_pay")
 			}
 
 	def update_time_sheet(self, sales_invoice):
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index 1944c2d3132..df487833a8c 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -631,6 +631,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
 						this.frm.allow_edit_rate = r.message.allow_edit_rate;
 						this.frm.allow_edit_discount = r.message.allow_edit_discount;
 						this.frm.doc.campaign = r.message.campaign;
+						this.frm.allow_print_before_pay = r.message.allow_print_before_pay;
 					}
 				}
 
@@ -672,7 +673,7 @@ erpnext.pos.PointOfSale = class PointOfSale {
 	}
 
 	set_form_action() {
-		if(this.frm.doc.docstatus == 1 || (this.frm.doc.allow_print_before_pay == 1&&this.frm.doc.items.length>0)){
+		if(this.frm.doc.docstatus == 1 || (this.frm.allow_print_before_pay == 1 && this.frm.doc.items.length > 0)){
 			this.page.set_secondary_action(__("Print"), async() => {
 				if(this.frm.doc.docstatus != 1 ){
 					await this.frm.save();

From b73b3476976ff6b5758f41af9a5fb0aa833ad8a9 Mon Sep 17 00:00:00 2001
From: Rohan <Alchez@users.noreply.github.com>
Date: Tue, 31 Dec 2019 17:09:03 +0530
Subject: [PATCH 156/193] feat: add job applicant's email in job offer (#20153)

---
 erpnext/hr/doctype/job_offer/job_offer.js     |   4 +
 erpnext/hr/doctype/job_offer/job_offer.json   | 757 ++++--------------
 erpnext/patches.txt                           |   3 +-
 .../v12_0/set_job_offer_applicant_email.py    |  12 +
 4 files changed, 183 insertions(+), 593 deletions(-)
 create mode 100644 erpnext/patches/v12_0/set_job_offer_applicant_email.py

diff --git a/erpnext/hr/doctype/job_offer/job_offer.js b/erpnext/hr/doctype/job_offer/job_offer.js
index c3d83c48cca..558f4954d32 100755
--- a/erpnext/hr/doctype/job_offer/job_offer.js
+++ b/erpnext/hr/doctype/job_offer/job_offer.js
@@ -10,6 +10,10 @@ frappe.ui.form.on("Job Offer", {
 		});
 	},
 
+	setup: function (frm) {
+		frm.email_field = "applicant_email";
+	},
+
 	select_terms: function (frm) {
 		erpnext.utils.get_terms(frm.doc.select_terms, frm.doc, function (r) {
 			if (!r.exc) {
diff --git a/erpnext/hr/doctype/job_offer/job_offer.json b/erpnext/hr/doctype/job_offer/job_offer.json
index 7495c486bd2..ccbfdc53830 100644
--- a/erpnext/hr/doctype/job_offer/job_offer.json
+++ b/erpnext/hr/doctype/job_offer/job_offer.json
@@ -1,618 +1,191 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "HR-OFF-.YYYY.-.#####", 
- "beta": 0, 
- "creation": "2015-03-04 14:20:17.662207", 
- "custom": 0, 
- "default_print_format": "", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "HR-OFF-.YYYY.-.#####",
+ "creation": "2015-03-04 14:20:17.662207",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+  "job_applicant",
+  "applicant_name",
+  "applicant_email",
+  "column_break_3",
+  "status",
+  "offer_date",
+  "designation",
+  "company",
+  "section_break_4",
+  "offer_terms",
+  "section_break_14",
+  "select_terms",
+  "terms",
+  "printing_details",
+  "letter_head",
+  "column_break_16",
+  "select_print_heading",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "job_applicant", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Job Applicant", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Job Applicant", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "job_applicant",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Job Applicant",
+   "options": "Job Applicant",
+   "print_hide": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "job_applicant.applicant_name", 
-   "fieldname": "applicant_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": "Applicant 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": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "job_applicant.applicant_name",
+   "fieldname": "applicant_name",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "label": "Applicant Name",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "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
-  }, 
+   "fetch_from": "job_applicant.email_id",
+   "fieldname": "applicant_email",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Applicant Email Address",
+   "options": "Email",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Awaiting Response\nAccepted\nRejected", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "offer_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Offer 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_on_submit": 1,
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_standard_filter": 1,
+   "label": "Status",
+   "no_copy": 1,
+   "options": "Awaiting Response\nAccepted\nRejected",
+   "print_hide": 1
+  },
   {
-   "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": 1, 
-   "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": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "offer_date",
+   "fieldtype": "Date",
+   "label": "Offer Date",
+   "reqd": 1
+  },
   {
-   "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": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "designation",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Designation",
+   "options": "Designation",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company",
+   "options": "Company",
+   "print_hide": 1,
+   "remember_last_selected_value": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "offer_terms", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Job Offer Terms", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Job Offer Term", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_14", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_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
-  }, 
+   "fieldname": "offer_terms",
+   "fieldtype": "Table",
+   "label": "Job Offer Terms",
+   "options": "Job Offer Term"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "select_terms", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Select Terms and Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Terms and Conditions", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_14",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "terms", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Terms and Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "select_terms",
+   "fieldtype": "Link",
+   "label": "Select Terms and Conditions",
+   "options": "Terms and Conditions",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "printing_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": "Printing 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
-  }, 
+   "fieldname": "terms",
+   "fieldtype": "Text Editor",
+   "label": "Terms and Conditions"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "company.default_letter_head", 
-   "fieldname": "letter_head", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Letter Head", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Letter Head", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "printing_details",
+   "fieldtype": "Section Break",
+   "label": "Printing Details"
+  },
   {
-   "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": 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, 
-   "translatable": 0, 
-   "unique": 0, 
+   "allow_on_submit": 1,
+   "fetch_from": "company.default_letter_head",
+   "fieldname": "letter_head",
+   "fieldtype": "Link",
+   "label": "Letter Head",
+   "options": "Letter Head",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "column_break_16",
+   "fieldtype": "Column Break",
+   "print_hide": 1,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "select_print_heading", 
-   "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": "Print Heading", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Print Heading", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "allow_on_submit": 1,
+   "fieldname": "select_print_heading",
+   "fieldtype": "Link",
+   "label": "Print Heading",
+   "options": "Print Heading",
+   "print_hide": 1,
+   "report_hide": 1
+  },
   {
-   "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": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Job Offer", 
-   "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
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Job Offer",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-08-21 16:15:35.616910", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Job Offer", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-31 02:40:33.650728",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Job Offer",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "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": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "applicant_name", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "applicant_name"
 }
\ No newline at end of file
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 757e4140d44..cea46625694 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -655,4 +655,5 @@ erpnext.patches.v12_0.set_against_blanket_order_in_sales_and_purchase_order
 erpnext.patches.v12_0.set_cost_center_in_child_table_of_expense_claim
 erpnext.patches.v12_0.set_lead_title_field
 erpnext.patches.v12_0.set_permission_einvoicing
-erpnext.patches.v12_0.set_published_in_hub_tracked_item
\ No newline at end of file
+erpnext.patches.v12_0.set_published_in_hub_tracked_item
+erpnext.patches.v12_0.set_job_offer_applicant_email
diff --git a/erpnext/patches/v12_0/set_job_offer_applicant_email.py b/erpnext/patches/v12_0/set_job_offer_applicant_email.py
new file mode 100644
index 00000000000..7dd8492081e
--- /dev/null
+++ b/erpnext/patches/v12_0/set_job_offer_applicant_email.py
@@ -0,0 +1,12 @@
+import frappe
+
+
+def execute():
+	frappe.reload_doc("hr", "doctype", "job_offer")
+
+	frappe.db.sql("""
+		UPDATE
+			`tabJob Offer` AS offer
+		SET
+			applicant_email = (SELECT email_id FROM `tabJob Applicant` WHERE name = offer.job_applicant)
+	""")

From bd6e8b9cec5414f81c67468030ec174030845720 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Tue, 31 Dec 2019 17:09:56 +0530
Subject: [PATCH 157/193] feat: Mark Unmarked Attendance (#20062)

* feat: Mark Unmarked Attendance

* Update shift_type.py

* Update attendance_list.js

* Update attendance.py

* Update attendance.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
---
 erpnext/hr/doctype/attendance/attendance.py   |  75 ++++++++++++-
 .../hr/doctype/attendance/attendance_list.js  | 100 ++++++++++++++++++
 .../hr/doctype/attendance/test_attendance.py  |   4 +-
 erpnext/hr/doctype/shift_type/shift_type.py   |  16 +--
 4 files changed, 182 insertions(+), 13 deletions(-)

diff --git a/erpnext/hr/doctype/attendance/attendance.py b/erpnext/hr/doctype/attendance/attendance.py
index b8081128ff9..c32ccb58cd0 100644
--- a/erpnext/hr/doctype/attendance/attendance.py
+++ b/erpnext/hr/doctype/attendance/attendance.py
@@ -7,7 +7,8 @@ import frappe
 from frappe.utils import getdate, nowdate
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import cstr
+from frappe.utils import cstr, get_datetime, get_datetime_str
+from frappe.utils import update_progress_bar
 
 class Attendance(Document):
 	def validate_duplicate_record(self):
@@ -89,17 +90,85 @@ def add_attendance(events, start, end, conditions=None):
 		if e not in events:
 			events.append(e)
 
-def mark_absent(employee, attendance_date, shift=None):
+def mark_attendance(employee, attendance_date, status, shift=None):
 	employee_doc = frappe.get_doc('Employee', employee)
 	if not frappe.db.exists('Attendance', {'employee':employee, 'attendance_date':attendance_date, 'docstatus':('!=', '2')}):
 		doc_dict = {
 			'doctype': 'Attendance',
 			'employee': employee,
 			'attendance_date': attendance_date,
-			'status': 'Absent',
+			'status': status,
 			'company': employee_doc.company,
 			'shift': shift
 		}
 		attendance = frappe.get_doc(doc_dict).insert()
 		attendance.submit()
 		return attendance.name
+
+@frappe.whitelist()
+def mark_bulk_attendance(data):
+	import json
+	from pprint import pprint
+	if isinstance(data, frappe.string_types):
+		data = json.loads(data)
+	data = frappe._dict(data)
+	company = frappe.get_value('Employee', data.employee, 'company')
+	for date in data.unmarked_days:
+		doc_dict = {
+			'doctype': 'Attendance',
+			'employee': data.employee,
+			'attendance_date': get_datetime(date),
+			'status': data.status,
+			'company': company,
+		}
+		attendance = frappe.get_doc(doc_dict).insert()
+		attendance.submit()
+
+
+def get_month_map():
+	return frappe._dict({
+		"January": 1,
+		"February": 2,
+		"March": 3,
+		"April": 4,
+		"May": 5,
+		"June": 6,
+		"July": 7,
+		"August": 8,
+		"September": 9,
+		"October": 10,
+		"November": 11,
+		"December": 12
+		})
+
+@frappe.whitelist()
+def get_unmarked_days(employee, month):
+	import calendar
+	month_map = get_month_map()
+
+	today = get_datetime()
+
+	dates_of_month = ['{}-{}-{}'.format(today.year, month_map[month], r) for r in range(1, calendar.monthrange(today.year, month_map[month])[1] + 1)]
+
+	length = len(dates_of_month)
+	month_start, month_end = dates_of_month[0], dates_of_month[length-1]
+
+
+	records = frappe.get_all("Attendance", fields = ['attendance_date', 'employee'] , filters = [
+		["attendance_date", ">", month_start],
+		["attendance_date", "<", month_end],
+		["employee", "=", employee],
+		["docstatus", "!=", 2]
+	])
+
+	marked_days = [get_datetime(record.attendance_date) for record in records]
+	unmarked_days = []
+
+	for date in dates_of_month:
+		date_time = get_datetime(date)
+		if today.day == date_time.day and today.month == date_time.month:
+			break
+		if date_time not in marked_days:
+			unmarked_days.append(date)
+
+	return unmarked_days
diff --git a/erpnext/hr/doctype/attendance/attendance_list.js b/erpnext/hr/doctype/attendance/attendance_list.js
index f36fb15a01a..11617030032 100644
--- a/erpnext/hr/doctype/attendance/attendance_list.js
+++ b/erpnext/hr/doctype/attendance/attendance_list.js
@@ -2,5 +2,105 @@ frappe.listview_settings['Attendance'] = {
 	add_fields: ["status", "attendance_date"],
 	get_indicator: function(doc) {
 		return [__(doc.status), doc.status=="Present" ? "green" : "darkgrey", "status,=," + doc.status];
+	},
+	onload: function(list_view) {
+		let me = this;
+		const months = moment.months()
+		list_view.page.add_inner_button( __("Mark Attendance"), function(){
+			let dialog = new frappe.ui.Dialog({
+				title: __("Mark Attendance"),
+				fields: [
+					{
+						fieldname: 'employee',
+						label: __('For Employee'),
+						fieldtype: 'Link',
+						options: 'Employee',
+						reqd: 1,
+						onchange: function(){
+							dialog.set_df_property("unmarked_days", "hidden", 1);
+							dialog.set_df_property("status", "hidden", 1);
+							dialog.set_df_property("month", "value", '');
+							dialog.set_df_property("unmarked_days", "options", []);
+						}
+					},
+					{
+						label: __("For Month"),
+						fieldtype: "Select",
+						fieldname: "month",
+						options: months,
+						reqd: 1,
+						onchange: function(){
+							if(dialog.fields_dict.employee.value && dialog.fields_dict.month.value) {
+								dialog.set_df_property("status", "hidden", 0);
+								dialog.set_df_property("unmarked_days", "options", []);
+								me.get_multi_select_options(dialog.fields_dict.employee.value, dialog.fields_dict.month.value).then(options =>{
+									dialog.set_df_property("unmarked_days", "hidden", 0);
+									dialog.set_df_property("unmarked_days", "options", options);
+								});
+							}
+						}
+					},
+					{
+						label: __("Status"),
+						fieldtype: "Select",
+						fieldname: "status",
+						options: ["Present", "Absent", "Half Day"],
+						hidden:1,
+						reqd: 1,
+
+					},
+					{
+						label: __("Unmarked Attendance for days"),
+						fieldname: "unmarked_days",
+						fieldtype: "MultiCheck",
+						options: [],
+						columns: 2,
+						hidden: 1
+					},
+				],
+				primary_action(data){
+					frappe.confirm(__('Mark attendance as <b>' + data.status + '</b> for <b>' + data.month +'</b>' + ' on selected dates?'), () => {
+						frappe.call({
+							method: "erpnext.hr.doctype.attendance.attendance.mark_bulk_attendance",
+							args: {
+								data : data
+							},
+							callback: function(r) {
+								if(r.message === 1) {
+									frappe.show_alert({message:__("Attendance Marked"), indicator:'blue'});
+									cur_dialog.hide();
+								}
+							}
+						});
+					});
+					dialog.hide();
+					list_view.refresh();
+				},
+				primary_action_label: __('Mark Attendance')
+
+			});
+			dialog.show();
+		});
+	},
+	get_multi_select_options: function(employee, month){
+		return new Promise(resolve => {
+			frappe.call({
+				method: 'erpnext.hr.doctype.attendance.attendance.get_unmarked_days',
+				async: false,
+				args:{
+					employee: employee,
+					month: month,
+				}
+			}).then(r => {
+				var options = [];
+				for(var d in r.message){
+					var momentObj = moment(r.message[d], 'YYYY-MM-DD');
+					var date = momentObj.format('DD-MM-YYYY');
+					options.push({ "label":date, "value": r.message[d] , "checked": 1});
+				}
+				resolve(options);
+			});
+		});
 	}
+
 };
diff --git a/erpnext/hr/doctype/attendance/test_attendance.py b/erpnext/hr/doctype/attendance/test_attendance.py
index 35d1126dc10..838b704c5a5 100644
--- a/erpnext/hr/doctype/attendance/test_attendance.py
+++ b/erpnext/hr/doctype/attendance/test_attendance.py
@@ -14,7 +14,7 @@ class TestAttendance(unittest.TestCase):
 		employee = make_employee("test_mark_absent@example.com")
 		date = nowdate()
 		frappe.db.delete('Attendance', {'employee':employee, 'attendance_date':date})
-		from erpnext.hr.doctype.attendance.attendance import mark_absent
-		attendance = mark_absent(employee, date)
+		from erpnext.hr.doctype.attendance.attendance import mark_attendance
+		attendance = mark_attendance(employee, date, 'Absent')
 		fetch_attendance = frappe.get_value('Attendance', {'employee':employee, 'attendance_date':date, 'status':'Absent'})
 		self.assertEqual(attendance, fetch_attendance)
diff --git a/erpnext/hr/doctype/shift_type/shift_type.py b/erpnext/hr/doctype/shift_type/shift_type.py
index 8de92b2761a..49884103e21 100644
--- a/erpnext/hr/doctype/shift_type/shift_type.py
+++ b/erpnext/hr/doctype/shift_type/shift_type.py
@@ -11,7 +11,7 @@ from frappe.model.document import Document
 from frappe.utils import cint, getdate, get_datetime
 from erpnext.hr.doctype.shift_assignment.shift_assignment import get_actual_start_end_datetime_of_shift, get_employee_shift
 from erpnext.hr.doctype.employee_checkin.employee_checkin import mark_attendance_and_link_log, calculate_working_hours
-from erpnext.hr.doctype.attendance.attendance import mark_absent
+from erpnext.hr.doctype.attendance.attendance import mark_attendance
 from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
 
 class ShiftType(Document):
@@ -35,7 +35,7 @@ class ShiftType(Document):
 
 	def get_attendance(self, logs):
 		"""Return attendance_status, working_hours for a set of logs belonging to a single shift.
-		Assumtion: 
+		Assumtion:
 			1. These logs belongs to an single shift, single employee and is not in a holiday date.
 			2. Logs are in chronological order
 		"""
@@ -43,10 +43,10 @@ class ShiftType(Document):
 		total_working_hours, in_time, out_time = calculate_working_hours(logs, self.determine_check_in_and_check_out, self.working_hours_calculation_based_on)
 		if cint(self.enable_entry_grace_period) and in_time and in_time > logs[0].shift_start + timedelta(minutes=cint(self.late_entry_grace_period)):
 			late_entry = True
-		
+
 		if cint(self.enable_exit_grace_period) and out_time and out_time < logs[0].shift_end - timedelta(minutes=cint(self.early_exit_grace_period)):
 			early_exit = True
-			
+
 		if self.working_hours_threshold_for_absent and total_working_hours < self.working_hours_threshold_for_absent:
 			return 'Absent', total_working_hours, late_entry, early_exit
 		if self.working_hours_threshold_for_half_day and total_working_hours < self.working_hours_threshold_for_half_day:
@@ -75,7 +75,7 @@ class ShiftType(Document):
 		for date in dates:
 			shift_details = get_employee_shift(employee, date, True)
 			if shift_details and shift_details.shift_type.name == self.name:
-				mark_absent(employee, date, self.name)
+				mark_attendance(employee, date, self.name, 'Absent')
 
 	def get_assigned_employee(self, from_date=None, consider_default_shift=False):
 		filters = {'date':('>=', from_date), 'shift_type': self.name, 'docstatus': '1'}
@@ -107,15 +107,15 @@ def get_filtered_date_list(employee, start_date, end_date, filter_attendance=Tru
 	condition_query = ''
 	if filter_attendance:
 		condition_query += """ and a.selected_date not in (
-			select attendance_date from `tabAttendance` 
-			where docstatus = '1' and employee = %(employee)s 
+			select attendance_date from `tabAttendance`
+			where docstatus = 1 and employee = %(employee)s
 			and attendance_date between %(start_date)s and %(end_date)s)"""
 	if holiday_list:
 		condition_query += """ and a.selected_date not in (
 			select holiday_date from `tabHoliday` where parenttype = 'Holiday List' and
     		parentfield = 'holidays' and parent = %(holiday_list)s
     		and holiday_date between %(start_date)s and %(end_date)s)"""
-	
+
 	dates = frappe.db.sql("""select * from
 		({base_dates_query}) as a
 		where a.selected_date <= %(end_date)s {condition_query}

From ec9000b6b9ee4ce1e85f0b1dc842d7fd72d40bd0 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Thu, 12 Dec 2019 11:16:55 +0530
Subject: [PATCH 158/193] fix: Employee form UI

---
 erpnext/hr/doctype/employee/employee.json | 28 ++++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index a45b41d9174..1b236a430bb 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_events_in_timeline": 1,
  "allow_import": 1,
  "allow_rename": 1,
@@ -12,24 +13,25 @@
   "basic_information",
   "employee",
   "naming_series",
-  "salutation",
   "first_name",
   "middle_name",
   "last_name",
+  "salutation",
   "employee_name",
+  "employment_type",
   "image",
   "column_break1",
   "company",
   "status",
-  "employee_number",
-  "employment_type",
   "gender",
   "date_of_birth",
   "date_of_joining",
+  "employee_number",
   "emergency_contact_details",
-  "emergency_phone_number",
   "person_to_be_contacted",
   "relation",
+  "column_break_19",
+  "emergency_phone_number",
   "erpnext_user",
   "user_id",
   "create_user",
@@ -52,10 +54,10 @@
   "attendance_and_leave_details",
   "leave_policy",
   "attendance_device_id",
+  "leave_approver",
   "column_break_44",
   "holiday_list",
   "default_shift",
-  "leave_approver",
   "salary_information",
   "salary_mode",
   "bank_name",
@@ -65,14 +67,14 @@
   "health_insurance_no",
   "contact_details",
   "cell_number",
-  "prefered_contact_email",
   "prefered_email",
-  "company_email",
   "personal_email",
   "unsubscribed",
-  "column_break4",
   "permanent_accommodation_type",
   "permanent_address",
+  "column_break4",
+  "prefered_contact_email",
+  "company_email",
   "current_accommodation_type",
   "current_address",
   "sb53",
@@ -82,9 +84,9 @@
   "date_of_issue",
   "valid_upto",
   "place_of_issue",
-  "column_break6",
   "marital_status",
   "blood_group",
+  "column_break6",
   "family_background",
   "health_details",
   "educational_qualification",
@@ -249,7 +251,6 @@
   },
   {
    "allow_in_quick_entry": 1,
-   "collapsible": 1,
    "fieldname": "emergency_contact_details",
    "fieldtype": "Section Break",
    "label": "Emergency Contact"
@@ -776,12 +777,17 @@
    "fieldtype": "Link",
    "label": "Leave Approver",
    "options": "User"
+  },
+  {
+   "fieldname": "column_break_19",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-user",
  "idx": 24,
  "image_field": "image",
- "modified": "2019-09-12 14:21:12.711280",
+ "links": [],
+ "modified": "2019-12-11 13:22:18.323622",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee",

From 39ecd6ee1e51261255ce6d15aa71518e4916b918 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Thu, 12 Dec 2019 11:20:18 +0530
Subject: [PATCH 159/193] fix: Expense calim form UI

---
 .../expense_claim_advance.json                | 312 +++++-------------
 .../expense_claim_detail.json                 |  10 +-
 .../expense_claim_type.json                   |  10 +-
 .../expense_taxes_and_charges.json            |   6 +-
 4 files changed, 103 insertions(+), 235 deletions(-)

diff --git a/erpnext/hr/doctype/expense_claim_advance/expense_claim_advance.json b/erpnext/hr/doctype/expense_claim_advance/expense_claim_advance.json
index b5e4fd16f8e..db47d1844f6 100644
--- a/erpnext/hr/doctype/expense_claim_advance/expense_claim_advance.json
+++ b/erpnext/hr/doctype/expense_claim_advance/expense_claim_advance.json
@@ -1,238 +1,100 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-10-09 16:53:26.410762", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-10-09 16:53:26.410762",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "employee_advance",
+  "posting_date",
+  "advance_paid",
+  "column_break_4",
+  "unclaimed_amount",
+  "allocated_amount",
+  "advance_account"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "employee_advance", 
-   "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": "Employee Advance", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "journal_voucher", 
-   "oldfieldtype": "Link", 
-   "options": "Employee Advance", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "250px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "columns": 2,
+   "fieldname": "employee_advance",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Employee Advance",
+   "no_copy": 1,
+   "oldfieldname": "journal_voucher",
+   "oldfieldtype": "Link",
+   "options": "Employee Advance",
+   "print_width": "250px",
+   "reqd": 1,
    "width": "250px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Posting Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Posting Date",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "advance_paid", 
-   "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": "Advance Paid", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company.default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "advance_paid",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Advance Paid",
+   "options": "Company:company.default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "unclaimed_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": "Unclaimed amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "advance_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company.default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "120px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "columns": 2,
+   "fieldname": "unclaimed_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Unclaimed amount",
+   "no_copy": 1,
+   "oldfieldname": "advance_amount",
+   "oldfieldtype": "Currency",
+   "options": "Company:company.default_currency",
+   "print_width": "120px",
+   "read_only": 1,
+   "reqd": 1,
    "width": "120px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "allocated_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": "Allocated amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "allocated_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company.default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "120px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "columns": 2,
+   "fieldname": "allocated_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Allocated amount",
+   "no_copy": 1,
+   "oldfieldname": "allocated_amount",
+   "oldfieldtype": "Currency",
+   "options": "Company:company.default_currency",
+   "print_width": "120px",
    "width": "120px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "advance_account", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Advance Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "advance_account",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Advance Account",
+   "options": "Account"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
   }
- ], 
- "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": "2017-10-09 19:59:48.818139", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Expense Claim Advance", 
- "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
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2019-12-11 13:53:22.111766",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Expense Claim Advance",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
index b60db2c3af0..16e9eef9174 100644
--- a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
+++ b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2013-02-22 01:27:46",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -12,9 +13,9 @@
   "description",
   "section_break_6",
   "amount",
+  "cost_center",
   "column_break_8",
-  "sanctioned_amount",
-  "cost_center"
+  "sanctioned_amount"
  ],
  "fields": [
   {
@@ -107,8 +108,9 @@
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-11-22 11:57:25.110942",
- "modified_by": "jangeles@bai.ph",
+ "links": [],
+ "modified": "2019-12-11 13:42:33.233432",
+ "modified_by": "Administrator",
  "module": "HR",
  "name": "Expense Claim Detail",
  "owner": "harshada@webnotestech.com",
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
index e45f640c078..cf2cbb4308f 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:expense_type",
@@ -9,8 +10,8 @@
  "field_order": [
   "deferred_expense_account",
   "expense_type",
-  "description",
-  "accounts"
+  "accounts",
+  "description"
  ],
  "fields": [
   {
@@ -46,8 +47,9 @@
  ],
  "icon": "fa fa-flag",
  "idx": 1,
- "modified": "2019-11-22 12:00:18.710408",
- "modified_by": "jangeles@bai.ph",
+ "links": [],
+ "modified": "2019-12-11 13:38:59.534034",
+ "modified_by": "Administrator",
  "module": "HR",
  "name": "Expense Claim Type",
  "owner": "harshada@webnotestech.com",
diff --git a/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json b/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json
index 9bf69daf65a..96ad1b770d6 100644
--- a/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json
+++ b/erpnext/hr/doctype/expense_taxes_and_charges/expense_taxes_and_charges.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "hash",
  "creation": "2019-06-03 11:42:33.123976",
  "doctype": "DocType",
@@ -8,8 +9,8 @@
  "field_order": [
   "account_head",
   "cost_center",
-  "col_break1",
   "rate",
+  "col_break1",
   "description",
   "section_break_6",
   "tax_amount",
@@ -93,7 +94,8 @@
   }
  ],
  "istable": 1,
- "modified": "2019-06-20 12:01:33.919555",
+ "links": [],
+ "modified": "2019-12-11 13:50:02.883328",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Expense Taxes and Charges",

From cfdbbcff7043b84153fe1f0ce59189ffa9958cb3 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Thu, 12 Dec 2019 13:29:25 +0530
Subject: [PATCH 160/193] fix: Employee incentive form UI

---
 .../employee_incentive/employee_incentive.json       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/erpnext/hr/doctype/employee_incentive/employee_incentive.json b/erpnext/hr/doctype/employee_incentive/employee_incentive.json
index 3bc772cfa68..ce8e1ea230a 100644
--- a/erpnext/hr/doctype/employee_incentive/employee_incentive.json
+++ b/erpnext/hr/doctype/employee_incentive/employee_incentive.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "HR-EINV-.YY.-.MM.-.#####",
  "creation": "2018-04-13 16:13:43.404546",
  "doctype": "DocType",
@@ -7,13 +8,13 @@
  "field_order": [
   "employee",
   "incentive_amount",
+  "employee_name",
+  "additional_salary",
+  "column_break_5",
   "payroll_date",
   "salary_component",
-  "amended_from",
-  "column_break_5",
-  "employee_name",
   "department",
-  "additional_salary"
+  "amended_from"
  ],
  "fields": [
   {
@@ -81,7 +82,8 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-09-03 16:48:16.822252",
+ "links": [],
+ "modified": "2019-12-12 13:24:44.761540",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Incentive",

From 52d280067be2f5329db7d1d0d92d06ba076ff4a2 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Thu, 12 Dec 2019 13:30:07 +0530
Subject: [PATCH 161/193] fix: Leave Type form UI

---
 erpnext/hr/doctype/leave_type/leave_type.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index 550d536c8df..0af832f903e 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:leave_type_name",
@@ -24,10 +25,12 @@
   "encashment",
   "allow_encashment",
   "encashment_threshold_days",
+  "column_break_17",
   "earning_component",
   "earned_leave",
   "is_earned_leave",
   "earned_leave_frequency",
+  "column_break_22",
   "rounding"
  ],
  "fields": [
@@ -172,11 +175,20 @@
    "fieldname": "maximum_carry_forwarded_leaves",
    "fieldtype": "Float",
    "label": "Maximum Carry Forwarded Leaves"
+  },
+  {
+   "fieldname": "column_break_17",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_22",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-flag",
  "idx": 1,
- "modified": "2019-09-06 18:48:48.946074",
+ "links": [],
+ "modified": "2019-12-12 12:48:37.780254",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Type",

From b57ec65812c9e38fc8ce8b13a8800b62d06b2fa0 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Mon, 16 Dec 2019 11:19:19 +0530
Subject: [PATCH 162/193] fix: Additional salary, Department, driver, loan,
 salary slip, shift,Travel request form UI

---
 .../additional_salary/additional_salary.json  |  685 +----
 erpnext/hr/doctype/department/department.json |  475 +---
 .../driving_license_category.json             |  196 +-
 .../leave_control_panel.json                  |   18 +-
 erpnext/hr/doctype/loan/loan.json             | 1414 ++--------
 .../doctype/salary_detail/salary_detail.json  |  918 ++----
 .../hr/doctype/salary_slip/salary_slip.json   | 2463 ++++-------------
 .../shift_assignment/shift_assignment.json    |    6 +-
 .../travel_request/travel_request.json        |   11 +-
 9 files changed, 1202 insertions(+), 4984 deletions(-)

diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.json b/erpnext/hr/doctype/additional_salary/additional_salary.json
index 6768b49e288..7d69f7e7fc2 100644
--- a/erpnext/hr/doctype/additional_salary/additional_salary.json
+++ b/erpnext/hr/doctype/additional_salary/additional_salary.json
@@ -1,560 +1,173 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2018-05-10 12:04:08.396461", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2018-05-10 12:04:08.396461",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "naming_series",
+  "employee",
+  "employee_name",
+  "salary_component",
+  "overwrite_salary_structure_amount",
+  "deduct_full_tax_on_selected_payroll_date",
+  "column_break_5",
+  "company",
+  "payroll_date",
+  "salary_slip",
+  "type",
+  "department",
+  "amount",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Series", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "HR-ADS-.YY.-.MM.-", 
-   "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
-  }, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "options": "HR-ADS-.YY.-.MM.-",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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": 1, 
-   "in_standard_filter": 1, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Employee",
+   "options": "Employee",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "salary_component", 
-   "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 Component", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Salary Component", 
-   "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
-  }, 
+   "fieldname": "salary_component",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Salary Component",
+   "options": "Salary Component",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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, 
-   "unique": 0
-  }, 
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Amount",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fetch_if_empty": 0, 
-   "fieldname": "overwrite_salary_structure_amount", 
-   "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": "Overwrite Salary Structure Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "1",
+   "fieldname": "overwrite_salary_structure_amount",
+   "fieldtype": "Check",
+   "label": "Overwrite Salary Structure Amount"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "deduct_full_tax_on_selected_payroll_date", 
-   "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": "Deduct Full Tax on Selected Payroll 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
-  }, 
+   "default": "0",
+   "fieldname": "deduct_full_tax_on_selected_payroll_date",
+   "fieldtype": "Check",
+   "label": "Deduct Full Tax on Selected Payroll Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "description": "Date on which this component is applied", 
-   "fetch_if_empty": 0, 
-   "fieldname": "payroll_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": "Payroll 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": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "description": "Date on which this component is applied",
+   "fieldname": "payroll_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Payroll Date",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "employee.employee_name", 
-   "fetch_if_empty": 0, 
-   "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": 1, 
-   "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
-  }, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Employee Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "employee.department", 
-   "fetch_if_empty": 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": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "label": "Department",
+   "options": "Department",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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
-  }, 
+   "fieldname": "salary_slip",
+   "fieldtype": "Link",
+   "label": "Salary Slip",
+   "options": "Salary Slip",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "salary_component.type", 
-   "fetch_if_empty": 0, 
-   "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
-  }, 
+   "fetch_from": "salary_component.type",
+   "fieldname": "type",
+   "fieldtype": "Data",
+   "label": "Salary Component Type",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Additional Salary", 
-   "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
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Additional Salary",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-05-09 19:53:37.475839", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Additional Salary", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-12 19:07:23.635901",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Additional Salary",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "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": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "submit": 1,
    "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": 1, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "share": 1,
+   "submit": 1,
    "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": "employee", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "employee",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index 3b400ce8d76..a191b6b8228 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -1,569 +1,180 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
- "autoname": "",
- "beta": 0,
  "creation": "2013-02-05 11:48:26",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Setup",
- "editable_grid": 0,
+ "engine": "InnoDB",
+ "field_order": [
+  "department_name",
+  "parent_department",
+  "column_break_3",
+  "company",
+  "is_group",
+  "disabled",
+  "section_break_4",
+  "leave_block_list",
+  "leave_section",
+  "leave_approvers",
+  "expense_section",
+  "expense_approvers",
+  "lft",
+  "rgt",
+  "old_parent"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "department_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Department",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "department_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": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "parent_department",
    "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 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
+   "options": "Department"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "company",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
    "in_standard_filter": 1,
    "label": "Company",
-   "length": 0,
-   "no_copy": 0,
    "options": "Company",
-   "permlevel": 0,
-   "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
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
+   "default": "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": 1,
-   "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
+   "label": "Is Group"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Disabled"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "section_break_4",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Section Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Days for which Holidays are blocked for this department.",
-   "fetch_if_empty": 0,
    "fieldname": "leave_block_list",
    "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": "Leave Block List",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Leave Block List",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "options": "Leave Block List"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "leave_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": "Leave Approvers",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "label": "Leave Approvers"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "The first Leave Approver in the list will be set as the default Leave Approver.",
-   "fetch_if_empty": 0,
    "fieldname": "leave_approvers",
    "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": "Leave Approver",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Department Approver",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "options": "Department Approver"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "expense_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": "Expense Approvers",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "label": "Expense Approvers"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "The first Expense Approver in the list will be set as the default Expense Approver.",
-   "fetch_if_empty": 0,
    "fieldname": "expense_approvers",
    "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": "Expense Approver",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Department Approver",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "options": "Department Approver"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "old_parent",
    "fieldtype": "Data",
    "hidden": 1,
    "ignore_user_permissions": 1,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Old Parent",
-   "length": 0,
-   "no_copy": 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,
-   "translatable": 0,
-   "unique": 0
+   "print_hide": 1
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-sitemap",
  "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-06-25 18:43:05.550387",
+ "links": [],
+ "modified": "2019-12-12 14:48:35.254308",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Department",
  "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": "HR User",
-   "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": "Academics User",
-   "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": 1,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "HR Manager",
    "set_user_permissions": 1,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
  "show_name_in_global_search": 1,
- "sort_order": "ASC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ "sort_field": "modified",
+ "sort_order": "ASC"
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/driving_license_category/driving_license_category.json b/erpnext/hr/doctype/driving_license_category/driving_license_category.json
index 45e38d39c92..8bc61a808a8 100644
--- a/erpnext/hr/doctype/driving_license_category/driving_license_category.json
+++ b/erpnext/hr/doctype/driving_license_category/driving_license_category.json
@@ -1,161 +1,51 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-10-17 08:19:43.142329", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-10-17 08:19:43.142329",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "class",
+  "description",
+  "issuing_date",
+  "expiry_date"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "class", 
-   "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": "Class", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "class",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Driver licence class"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "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": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "description",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Description"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "issuing_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": "Issuing Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "issuing_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Issuing Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expiry_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Expiry Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "expiry_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Expiry Date"
   }
- ], 
- "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": "2017-10-17 08:19:43.142329", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Driving License Category", 
- "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
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2019-12-12 14:40:55.209022",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Driving License Category",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
index 39985fa2ef2..d9c592aa64e 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -1,25 +1,28 @@
 {
+ "actions": [],
  "allow_copy": 1,
  "creation": "2013-01-10 16:34:15",
  "doctype": "DocType",
+ "engine": "InnoDB",
  "field_order": [
   "select_employees_section",
   "company",
   "employment_type",
   "branch",
-  "column_break1",
   "department",
+  "column_break1",
   "designation",
   "employee_grade",
   "employee",
   "allocate_leaves_section",
   "from_date",
   "to_date",
-  "leave_policy",
-  "leave_type",
   "carry_forward",
   "no_of_days",
-  "allocate"
+  "allocate",
+  "column_break_16",
+  "leave_policy",
+  "leave_type"
  ],
  "fields": [
   {
@@ -125,13 +128,18 @@
    "fieldname": "allocate_leaves_section",
    "fieldtype": "Section Break",
    "label": "Allocate Leaves"
+  },
+  {
+   "fieldname": "column_break_16",
+   "fieldtype": "Column Break"
   }
  ],
  "hide_toolbar": 1,
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
- "modified": "2019-05-24 09:41:34.105741",
+ "links": [],
+ "modified": "2019-12-12 18:51:41.573349",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Leave Control Panel",
diff --git a/erpnext/hr/doctype/loan/loan.json b/erpnext/hr/doctype/loan/loan.json
index 505b601edd5..2b2d4818277 100644
--- a/erpnext/hr/doctype/loan/loan.json
+++ b/erpnext/hr/doctype/loan/loan.json
@@ -1,1200 +1,298 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "ACC-LOAN-.YYYY.-.#####", 
- "beta": 0, 
- "creation": "2016-12-02 10:11:49.673604", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "ACC-LOAN-.YYYY.-.#####",
+ "creation": "2016-12-02 10:11:49.673604",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "applicant_type",
+  "applicant",
+  "applicant_name",
+  "loan_type",
+  "loan_application",
+  "column_break_3",
+  "posting_date",
+  "company",
+  "status",
+  "repay_from_salary",
+  "section_break_8",
+  "loan_amount",
+  "rate_of_interest",
+  "disbursement_date",
+  "repayment_start_date",
+  "column_break_11",
+  "repayment_method",
+  "repayment_periods",
+  "monthly_repayment_amount",
+  "account_info",
+  "mode_of_payment",
+  "payment_account",
+  "column_break_9",
+  "loan_account",
+  "interest_income_account",
+  "section_break_15",
+  "repayment_schedule",
+  "section_break_17",
+  "total_payment",
+  "column_break_19",
+  "total_interest_payable",
+  "total_amount_paid",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "applicant_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": "Applicant Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee\nMember", 
-   "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
-  }, 
+   "fieldname": "applicant_type",
+   "fieldtype": "Select",
+   "label": "Applicant Type",
+   "options": "Employee\nMember",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "applicant", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Applicant", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "applicant_type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "applicant",
+   "fieldtype": "Dynamic Link",
+   "in_standard_filter": 1,
+   "label": "Applicant",
+   "options": "applicant_type",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "applicant_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Applicant Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "applicant_name",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Applicant Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "loan_application", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Loan Application", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Loan Application", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "loan_application",
+   "fieldtype": "Link",
+   "label": "Loan Application",
+   "options": "Loan Application"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "loan_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Loan Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Loan Type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "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
-  }, 
+   "fieldname": "loan_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Loan Type",
+   "options": "Loan Type",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fetch_if_empty": 0, 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Posting Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Today",
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Posting Date",
+   "no_copy": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "remember_last_selected_value": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Sanctioned", 
-   "fetch_if_empty": 0, 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Sanctioned\nDisbursed\nRepaid/Closed", 
-   "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
-  }, 
+   "default": "Sanctioned",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "label": "Status",
+   "no_copy": 1,
+   "options": "Sanctioned\nDisbursed\nRepaid/Closed",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.applicant_type==\"Employee\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "repay_from_salary", 
-   "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": "Repay from Salary", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "default": "0",
+   "depends_on": "eval:doc.applicant_type==\"Employee\"",
+   "fieldname": "repay_from_salary",
+   "fieldtype": "Check",
+   "label": "Repay from Salary"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Loan Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_8",
+   "fieldtype": "Section Break",
+   "label": "Loan Details"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "loan_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Loan Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "loan_amount",
+   "fieldtype": "Currency",
+   "label": "Loan Amount",
+   "options": "Company:company:default_currency",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fetch_from": "loan_type.rate_of_interest", 
-   "fetch_if_empty": 0, 
-   "fieldname": "rate_of_interest", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rate of Interest (%) / Year", 
-   "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": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "loan_type.rate_of_interest",
+   "fieldname": "rate_of_interest",
+   "fieldtype": "Percent",
+   "label": "Rate of Interest (%) / Year",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.status==\"Disbursed\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "disbursement_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Disbursement 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
-  }, 
+   "depends_on": "eval:doc.status==\"Disbursed\"",
+   "fieldname": "disbursement_date",
+   "fieldtype": "Date",
+   "label": "Disbursement Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "repayment_start_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": "Repayment Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "repayment_start_date",
+   "fieldtype": "Date",
+   "label": "Repayment Start Date",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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
-  }, 
+   "fieldname": "column_break_11",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Repay Over Number of Periods", 
-   "fetch_if_empty": 0, 
-   "fieldname": "repayment_method", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Repayment Method", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nRepay Fixed Amount per Period\nRepay Over Number of Periods", 
-   "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
-  }, 
+   "default": "Repay Over Number of Periods",
+   "fieldname": "repayment_method",
+   "fieldtype": "Select",
+   "label": "Repayment Method",
+   "options": "\nRepay Fixed Amount per Period\nRepay Over Number of Periods",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "repayment_periods", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Repayment Period in Months", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "repayment_periods",
+   "fieldtype": "Int",
+   "label": "Repayment Period in Months"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "monthly_repayment_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Monthly Repayment Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "monthly_repayment_amount",
+   "fieldtype": "Currency",
+   "label": "Monthly Repayment Amount",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "account_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Account Info", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "collapsible": 1,
+   "fieldname": "account_info",
+   "fieldtype": "Section Break",
+   "label": "Account Info"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "mode_of_payment", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Mode of Payment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Mode of Payment", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "mode_of_payment",
+   "fieldtype": "Link",
+   "label": "Mode of Payment",
+   "options": "Mode of Payment",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "payment_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Payment Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "payment_account",
+   "fieldtype": "Link",
+   "label": "Payment Account",
+   "options": "Account",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_9", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_9",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "loan_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Loan Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "loan_account",
+   "fieldtype": "Link",
+   "label": "Loan Account",
+   "options": "Account",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "interest_income_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Interest Income Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "interest_income_account",
+   "fieldtype": "Link",
+   "label": "Interest Income Account",
+   "options": "Account",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_15", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Repayment Schedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_15",
+   "fieldtype": "Section Break",
+   "label": "Repayment Schedule"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "repayment_schedule", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Repayment Schedule", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Repayment Schedule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "repayment_schedule",
+   "fieldtype": "Table",
+   "label": "Repayment Schedule",
+   "no_copy": 1,
+   "options": "Repayment Schedule"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_17", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Totals", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_17",
+   "fieldtype": "Section Break",
+   "label": "Totals"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fetch_if_empty": 0, 
-   "fieldname": "total_payment", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Payment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "total_payment",
+   "fieldtype": "Currency",
+   "label": "Total Payment",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_19", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_19",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fetch_if_empty": 0, 
-   "fieldname": "total_interest_payable", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Interest Payable", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "total_interest_payable",
+   "fieldtype": "Currency",
+   "label": "Total Interest Payable",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "total_amount_paid", 
-   "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 Amount Paid", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "allow_on_submit": 1,
+   "fieldname": "total_amount_paid",
+   "fieldtype": "Currency",
+   "label": "Total Amount Paid",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Loan", 
-   "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
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Loan",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-07-10 13:04:20.953694", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Loan", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-12 14:45:38.823072",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Loan",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "HR Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "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
+   "read": 1,
+   "role": "Employee"
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "posting_date", 
- "show_name_in_global_search": 0, 
- "sort_field": "creation", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "search_fields": "posting_date",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_detail/salary_detail.json b/erpnext/hr/doctype/salary_detail/salary_detail.json
index edf2786821e..3e6161694e9 100644
--- a/erpnext/hr/doctype/salary_detail/salary_detail.json
+++ b/erpnext/hr/doctype/salary_detail/salary_detail.json
@@ -1,765 +1,203 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-06-30 15:32:36.385111", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2016-06-30 15:32:36.385111",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "salary_component",
+  "abbr",
+  "deduct_full_tax_on_selected_payroll_date",
+  "depends_on_payment_days",
+  "column_break_3",
+  "statistical_component",
+  "is_tax_applicable",
+  "is_flexible_benefit",
+  "variable_based_on_taxable_salary",
+  "section_break_2",
+  "condition",
+  "amount_based_on_formula",
+  "formula",
+  "amount",
+  "do_not_include_in_total",
+  "default_amount",
+  "additional_amount",
+  "tax_on_flexible_benefit",
+  "tax_on_additional_salary",
+  "section_break_11",
+  "condition_and_formula_help"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "salary_component", 
-   "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": "Component", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Salary Component", 
-   "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
-  }, 
+   "fieldname": "salary_component",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Component",
+   "options": "Salary Component",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 1, 
-   "default": "", 
-   "depends_on": "eval:doc.parenttype=='Salary Structure'", 
-   "fetch_from": "salary_component.salary_component_abbr", 
-   "fetch_if_empty": 0, 
-   "fieldname": "abbr", 
-   "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": "Abbr", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "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
-  }, 
+   "columns": 1,
+   "depends_on": "eval:doc.parenttype=='Salary Structure'",
+   "fetch_from": "salary_component.salary_component_abbr",
+   "fieldname": "abbr",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Abbr",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "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. ", 
-   "fetch_from": "salary_component.statistical_component", 
-   "fetch_if_empty": 0, 
-   "fieldname": "statistical_component", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Statistical Component", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "default": "0",
+   "description": "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. ",
+   "fetch_from": "salary_component.statistical_component",
+   "fieldname": "statistical_component",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Statistical Component"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "salary_component.is_tax_applicable", 
-   "fetch_if_empty": 0, 
-   "fieldname": "is_tax_applicable", 
-   "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 Tax Applicable", 
-   "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
-  }, 
+   "default": "0",
+   "fetch_from": "salary_component.is_tax_applicable",
+   "fieldname": "is_tax_applicable",
+   "fieldtype": "Check",
+   "label": "Is Tax Applicable",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "salary_component.is_flexible_benefit", 
-   "fetch_if_empty": 0, 
-   "fieldname": "is_flexible_benefit", 
-   "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 Flexible Benefit", 
-   "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
-  }, 
+   "default": "0",
+   "fetch_from": "salary_component.is_flexible_benefit",
+   "fieldname": "is_flexible_benefit",
+   "fieldtype": "Check",
+   "label": "Is Flexible Benefit",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fetch_from": "salary_component.variable_based_on_taxable_salary", 
-   "fetch_if_empty": 0, 
-   "fieldname": "variable_based_on_taxable_salary", 
-   "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": "Variable Based On Taxable Salary", 
-   "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
-  }, 
+   "default": "0",
+   "fetch_from": "salary_component.variable_based_on_taxable_salary",
+   "fieldname": "variable_based_on_taxable_salary",
+   "fieldtype": "Check",
+   "label": "Variable Based On Taxable Salary",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fetch_from": "salary_component.depends_on_payment_days", 
-   "fetch_if_empty": 0, 
-   "fieldname": "depends_on_payment_days", 
-   "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": "Depends on Payment Days", 
-   "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
-  }, 
+   "default": "0",
+   "fetch_from": "salary_component.depends_on_payment_days",
+   "fieldname": "depends_on_payment_days",
+   "fieldtype": "Check",
+   "label": "Depends on Payment Days",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "deduct_full_tax_on_selected_payroll_date", 
-   "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": "Deduct Full Tax on Selected Payroll Date", 
-   "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
-  }, 
+   "default": "0",
+   "fieldname": "deduct_full_tax_on_selected_payroll_date",
+   "fieldtype": "Check",
+   "label": "Deduct Full Tax on Selected Payroll Date",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.is_flexible_benefit != 1", 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_2", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.is_flexible_benefit != 1",
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.parenttype=='Salary Structure'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "condition", 
-   "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": "Condition", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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_on_submit": 1,
+   "depends_on": "eval:doc.parenttype=='Salary Structure'",
+   "fieldname": "condition",
+   "fieldtype": "Code",
+   "label": "Condition"
+  },
   {
-   "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.parenttype=='Salary Structure'", 
-   "fetch_from": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "amount_based_on_formula", 
-   "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": "Amount based on formula", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:doc.parenttype=='Salary Structure'",
+   "fieldname": "amount_based_on_formula",
+   "fieldtype": "Check",
+   "label": "Amount based on formula"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "eval:doc.amount_based_on_formula!==0 && doc.parenttype==='Salary Structure'", 
-   "description": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "formula", 
-   "fieldtype": "Code", 
-   "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": "Formula", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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_on_submit": 1,
+   "depends_on": "eval:doc.amount_based_on_formula!==0 && doc.parenttype==='Salary Structure'",
+   "fieldname": "formula",
+   "fieldtype": "Code",
+   "in_list_view": 1,
+   "label": "Formula"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.amount_based_on_formula!==1 || doc.parenttype==='Salary Slip'", 
-   "fetch_if_empty": 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, 
-   "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
-  }, 
+   "depends_on": "eval:doc.amount_based_on_formula!==1 || doc.parenttype==='Salary Slip'",
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Amount",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "do_not_include_in_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": "Do not include in 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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "do_not_include_in_total",
+   "fieldtype": "Check",
+   "label": "Do not include in total"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.parenttype=='Salary Structure'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "default_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": "Default Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.parenttype=='Salary Structure'",
+   "fieldname": "default_amount",
+   "fieldtype": "Currency",
+   "label": "Default Amount",
+   "options": "Company:company:default_currency",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fetch_from": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "additional_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Additional Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "additional_amount",
+   "fieldtype": "Currency",
+   "hidden": 1,
+   "label": "Additional Amount",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.parenttype=='Salary Slip' && doc.parentfield=='deductions' && doc.variable_based_on_taxable_salary == 1", 
-   "fetch_if_empty": 0, 
-   "fieldname": "tax_on_flexible_benefit", 
-   "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": "Tax on flexible benefit", 
-   "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
-  }, 
+   "depends_on": "eval:doc.parenttype=='Salary Slip' && doc.parentfield=='deductions' && doc.variable_based_on_taxable_salary == 1",
+   "fieldname": "tax_on_flexible_benefit",
+   "fieldtype": "Currency",
+   "label": "Tax on flexible benefit",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.parenttype=='Salary Slip' && doc.parentfield=='deductions' && doc.variable_based_on_taxable_salary == 1", 
-   "fetch_if_empty": 0, 
-   "fieldname": "tax_on_additional_salary", 
-   "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": "Tax on additional salary", 
-   "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
-  }, 
+   "depends_on": "eval:doc.parenttype=='Salary Slip' && doc.parentfield=='deductions' && doc.variable_based_on_taxable_salary == 1",
+   "fieldname": "tax_on_additional_salary",
+   "fieldtype": "Currency",
+   "label": "Tax on additional salary",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.parenttype=='Salary Structure'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_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
-  }, 
+   "depends_on": "eval:doc.parenttype=='Salary Structure'",
+   "fieldname": "section_break_11",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.parenttype=='Salary Structure'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "condition_and_formula_help", 
-   "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": "Condition and Formula Help", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<h3>Condition and Formula Help</h3>\n\n<p>Notes:</p>\n\n<ol>\n<li>Use field <code>base</code> for using base salary of the Employee</li>\n<li>Use Salary Component abbreviations in conditions and formulas. <code>BS = Basic Salary</code></li>\n<li>Use field name for employee details in conditions and formulas. <code>Employment Type = employment_type</code><code>Branch = branch</code></li>\n<li>Use field name from Salary Slip in conditions and formulas. <code>Payment Days = payment_days</code><code>Leave without pay = leave_without_pay</code></li>\n<li>Direct Amount can also be entered based on Condtion. See example 3</li></ol>\n\n<h4>Examples</h4>\n<ol>\n<li>Calculating Basic Salary based on <code>base</code>\n<pre><code>Condition: base &lt; 10000</code></pre>\n<pre><code>Formula: base * .2</code></pre></li>\n<li>Calculating HRA based on Basic Salary<code>BS</code> \n<pre><code>Condition: BS &gt; 2000</code></pre>\n<pre><code>Formula: BS * .1</code></pre></li>\n<li>Calculating TDS based on Employment Type<code>employment_type</code> \n<pre><code>Condition: employment_type==\"Intern\"</code></pre>\n<pre><code>Amount: 1000</code></pre></li>\n</ol>", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
+   "depends_on": "eval:doc.parenttype=='Salary Structure'",
+   "fieldname": "condition_and_formula_help",
+   "fieldtype": "HTML",
+   "label": "Condition and Formula Help",
+   "options": "<h3>Condition and Formula Help</h3>\n\n<p>Notes:</p>\n\n<ol>\n<li>Use field <code>base</code> for using base salary of the Employee</li>\n<li>Use Salary Component abbreviations in conditions and formulas. <code>BS = Basic Salary</code></li>\n<li>Use field name for employee details in conditions and formulas. <code>Employment Type = employment_type</code><code>Branch = branch</code></li>\n<li>Use field name from Salary Slip in conditions and formulas. <code>Payment Days = payment_days</code><code>Leave without pay = leave_without_pay</code></li>\n<li>Direct Amount can also be entered based on Condtion. See example 3</li></ol>\n\n<h4>Examples</h4>\n<ol>\n<li>Calculating Basic Salary based on <code>base</code>\n<pre><code>Condition: base &lt; 10000</code></pre>\n<pre><code>Formula: base * .2</code></pre></li>\n<li>Calculating HRA based on Basic Salary<code>BS</code> \n<pre><code>Condition: BS &gt; 2000</code></pre>\n<pre><code>Formula: BS * .1</code></pre></li>\n<li>Calculating TDS based on Employment Type<code>employment_type</code> \n<pre><code>Condition: employment_type==\"Intern\"</code></pre>\n<pre><code>Amount: 1000</code></pre></li>\n</ol>"
   }
- ], 
- "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": "2019-05-11 17:33:08.508653", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Salary Detail", 
- "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, 
- "track_views": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2019-12-12 15:36:46.103938",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Salary Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index fa3114cdaac..da26007f8a5 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -1,1955 +1,510 @@
 {
-   "allow_copy": 0,
-   "allow_events_in_timeline": 0,
-   "allow_guest_to_view": 0,
-   "allow_import": 1,
-   "allow_rename": 0,
-   "beta": 0,
-   "creation": "2013-01-10 16:34:15",
-   "custom": 0,
-   "default_print_format": "",
-   "docstatus": 0,
-   "doctype": "DocType",
-   "document_type": "Setup",
-   "editable_grid": 0,
-   "fields": [
-    {
-     "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",
-     "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": "Posting Date",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 1,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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,
-     "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": "Read Only",
-     "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,
-     "oldfieldname": "employee_name",
-     "oldfieldtype": "Data",
-     "options": "",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 1,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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": 1,
-     "label": "Department",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "department",
-     "oldfieldtype": "Link",
-     "options": "Department",
-     "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": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.designation",
-     "fetch_from": "employee.designation",
-     "fieldname": "designation",
-     "fieldtype": "Read Only",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Designation",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "designation",
-     "oldfieldtype": "Link",
-     "options": "",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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.branch",
-     "fieldname": "branch",
-     "fieldtype": "Link",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 1,
-     "label": "Branch",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "branch",
-     "oldfieldtype": "Link",
-     "options": "Branch",
-     "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": 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,
-     "fieldname": "status",
-     "fieldtype": "Select",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Status",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Draft\nSubmitted\nCancelled",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "journal_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": "Journal Entry",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Journal 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": "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,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 1,
-     "in_standard_filter": 1,
-     "label": "Company",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 1,
-     "report_hide": 0,
-     "reqd": 1,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 1,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "letter_head",
-     "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": "Letter Head",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Letter Head",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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_10",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_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": "salary_slip_based_on_timesheet",
-     "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": "Salary Slip Based on Timesheet",
-     "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,
-     "default": "",
-     "fieldname": "start_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": "Start Date",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "",
-     "depends_on": "",
-     "fieldname": "end_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": "End Date",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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_15",
-     "fieldtype": "Column Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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": "salary_structure",
-     "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 Structure",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Salary Structure",
-     "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": "",
-     "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)",
-     "fieldname": "payroll_frequency",
-     "fieldtype": "Select",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Payroll Frequency",
-     "length": 0,
-     "no_copy": 0,
-     "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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": "total_working_days",
-     "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": "Working Days",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "total_days_in_month",
-     "oldfieldtype": "Int",
-     "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": "",
-     "fieldname": "leave_without_pay",
-     "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": "Leave Without Pay",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "leave_without_pay",
-     "oldfieldtype": "Currency",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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_days",
-     "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": "Payment Days",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "payment_days",
-     "oldfieldtype": "Float",
-     "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": "",
-     "fieldname": "hourly_wages",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_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": "timesheets",
-     "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": "Salary Slip Timesheet",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Salary Slip Timesheet",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_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_20",
-     "fieldtype": "Column Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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_working_hours",
-     "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 Working Hours",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 1,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "hour_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": "Hour Rate",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 1,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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": "section_break_26",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_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": "bank_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": "Bank Name",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "bank_name",
-     "oldfieldtype": "Data",
-     "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": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "bank_account_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": "Bank Account No.",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "bank_account_no",
-     "oldfieldtype": "Data",
-     "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": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "section_break_32",
-     "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": "deduct_tax_for_unclaimed_employee_benefits",
-     "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": "Deduct Tax For Unclaimed Employee Benefits",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_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": "deduct_tax_for_unsubmitted_tax_exemption_proof",
-     "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": "Deduct Tax For Unsubmitted Tax Exemption Proof",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_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": "earning_deduction",
-     "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": "Earning & Deduction",
-     "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": "earning",
-     "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": "Earning",
-     "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": "",
-     "fieldname": "earnings",
-     "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": "Earnings",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "earning_details",
-     "oldfieldtype": "Table",
-     "options": "Salary Detail",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "deduction",
-     "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": "Deduction",
-     "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,
-     "fieldname": "deductions",
-     "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": "Deductions",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "deduction_details",
-     "oldfieldtype": "Table",
-     "options": "Salary Detail",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "totals",
-     "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": "gross_pay",
-     "fieldtype": "Currency",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Gross Pay",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "gross_pay",
-     "oldfieldtype": "Currency",
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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_25",
-     "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": "total_deduction",
-     "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 Deduction",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "total_deduction",
-     "oldfieldtype": "Currency",
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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": "total_loan_repayment",
-     "fieldname": "loan_repayment",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Loan repayment",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "loans",
-     "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": "Employee Loan",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Salary Slip Loan",
-     "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
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "section_break_43",
-     "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": "0",
-     "fieldname": "total_principal_amount",
-     "fieldtype": "Currency",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Total Principal Amount",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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": "total_interest_amount",
-     "fieldtype": "Currency",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Total Interest Amount",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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_45",
-     "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": "total_loan_repayment",
-     "fieldtype": "Currency",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Total Loan Repayment",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "net_pay_info",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "net pay info",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "Gross Pay - Total Deduction - Loan Repayment",
-     "fieldname": "net_pay",
-     "fieldtype": "Currency",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Net Pay",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "net_pay",
-     "oldfieldtype": "Currency",
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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_53",
-     "fieldtype": "Column Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 1,
-     "collapsible": 0,
-     "columns": 0,
-     "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": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "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_55",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "Net Pay (in words) will be visible once you save the Salary Slip.",
-     "fieldname": "total_in_words",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Total in words",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "net_pay_in_words",
-     "oldfieldtype": "Data",
-     "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": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 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": "Salary Slip",
-     "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
-    }
-   ],
-   "has_web_view": 0,
-   "hide_heading": 0,
-   "hide_toolbar": 0,
-   "icon": "fa fa-file-text",
-   "idx": 9,
-   "image_view": 0,
-   "in_create": 0,
-   "is_submittable": 1,
-   "issingle": 0,
-   "istable": 0,
-   "max_attachments": 0,
-   "modified": "2019-06-19 13:10:14.524119",
-   "modified_by": "Administrator",
-   "module": "HR",
-   "name": "Salary Slip",
-   "owner": "Administrator",
-   "permissions": [
-    {
-     "amend": 0,
-     "cancel": 0,
-     "create": 1,
-     "delete": 0,
-     "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,
-     "write": 1
-    },
-    {
-     "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
-    }
-   ],
-   "quick_entry": 0,
-   "read_only": 0,
-   "read_only_onload": 0,
-   "show_name_in_global_search": 1,
-   "sort_field": "modified",
-   "sort_order": "DESC",
-   "timeline_field": "employee",
-   "title_field": "employee_name",
-   "track_changes": 0,
-   "track_seen": 0,
-   "track_views": 0
-  }
\ No newline at end of file
+ "actions": [],
+ "allow_import": 1,
+ "creation": "2013-01-10 16:34:15",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "posting_date",
+  "employee",
+  "employee_name",
+  "department",
+  "designation",
+  "column_break1",
+  "company",
+  "journal_entry",
+  "payroll_entry",
+  "letter_head",
+  "branch",
+  "status",
+  "section_break_10",
+  "salary_slip_based_on_timesheet",
+  "payroll_frequency",
+  "start_date",
+  "end_date",
+  "column_break_15",
+  "salary_structure",
+  "total_working_days",
+  "leave_without_pay",
+  "payment_days",
+  "hourly_wages",
+  "timesheets",
+  "column_break_20",
+  "total_working_hours",
+  "hour_rate",
+  "section_break_26",
+  "bank_name",
+  "bank_account_no",
+  "section_break_32",
+  "deduct_tax_for_unclaimed_employee_benefits",
+  "deduct_tax_for_unsubmitted_tax_exemption_proof",
+  "earning_deduction",
+  "earning",
+  "earnings",
+  "deduction",
+  "deductions",
+  "totals",
+  "gross_pay",
+  "column_break_25",
+  "total_deduction",
+  "loan_repayment",
+  "loans",
+  "section_break_43",
+  "total_principal_amount",
+  "total_interest_amount",
+  "column_break_45",
+  "total_loan_repayment",
+  "net_pay_info",
+  "net_pay",
+  "column_break_53",
+  "rounded_total",
+  "section_break_55",
+  "total_in_words",
+  "amended_from"
+ ],
+ "fields": [
+  {
+   "default": "Today",
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Posting Date",
+   "reqd": 1
+  },
+  {
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Employee",
+   "oldfieldname": "employee",
+   "oldfieldtype": "Link",
+   "options": "Employee",
+   "reqd": 1,
+   "search_index": 1
+  },
+  {
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Read Only",
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "label": "Employee Name",
+   "oldfieldname": "employee_name",
+   "oldfieldtype": "Data",
+   "reqd": 1
+  },
+  {
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Department",
+   "oldfieldname": "department",
+   "oldfieldtype": "Link",
+   "options": "Department",
+   "read_only": 1
+  },
+  {
+   "depends_on": "eval:doc.designation",
+   "fetch_from": "employee.designation",
+   "fieldname": "designation",
+   "fieldtype": "Read Only",
+   "label": "Designation",
+   "oldfieldname": "designation",
+   "oldfieldtype": "Link"
+  },
+  {
+   "fetch_from": "employee.branch",
+   "fieldname": "branch",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Branch",
+   "oldfieldname": "branch",
+   "oldfieldtype": "Link",
+   "options": "Branch",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "width": "50%"
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "label": "Status",
+   "options": "Draft\nSubmitted\nCancelled",
+   "read_only": 1
+  },
+  {
+   "fieldname": "journal_entry",
+   "fieldtype": "Link",
+   "label": "Journal Entry",
+   "options": "Journal Entry",
+   "read_only": 1
+  },
+  {
+   "fieldname": "payroll_entry",
+   "fieldtype": "Link",
+   "label": "Payroll Entry",
+   "options": "Payroll Entry",
+   "read_only": 1
+  },
+  {
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Company",
+   "options": "Company",
+   "remember_last_selected_value": 1,
+   "reqd": 1
+  },
+  {
+   "allow_on_submit": 1,
+   "fieldname": "letter_head",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Letter Head",
+   "options": "Letter Head",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "section_break_10",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "salary_slip_based_on_timesheet",
+   "fieldtype": "Check",
+   "label": "Salary Slip Based on Timesheet",
+   "read_only": 1
+  },
+  {
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "label": "Start Date"
+  },
+  {
+   "fieldname": "end_date",
+   "fieldtype": "Date",
+   "label": "End Date"
+  },
+  {
+   "fieldname": "column_break_15",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "salary_structure",
+   "fieldtype": "Link",
+   "label": "Salary Structure",
+   "options": "Salary Structure",
+   "read_only": 1
+  },
+  {
+   "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)",
+   "fieldname": "payroll_frequency",
+   "fieldtype": "Select",
+   "label": "Payroll Frequency",
+   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily"
+  },
+  {
+   "fieldname": "total_working_days",
+   "fieldtype": "Float",
+   "label": "Working Days",
+   "oldfieldname": "total_days_in_month",
+   "oldfieldtype": "Int",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "leave_without_pay",
+   "fieldtype": "Float",
+   "label": "Leave Without Pay",
+   "oldfieldname": "leave_without_pay",
+   "oldfieldtype": "Currency"
+  },
+  {
+   "fieldname": "payment_days",
+   "fieldtype": "Float",
+   "label": "Payment Days",
+   "oldfieldname": "payment_days",
+   "oldfieldtype": "Float",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "hourly_wages",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "timesheets",
+   "fieldtype": "Table",
+   "label": "Salary Slip Timesheet",
+   "options": "Salary Slip Timesheet"
+  },
+  {
+   "fieldname": "column_break_20",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "total_working_hours",
+   "fieldtype": "Float",
+   "label": "Total Working Hours",
+   "print_hide_if_no_value": 1
+  },
+  {
+   "fieldname": "hour_rate",
+   "fieldtype": "Currency",
+   "label": "Hour Rate",
+   "options": "Company:company:default_currency",
+   "print_hide_if_no_value": 1
+  },
+  {
+   "fieldname": "section_break_26",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "bank_name",
+   "fieldtype": "Data",
+   "label": "Bank Name",
+   "oldfieldname": "bank_name",
+   "oldfieldtype": "Data",
+   "read_only": 1
+  },
+  {
+   "fieldname": "bank_account_no",
+   "fieldtype": "Data",
+   "label": "Bank Account No.",
+   "oldfieldname": "bank_account_no",
+   "oldfieldtype": "Data",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_32",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "deduct_tax_for_unclaimed_employee_benefits",
+   "fieldtype": "Check",
+   "label": "Deduct Tax For Unclaimed Employee Benefits"
+  },
+  {
+   "default": "0",
+   "fieldname": "deduct_tax_for_unsubmitted_tax_exemption_proof",
+   "fieldtype": "Check",
+   "label": "Deduct Tax For Unsubmitted Tax Exemption Proof"
+  },
+  {
+   "fieldname": "earning_deduction",
+   "fieldtype": "Section Break",
+   "label": "Earning & Deduction",
+   "oldfieldtype": "Section Break"
+  },
+  {
+   "fieldname": "earning",
+   "fieldtype": "Column Break",
+   "label": "Earning",
+   "oldfieldtype": "Column Break",
+   "width": "50%"
+  },
+  {
+   "fieldname": "earnings",
+   "fieldtype": "Table",
+   "label": "Earnings",
+   "oldfieldname": "earning_details",
+   "oldfieldtype": "Table",
+   "options": "Salary Detail"
+  },
+  {
+   "fieldname": "deduction",
+   "fieldtype": "Column Break",
+   "label": "Deduction",
+   "oldfieldtype": "Column Break",
+   "width": "50%"
+  },
+  {
+   "fieldname": "deductions",
+   "fieldtype": "Table",
+   "label": "Deductions",
+   "oldfieldname": "deduction_details",
+   "oldfieldtype": "Table",
+   "options": "Salary Detail"
+  },
+  {
+   "fieldname": "totals",
+   "fieldtype": "Section Break",
+   "oldfieldtype": "Section Break"
+  },
+  {
+   "fieldname": "gross_pay",
+   "fieldtype": "Currency",
+   "label": "Gross Pay",
+   "oldfieldname": "gross_pay",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_25",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "total_deduction",
+   "fieldtype": "Currency",
+   "label": "Total Deduction",
+   "oldfieldname": "total_deduction",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
+  {
+   "depends_on": "total_loan_repayment",
+   "fieldname": "loan_repayment",
+   "fieldtype": "Section Break",
+   "label": "Loan repayment"
+  },
+  {
+   "fieldname": "loans",
+   "fieldtype": "Table",
+   "label": "Employee Loan",
+   "options": "Salary Slip Loan",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_43",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "total_principal_amount",
+   "fieldtype": "Currency",
+   "label": "Total Principal Amount",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "total_interest_amount",
+   "fieldtype": "Currency",
+   "label": "Total Interest Amount",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_45",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "total_loan_repayment",
+   "fieldtype": "Currency",
+   "label": "Total Loan Repayment",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "net_pay_info",
+   "fieldtype": "Section Break",
+   "label": "net pay info"
+  },
+  {
+   "description": "Gross Pay - Total Deduction - Loan Repayment",
+   "fieldname": "net_pay",
+   "fieldtype": "Currency",
+   "label": "Net Pay",
+   "oldfieldname": "net_pay",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_53",
+   "fieldtype": "Column Break"
+  },
+  {
+   "bold": 1,
+   "fieldname": "rounded_total",
+   "fieldtype": "Currency",
+   "label": "Rounded Total",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_55",
+   "fieldtype": "Section Break"
+  },
+  {
+   "description": "Net Pay (in words) will be visible once you save the Salary Slip.",
+   "fieldname": "total_in_words",
+   "fieldtype": "Data",
+   "label": "Total in words",
+   "oldfieldname": "net_pay_in_words",
+   "oldfieldtype": "Data",
+   "read_only": 1
+  },
+  {
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "Amended From",
+   "no_copy": 1,
+   "oldfieldname": "amended_from",
+   "oldfieldtype": "Data",
+   "options": "Salary Slip",
+   "print_hide": 1,
+   "read_only": 1
+  }
+ ],
+ "icon": "fa fa-file-text",
+ "idx": 9,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-12 15:30:23.678933",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Salary Slip",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "share": 1,
+   "submit": 1,
+   "write": 1
+  },
+  {
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "share": 1,
+   "submit": 1,
+   "write": 1
+  },
+  {
+   "read": 1,
+   "role": "Employee"
+  }
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "timeline_field": "employee",
+ "title_field": "employee_name"
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.json b/erpnext/hr/doctype/shift_assignment/shift_assignment.json
index d4cd1c4c939..72cbba8a0dc 100644
--- a/erpnext/hr/doctype/shift_assignment/shift_assignment.json
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "HR-SHA-.YY.-.MM.-.#####",
  "creation": "2018-04-13 16:25:04.562730",
@@ -8,12 +9,12 @@
  "field_order": [
   "employee",
   "employee_name",
-  "department",
   "shift_type",
   "column_break_3",
   "company",
   "date",
   "shift_request",
+  "department",
   "amended_from"
  ],
  "fields": [
@@ -82,7 +83,8 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-05-30 15:40:54.418427",
+ "links": [],
+ "modified": "2019-12-12 15:49:06.956901",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Assignment",
diff --git a/erpnext/hr/doctype/travel_request/travel_request.json b/erpnext/hr/doctype/travel_request/travel_request.json
index c1c6524af35..441907c02d1 100644
--- a/erpnext/hr/doctype/travel_request/travel_request.json
+++ b/erpnext/hr/doctype/travel_request/travel_request.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "HR-TRQ-.YYYY.-.#####",
  "creation": "2018-05-15 06:32:33.950356",
  "doctype": "DocType",
@@ -11,8 +12,6 @@
   "column_break_2",
   "purpose_of_travel",
   "details_of_sponsor",
-  "section_break_4",
-  "description",
   "employee_details",
   "employee",
   "employee_name",
@@ -23,6 +22,8 @@
   "personal_id_type",
   "personal_id_number",
   "passport_number",
+  "section_break_4",
+  "description",
   "travel_itinerary",
   "itinerary",
   "costing_details",
@@ -33,7 +34,8 @@
   "event_details",
   "name_of_organizer",
   "address_of_organizer",
-  "other_details"
+  "other_details",
+  "amended_from"
  ],
  "fields": [
   {
@@ -213,7 +215,8 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-05-25 23:15:00.609186",
+ "links": [],
+ "modified": "2019-12-12 18:42:26.451359",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Travel Request",

From d2eae9fbcf0067584e5cb10c947dfc0c6331d88a Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Mon, 16 Dec 2019 12:25:49 +0530
Subject: [PATCH 163/193] fix: Atendance Request, Employee Skill Map, Leave
 Encashment form UI

---
 .../attendance_request.json                   | 709 ++++-------------
 .../employee_skill_map.json                   | 258 +------
 .../leave_encashment/leave_encashment.json    | 719 +++++-------------
 3 files changed, 356 insertions(+), 1330 deletions(-)

diff --git a/erpnext/hr/doctype/attendance_request/attendance_request.json b/erpnext/hr/doctype/attendance_request/attendance_request.json
index bcd3331da1e..837a87824fa 100644
--- a/erpnext/hr/doctype/attendance_request/attendance_request.json
+++ b/erpnext/hr/doctype/attendance_request/attendance_request.json
@@ -1,575 +1,190 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "HR-ARQ-.YY.-.MM.-.#####", 
- "beta": 0, 
- "creation": "2018-04-13 15:37:40.918990", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "HR-ARQ-.YY.-.MM.-.#####",
+ "creation": "2018-04-13 15:37:40.918990",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "employee",
+  "employee_name",
+  "department",
+  "column_break_5",
+  "company",
+  "from_date",
+  "to_date",
+  "half_day",
+  "half_day_date",
+  "reason_section",
+  "reason",
+  "column_break_4",
+  "explanation",
+  "amended_from"
+ ],
  "fields": [
   {
-   "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": 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
-  }, 
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Employee",
+   "options": "Employee",
+   "reqd": 1
+  },
   {
-   "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, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "label": "Employee Name",
+   "read_only": 1
+  },
   {
-   "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
-  }, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "label": "Department",
+   "options": "Department",
+   "read_only": 1
+  },
   {
-   "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, 
-   "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
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "remember_last_selected_value": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
   {
-   "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
-  }, 
+   "fieldname": "from_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "From Date",
+   "reqd": 1
+  },
   {
-   "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
-  }, 
+   "fieldname": "to_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "To Date",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "half_day", 
-   "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": "Half Day", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "default": "0",
+   "fieldname": "half_day",
+   "fieldtype": "Check",
+   "label": "Half Day"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "half_day", 
-   "fieldname": "half_day_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Half Day Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "half_day",
+   "fieldname": "half_day_date",
+   "fieldtype": "Date",
+   "label": "Half Day Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reason_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": "Reason", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "reason_section",
+   "fieldtype": "Section Break",
+   "label": "Reason"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reason", 
-   "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": "Reason", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Work From Home\nOn Duty", 
-   "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
-  }, 
+   "fieldname": "reason",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Reason",
+   "options": "Work From Home\nOn Duty",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "explanation", 
-   "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": "Explanation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "explanation",
+   "fieldtype": "Small Text",
+   "label": "Explanation"
+  },
   {
-   "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": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Attendance Request", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Attendance Request",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-08-21 17:09:48.117407", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Attendance Request", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-16 11:49:26.943173",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Attendance Request",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "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": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "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": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "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": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "share": 1,
+   "submit": 1,
    "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": "Employee", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Employee",
+   "share": 1,
    "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": "employee_name", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "employee_name",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_skill_map/employee_skill_map.json b/erpnext/hr/doctype/employee_skill_map/employee_skill_map.json
index 624145f23a9..21e25132a16 100644
--- a/erpnext/hr/doctype/employee_skill_map/employee_skill_map.json
+++ b/erpnext/hr/doctype/employee_skill_map/employee_skill_map.json
@@ -1,298 +1,88 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "field:employee",
- "beta": 0,
  "creation": "2019-04-16 10:07:48.303426",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
- "editable_grid": 0,
  "engine": "InnoDB",
+ "field_order": [
+  "employee",
+  "employee_name",
+  "column_break_3",
+  "designation",
+  "skills_section",
+  "employee_skills",
+  "trainings_section",
+  "trainings"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 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": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fetch_from": "employee.employee_name",
-   "fetch_if_empty": 0,
    "fieldname": "employee_name",
    "fieldtype": "Read Only",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Employee 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
+   "label": "Employee Name"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fetch_from": "employee.designation",
-   "fetch_if_empty": 0,
    "fieldname": "designation",
    "fieldtype": "Read Only",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Designation",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "label": "Designation"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "skills_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": "Skills",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "label": "Skills"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "employee_skills",
    "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": "Employee Skills",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Employee Skill",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "options": "Employee Skill"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "trainings_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": "Trainings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "label": "Trainings"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "trainings",
    "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": "Trainings",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Employee Training",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_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
+   "options": "Employee Training"
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
   }
  ],
- "has_web_view": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-04-16 16:16:40.058429",
+ "links": [],
+ "modified": "2019-12-16 11:31:09.916893",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Employee Skill Map",
- "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,
    "write": 1
   }
  ],
  "quick_entry": 1,
- "read_only": 0,
- "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "ASC",
- "title_field": "employee_name",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ "title_field": "employee_name"
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_encashment/leave_encashment.json b/erpnext/hr/doctype/leave_encashment/leave_encashment.json
index 29f634e8649..2cf6ccf5ca0 100644
--- a/erpnext/hr/doctype/leave_encashment/leave_encashment.json
+++ b/erpnext/hr/doctype/leave_encashment/leave_encashment.json
@@ -1,577 +1,198 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "HR-ENC-.YYYY.-.#####", 
- "beta": 0, 
- "creation": "2018-04-13 15:31:51.197046", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "HR-ENC-.YYYY.-.#####",
+ "creation": "2018-04-13 15:31:51.197046",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "leave_period",
+  "employee",
+  "employee_name",
+  "department",
+  "column_break_4",
+  "leave_type",
+  "leave_allocation",
+  "leave_balance",
+  "encashable_days",
+  "amended_from",
+  "payroll",
+  "encashment_amount",
+  "encashment_date",
+  "additional_salary"
+ ],
  "fields": [
   {
-   "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": 1, 
-   "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": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "leave_period",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Leave Period",
+   "options": "Leave Period",
+   "reqd": 1
+  },
   {
-   "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": 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
-  }, 
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Employee",
+   "options": "Employee",
+   "reqd": 1
+  },
   {
-   "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, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "label": "Employee Name",
+   "read_only": 1
+  },
   {
-   "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
-  }, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "label": "Department",
+   "options": "Department",
+   "read_only": 1
+  },
   {
-   "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": 0, 
-   "label": "Leave Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Leave Type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "leave_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Leave Type",
+   "options": "Leave Type",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "leave_allocation", 
-   "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 Allocation", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Leave Allocation", 
-   "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
-  }, 
+   "fieldname": "leave_allocation",
+   "fieldtype": "Link",
+   "label": "Leave Allocation",
+   "no_copy": 1,
+   "options": "Leave Allocation",
+   "read_only": 1
+  },
   {
-   "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, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Leave Balance", 
-   "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
-  }, 
+   "fieldname": "leave_balance",
+   "fieldtype": "Float",
+   "label": "Leave Balance",
+   "no_copy": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "encashable_days", 
-   "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": "Encashable days", 
-   "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
-  }, 
+   "fieldname": "encashable_days",
+   "fieldtype": "Float",
+   "label": "Encashable days",
+   "no_copy": 1,
+   "read_only": 1
+  },
   {
-   "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": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Leave Encashment", 
-   "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
-  }, 
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Leave Encashment",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "payroll", 
-   "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": "Payroll", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "payroll",
+   "fieldtype": "Section Break",
+   "label": "Payroll"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "encashment_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": "Encashment Amount", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "encashment_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Encashment Amount",
+   "no_copy": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "encashment_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": "Encashment 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
-  }, 
+   "default": "Today",
+   "fieldname": "encashment_date",
+   "fieldtype": "Date",
+   "label": "Encashment Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "additional_salary", 
-   "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": "Additional Salary", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Additional Salary", 
-   "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
+   "fieldname": "additional_salary",
+   "fieldtype": "Link",
+   "label": "Additional Salary",
+   "no_copy": 1,
+   "options": "Additional Salary",
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-08-21 16:15:43.829272", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Leave Encashment", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-16 11:51:57.732223",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Leave Encashment",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "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": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "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": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "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": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "share": 1,
+   "submit": 1,
    "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": "Employee", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Employee",
+   "share": 1,
    "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, 
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file

From 5748cde54ba33512382c106c04b24b4080697b73 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 31 Dec 2019 17:17:54 +0530
Subject: [PATCH 164/193] fix: minor field arrangements

---
 erpnext/hr/doctype/salary_detail/salary_detail.json | 6 +++---
 erpnext/hr/doctype/salary_slip/salary_slip.json     | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/erpnext/hr/doctype/salary_detail/salary_detail.json b/erpnext/hr/doctype/salary_detail/salary_detail.json
index 3e6161694e9..bde735d3bc9 100644
--- a/erpnext/hr/doctype/salary_detail/salary_detail.json
+++ b/erpnext/hr/doctype/salary_detail/salary_detail.json
@@ -7,10 +7,10 @@
  "field_order": [
   "salary_component",
   "abbr",
+  "statistical_component",
+  "column_break_3",
   "deduct_full_tax_on_selected_payroll_date",
   "depends_on_payment_days",
-  "column_break_3",
-  "statistical_component",
   "is_tax_applicable",
   "is_flexible_benefit",
   "variable_based_on_taxable_salary",
@@ -191,7 +191,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2019-12-12 15:36:46.103938",
+ "modified": "2019-12-31 17:15:25.646689",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Salary Detail",
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index da26007f8a5..e73d41a28ed 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -309,7 +309,6 @@
   {
    "fieldname": "earning",
    "fieldtype": "Column Break",
-   "label": "Earning",
    "oldfieldtype": "Column Break",
    "width": "50%"
   },
@@ -324,7 +323,6 @@
   {
    "fieldname": "deduction",
    "fieldtype": "Column Break",
-   "label": "Deduction",
    "oldfieldtype": "Column Break",
    "width": "50%"
   },
@@ -466,7 +464,7 @@
  "idx": 9,
  "is_submittable": 1,
  "links": [],
- "modified": "2019-12-12 15:30:23.678933",
+ "modified": "2019-12-31 17:13:45.146271",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Salary Slip",

From 440a3b75be6a8ee7c7baae4b3e2e484203dedcea Mon Sep 17 00:00:00 2001
From: Saqib <thefalconx33@gmail.com>
Date: Tue, 31 Dec 2019 17:20:04 +0530
Subject: [PATCH 165/193] fix: don't show transfer button if already items are
 supplied (#20154)

---
 erpnext/buying/doctype/purchase_order/purchase_order.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 7b5e5c5cca0..7b1f1354d79 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -134,7 +134,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 				if (doc.status != "On Hold") {
 					if(flt(doc.per_received, 2) < 100 && allow_receipt) {
 						cur_frm.add_custom_button(__('Receipt'), this.make_purchase_receipt, __('Create'));
-						if(doc.is_subcontracted==="Yes") {
+						if(doc.is_subcontracted==="Yes" && me.has_unsupplied_items()) {
 							cur_frm.add_custom_button(__('Material to Supplier'),
 								function() { me.make_stock_entry(); }, __("Transfer"));
 						}
@@ -191,6 +191,10 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 		set_schedule_date(this.frm);
 	},
 
+	has_unsupplied_items: function() {
+		return this.frm.doc['supplied_items'].some(item => item.required_qty != item.supplied_qty)
+	},
+
 	make_stock_entry: function() {
 		var items = $.map(cur_frm.doc.items, function(d) { return d.bom ? d.item_code : false; });
 		var me = this;
@@ -267,7 +271,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
 
 		if (me.frm.doc['supplied_items']) {
 			me.frm.doc['supplied_items'].forEach((item, index) => {
-			if (item.rm_item_code && item.main_item_code) {
+			if (item.rm_item_code && item.main_item_code && item.required_qty - item.supplied_qty != 0) {
 					me.raw_material_data.push ({
 						'name':item.name,
 						'item_code': item.main_item_code,

From 938ba3efc4365677c6ab42b65e9ba3112811123a Mon Sep 17 00:00:00 2001
From: Rohan <Alchez@users.noreply.github.com>
Date: Tue, 31 Dec 2019 17:21:07 +0530
Subject: [PATCH 166/193] feat: show item name in Item Price list view (#20156)

---
 .../stock/doctype/item_price/item_price.json  | 1164 ++++-------------
 1 file changed, 220 insertions(+), 944 deletions(-)

diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index 9e29ad08ee3..8456b584ca0 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -1,981 +1,257 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2013-05-02 16:29:48", 
- "custom": 0, 
- "description": "Multiple Item prices.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "creation": "2013-05-02 16:29:48",
+ "description": "Multiple Item prices.",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "item_code",
+  "uom",
+  "packing_unit",
+  "min_qty",
+  "column_break_17",
+  "item_name",
+  "brand",
+  "item_description",
+  "price_list_details",
+  "price_list",
+  "customer",
+  "supplier",
+  "column_break_3",
+  "buying",
+  "selling",
+  "item_details",
+  "currency",
+  "col_br_1",
+  "price_list_rate",
+  "section_break_15",
+  "valid_from",
+  "lead_time_days",
+  "column_break_18",
+  "valid_upto",
+  "section_break_24",
+  "note",
+  "reference"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "price_list_name", 
-   "oldfieldtype": "Select", 
-   "options": "Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Item Code",
+   "oldfieldname": "price_list_name",
+   "oldfieldtype": "Select",
+   "options": "Item",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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
-  }, 
+   "fieldname": "uom",
+   "fieldtype": "Link",
+   "label": "UOM",
+   "options": "UOM"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "description": "Quantity  that must be bought or sold per UOM", 
-   "fetch_if_empty": 0, 
-   "fieldname": "packing_unit", 
-   "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": "Packing Unit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "default": "0",
+   "description": "Quantity  that must be bought or sold per UOM",
+   "fieldname": "packing_unit",
+   "fieldtype": "Int",
+   "label": "Packing Unit"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fetch_if_empty": 0, 
-   "fieldname": "min_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": "Minimum Qty ", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "1",
+   "fieldname": "min_qty",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Minimum Qty "
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_17", 
-   "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
-  }, 
+   "fieldname": "column_break_17",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "item_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Item Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "item_code.brand", 
-   "fetch_if_empty": 0, 
-   "fieldname": "brand", 
-   "fieldtype": "Read Only", 
-   "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": "Brand", 
-   "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
-  }, 
+   "fetch_from": "item_code.brand",
+   "fieldname": "brand",
+   "fieldtype": "Read Only",
+   "in_list_view": 1,
+   "label": "Brand",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "item_description", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_description",
+   "fieldtype": "Text",
+   "label": "Item Description",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "price_list_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": "Price List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-tags", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "price_list_details",
+   "fieldtype": "Section Break",
+   "label": "Price List",
+   "options": "fa fa-tags"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "price_list", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Price List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Price List", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "price_list",
+   "fieldtype": "Link",
+   "in_global_search": 1,
+   "in_standard_filter": 1,
+   "label": "Price List",
+   "options": "Price List",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.selling == 1", 
-   "fetch_if_empty": 0, 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "bold": 1,
+   "depends_on": "eval:doc.selling == 1",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "label": "Customer",
+   "options": "Customer"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.buying == 1", 
-   "fetch_if_empty": 0, 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "depends_on": "eval:doc.buying == 1",
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "label": "Supplier",
+   "options": "Supplier"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 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
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "buying", 
-   "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": "Buying", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "buying",
+   "fieldtype": "Check",
+   "label": "Buying",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "selling", 
-   "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": "Selling", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "selling",
+   "fieldtype": "Check",
+   "label": "Selling",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "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": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-tag", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_details",
+   "fieldtype": "Section Break",
+   "options": "fa fa-tag"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "currency", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "bold": 1,
+   "fieldname": "currency",
+   "fieldtype": "Link",
+   "label": "Currency",
+   "options": "Currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "col_br_1", 
-   "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
-  }, 
+   "fieldname": "col_br_1",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "price_list_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "ref_rate", 
-   "oldfieldtype": "Currency", 
-   "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
-  }, 
+   "fieldname": "price_list_rate",
+   "fieldtype": "Currency",
+   "in_filter": 1,
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "label": "Rate",
+   "oldfieldname": "ref_rate",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_15", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "section_break_15",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fetch_if_empty": 0, 
-   "fieldname": "valid_from", 
-   "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": "Valid From ", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "default": "Today",
+   "fieldname": "valid_from",
+   "fieldtype": "Date",
+   "label": "Valid From "
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fetch_if_empty": 0, 
-   "fieldname": "lead_time_days", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Lead Time in days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "lead_time_days",
+   "fieldtype": "Int",
+   "label": "Lead Time in days"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_18", 
-   "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
-  }, 
+   "fieldname": "column_break_18",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "valid_upto", 
-   "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": "Valid Upto ", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "valid_upto",
+   "fieldtype": "Date",
+   "label": "Valid Upto "
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_24", 
-   "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
-  }, 
+   "fieldname": "section_break_24",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "note", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "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
-  }, 
+   "fieldname": "note",
+   "fieldtype": "Text",
+   "label": "Note"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "reference", 
-   "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": "Reference", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
+   "fieldname": "reference",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Reference"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-flag", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-04-12 12:33:54.621527", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Price", 
- "name_case": "Title Case", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-flag",
+ "idx": 1,
+ "links": [],
+ "modified": "2019-12-31 03:11:09.702250",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Price",
+ "name_case": "Title Case",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Master Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Purchase Master Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_order": "ASC", 
- "title_field": "item_code", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "quick_entry": 1,
+ "sort_order": "ASC",
+ "title_field": "item_name",
+ "track_changes": 1
 }
\ No newline at end of file

From 8554304616685a0db0b507fffe1828a9a29dbb86 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Tue, 31 Dec 2019 17:23:31 +0530
Subject: [PATCH 167/193] fix: set currency to company default currency
 (#20157)

---
 .../salary_structure/salary_structure.json    | 1209 ++++-------------
 .../salary_structure_assignment.json          |  644 ++-------
 2 files changed, 386 insertions(+), 1467 deletions(-)

diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index 0e47278a3e1..58c4044093e 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -1,1010 +1,283 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "Prompt", 
- "beta": 0, 
- "creation": "2013-03-07 18:50:29", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "Prompt",
+ "creation": "2013-03-07 18:50:29",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+  "company",
+  "letter_head",
+  "column_break1",
+  "is_active",
+  "payroll_frequency",
+  "is_default",
+  "time_sheet_earning_detail",
+  "salary_slip_based_on_timesheet",
+  "column_break_17",
+  "salary_component",
+  "hour_rate",
+  "leave_encashment_amount_per_day",
+  "max_benefits",
+  "earning_deduction",
+  "earning",
+  "earnings",
+  "deduction",
+  "deductions",
+  "net_pay_detail",
+  "column_break2",
+  "total_earning",
+  "total_deduction",
+  "net_pay",
+  "account",
+  "mode_of_payment",
+  "column_break_28",
+  "payment_account",
+  "amended_from"
+ ],
  "fields": [
   {
-   "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, 
-   "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
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "remember_last_selected_value": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "letter_head", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Letter Head", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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
-  }, 
+   "fieldname": "letter_head",
+   "fieldtype": "Link",
+   "label": "Letter Head",
+   "options": "Letter Head"
+  },
   {
-   "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, 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Yes", 
-   "fieldname": "is_active", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Is Active", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_active", 
-   "oldfieldtype": "Select", 
-   "options": "\nYes\nNo", 
-   "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
-  }, 
+   "default": "Yes",
+   "fieldname": "is_active",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Is Active",
+   "oldfieldname": "is_active",
+   "oldfieldtype": "Select",
+   "options": "\nYes\nNo",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Monthly", 
-   "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)", 
-   "fieldname": "payroll_frequency", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Payroll Frequency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Monthly",
+   "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)",
+   "fieldname": "payroll_frequency",
+   "fieldtype": "Select",
+   "label": "Payroll Frequency",
+   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "No", 
-   "fieldname": "is_default", 
-   "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": "Is Default", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Yes\nNo", 
-   "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
-  }, 
+   "default": "No",
+   "fieldname": "is_default",
+   "fieldtype": "Select",
+   "hidden": 1,
+   "label": "Is Default",
+   "no_copy": 1,
+   "options": "Yes\nNo",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "time_sheet_earning_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": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "time_sheet_earning_detail",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "salary_slip_based_on_timesheet", 
-   "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": "Salary Slip Based on Timesheet", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "default": "0",
+   "fieldname": "salary_slip_based_on_timesheet",
+   "fieldtype": "Check",
+   "label": "Salary Slip Based on Timesheet"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_17", 
-   "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
-  }, 
+   "fieldname": "column_break_17",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "description": "Salary Component for timesheet based payroll.", 
-   "fieldname": "salary_component", 
-   "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 Component", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Salary Component", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "description": "Salary Component for timesheet based payroll.",
+   "fieldname": "salary_component",
+   "fieldtype": "Link",
+   "label": "Salary Component",
+   "options": "Salary Component"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "hour_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": "Hour Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "hour_rate",
+   "fieldtype": "Currency",
+   "label": "Hour Rate",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "leave_encashment_amount_per_day", 
-   "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": "Leave Encashment Amount Per Day", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "leave_encashment_amount_per_day",
+   "fieldtype": "Currency",
+   "label": "Leave Encashment Amount Per Day",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "max_benefits", 
-   "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": "Max Benefits (Amount)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "max_benefits",
+   "fieldtype": "Currency",
+   "label": "Max Benefits (Amount)",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "description": "Salary breakup based on Earning and Deduction.", 
-   "fieldname": "earning_deduction", 
-   "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, 
-   "oldfieldname": "earning_deduction", 
-   "oldfieldtype": "Section Break", 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "description": "Salary breakup based on Earning and Deduction.",
+   "fieldname": "earning_deduction",
+   "fieldtype": "Section Break",
+   "oldfieldname": "earning_deduction",
+   "oldfieldtype": "Section Break",
+   "precision": "2"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "earning", 
-   "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": "Earning", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "col_brk2", 
-   "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, 
+   "fieldname": "earning",
+   "fieldtype": "Section Break",
+   "label": "Earning",
+   "oldfieldname": "col_brk2",
+   "oldfieldtype": "Column Break",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "earnings", 
-   "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": "Earnings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "earning_details", 
-   "oldfieldtype": "Table", 
-   "options": "Salary Detail", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "earnings",
+   "fieldtype": "Table",
+   "label": "Earnings",
+   "oldfieldname": "earning_details",
+   "oldfieldtype": "Table",
+   "options": "Salary Detail"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "deduction", 
-   "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": "Deduction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "col_brk3", 
-   "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, 
+   "fieldname": "deduction",
+   "fieldtype": "Section Break",
+   "label": "Deduction",
+   "oldfieldname": "col_brk3",
+   "oldfieldtype": "Column Break",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "deductions", 
-   "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": "Deductions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "deduction_details", 
-   "oldfieldtype": "Table", 
-   "options": "Salary Detail", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "deductions",
+   "fieldtype": "Table",
+   "label": "Deductions",
+   "oldfieldname": "deduction_details",
+   "oldfieldtype": "Table",
+   "options": "Salary Detail"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "net_pay_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, 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Simple", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "net_pay_detail",
+   "fieldtype": "Section Break",
+   "options": "Simple"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_earning", 
-   "fieldtype": "Currency", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Earning", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "total_earning", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "total_earning",
+   "fieldtype": "Currency",
+   "hidden": 1,
+   "label": "Total Earning",
+   "oldfieldname": "total_earning",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_deduction", 
-   "fieldtype": "Currency", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Deduction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "total_deduction", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "total_deduction",
+   "fieldtype": "Currency",
+   "hidden": 1,
+   "label": "Total Deduction",
+   "oldfieldname": "total_deduction",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "net_pay", 
-   "fieldtype": "Currency", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Net Pay", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "net_pay",
+   "fieldtype": "Currency",
+   "hidden": 1,
+   "label": "Net Pay",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "account",
+   "fieldtype": "Section Break",
+   "label": "Account"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "mode_of_payment", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Mode of Payment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Mode of Payment", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "mode_of_payment",
+   "fieldtype": "Link",
+   "label": "Mode of Payment",
+   "options": "Mode of Payment"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_28", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_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
-  }, 
+   "fieldname": "column_break_28",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "payment_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Payment Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "payment_account",
+   "fieldtype": "Link",
+   "label": "Payment Account",
+   "options": "Account"
+  },
   {
-   "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": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Salary Structure", 
-   "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
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Salary Structure",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-file-text", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-02-18 18:51:53.932518", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Salary Structure", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-file-text",
+ "idx": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-31 16:34:35.087658",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Salary Structure",
+ "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,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "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": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "timeline_field": "", 
- "title_field": "", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
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 55e2df950b7..380c889477f 100644
--- a/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json
+++ b/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.json
@@ -1,524 +1,170 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "HR-SSA-.YY.-.MM.-.#####", 
- "beta": 0, 
- "creation": "2018-04-13 16:38:41.769237", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "HR-SSA-.YY.-.MM.-.#####",
+ "creation": "2018-04-13 16:38:41.769237",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "employee",
+  "employee_name",
+  "department",
+  "designation",
+  "column_break_6",
+  "salary_structure",
+  "from_date",
+  "company",
+  "section_break_7",
+  "base",
+  "column_break_9",
+  "variable",
+  "amended_from"
+ ],
  "fields": [
   {
-   "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": 1, 
-   "in_standard_filter": 1, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Employee",
+   "options": "Employee",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "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, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "employee.employee_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "label": "Employee Name",
+   "read_only": 1
+  },
   {
-   "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": 1, 
-   "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
-  }, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Department",
+   "options": "Department",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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": 0, 
-   "in_standard_filter": 1, 
-   "label": "Designation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Designation", 
-   "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
-  }, 
+   "fetch_from": "employee.designation",
+   "fieldname": "designation",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Designation",
+   "options": "Designation",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_6", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_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
-  }, 
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "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
-  }, 
+   "fieldname": "salary_structure",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Salary Structure",
+   "options": "Salary Structure",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "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
-  }, 
+   "fieldname": "from_date",
+   "fieldtype": "Date",
+   "label": "From Date",
+   "reqd": 1
+  },
   {
-   "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, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_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
-  }, 
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Base", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "base",
+   "fieldtype": "Currency",
+   "label": "Base",
+   "options": "Company:company:default_currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_9", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_9",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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": 0, 
-   "in_standard_filter": 0, 
-   "label": "Variable", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_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
-  }, 
+   "fieldname": "variable",
+   "fieldtype": "Currency",
+   "label": "Variable",
+   "options": "Company:company:default_currency"
+  },
   {
-   "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": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Salary Structure Assignment", 
-   "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
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Salary Structure Assignment",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-08-21 16:15:48.755450", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Salary Structure Assignment", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2019-12-31 16:35:34.415099",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Salary Structure Assignment",
+ "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, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "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": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "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": 1, 
+   "create": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR User",
+   "share": 1,
+   "submit": 1,
    "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": "employee_name", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "employee_name",
+ "track_changes": 1
 }
\ No newline at end of file

From 2d293c585e7091439ab1c34ceb7e06c73bbda10d Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 31 Dec 2019 19:15:37 +0530
Subject: [PATCH 168/193] =?UTF-8?q?fix(Subscription):=20pass=20start=5Fdat?=
 =?UTF-8?q?e=20while=20computing=20next=5Fschedu=E2=80=A6=20(#20159)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erpnext/selling/doctype/sales_order/sales_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 94bbb793a3a..346200262d4 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -416,7 +416,7 @@ class SalesOrder(SellingController):
 
 		def _get_delivery_date(ref_doc_delivery_date, red_doc_transaction_date, transaction_date):
 			delivery_date = get_next_schedule_date(ref_doc_delivery_date,
-				auto_repeat_doc.frequency, cint(auto_repeat_doc.repeat_on_day))
+				auto_repeat_doc.frequency, auto_repeat_doc.start_date, cint(auto_repeat_doc.repeat_on_day))
 
 			if delivery_date <= transaction_date:
 				delivery_date_diff = frappe.utils.date_diff(ref_doc_delivery_date, red_doc_transaction_date)

From 473b47888338f4a55caee19bff0a6afa71fa76b7 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 2 Jan 2020 12:22:04 +0530
Subject: [PATCH 169/193] fix: Show closing row in general ledger print

---
 erpnext/accounts/report/general_ledger/general_ledger.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index 17da3b915f8..40469aecc1d 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -33,7 +33,7 @@
 		</tr>
 	</thead>
 	<tbody>
-		{% for(var i=0, l=data.length-1; i<l; i++) { %}
+		{% for(var i=0, l=data.length; i<l; i++) { %}
 			<tr>
 			{% if(data[i].posting_date) { %}
 				<td>{%= frappe.datetime.str_to_user(data[i].posting_date) %}</td>

From 660a78b877e12803277f59fc2ac8c8a4e07c2b5d Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 2 Jan 2020 17:29:50 +0530
Subject: [PATCH 170/193] fix: ignore pricing rule for other item group

---
 erpnext/accounts/doctype/pricing_rule/utils.py | 2 +-
 erpnext/public/js/controllers/transaction.js   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 87f68225fe5..fe68fdb6c0f 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -495,7 +495,7 @@ def get_pricing_rule_items(pr_doc):
 
 	if pr_doc.apply_rule_on_other:
 		apply_on = frappe.scrub(pr_doc.apply_rule_on_other)
-		apply_on_data.append(pr_doc.get(apply_on))
+		apply_on_data.append(pr_doc.get("other_" + apply_on))
 
 	return list(set(apply_on_data))
 
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 3b907daa1b5..748e623730d 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1398,7 +1398,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 
 	remove_pricing_rule: function(item) {
 		let me = this;
-		const fields = ["discount_percentage", "discount_amount", "pricing_rules"];
+		const fields = ["discount_percentage",
+			"discount_amount", "margin_rate_or_amount", "rate_with_margin"];
 
 		if(item.remove_free_item) {
 			var items = [];
@@ -1418,6 +1419,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 					fields.forEach(f => {
 						row[f] = 0;
 					});
+
+					["pricing_rules", "margin_type"].forEach(field => {
+						if (row[field]) {
+							row[field] = '';
+						}
+					})
 				}
 			});
 

From 328c4f9b92e5ff5fa0e50ae8eaf4038531f92148 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Thu, 2 Jan 2020 19:00:32 +0530
Subject: [PATCH 171/193] fix: Get outgoing rate of serial no from SLE if
 serial no already transferred to another company

---
 erpnext/stock/stock_ledger.py | 37 +++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 69a4b94b4ea..b100f453273 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -212,7 +212,7 @@ class update_entries_after(object):
 	def get_serialized_values(self, sle):
 		incoming_rate = flt(sle.incoming_rate)
 		actual_qty = flt(sle.actual_qty)
-		serial_no = cstr(sle.serial_no).split("\n")
+		serial_nos = cstr(sle.serial_no).split("\n")
 
 		if incoming_rate < 0:
 			# wrong incoming rate
@@ -224,9 +224,8 @@ class update_entries_after(object):
 		elif actual_qty < 0:
 			# In case of delivery/stock issue, get average purchase rate
 			# of serial nos of current entry
-			stock_value_change = -1 * flt(frappe.get_all("Serial No",
-				fields=["sum(purchase_rate)"],
-				filters = {'name': ('in', serial_no)}, as_list=1)[0][0])
+			outgoing_value = self.get_incoming_value_for_serial_nos(sle, serial_nos)
+			stock_value_change = -1 * outgoing_value
 
 		new_stock_qty = self.qty_after_transaction + actual_qty
 
@@ -244,6 +243,36 @@ class update_entries_after(object):
 					sle.voucher_type, sle.voucher_no, self.allow_zero_rate,
 					currency=erpnext.get_company_currency(sle.company))
 
+	def get_incoming_value_for_serial_nos(self, sle, serial_nos):
+		# get rate from serial nos within same company
+		all_serial_nos = frappe.get_all("Serial No",
+			fields=["purchase_rate", "name", "company"],
+			filters = {'name': ('in', serial_nos)})
+
+		incoming_values = sum([flt(d.purchase_rate) for d in all_serial_nos if d.company==sle.company])
+
+		# Get rate for serial nos which has been transferred to other company
+		invalid_serial_nos = [d.name for d in all_serial_nos if d.company!=sle.company]
+		for serial_no in invalid_serial_nos:
+			incoming_rate = frappe.db.sql("""
+				select incoming_rate
+				from `tabStock Ledger Entry`
+				where
+					company = %s
+					and actual_qty > 0
+					and (serial_no = %s
+						or serial_no like %s
+						or serial_no like %s
+						or serial_no like %s
+					)
+				order by posting_date desc
+				limit 1
+			""", (sle.company, serial_no, serial_no+'\n%', '%\n'+serial_no, '%\n'+serial_no+'\n%'))
+
+			incoming_values += flt(incoming_rate[0][0]) if incoming_rate else 0
+
+		return incoming_values
+
 	def get_moving_average_values(self, sle):
 		actual_qty = flt(sle.actual_qty)
 		new_stock_qty = flt(self.qty_after_transaction) + actual_qty

From 7a01367ef13e8d793f3a69851cc46b5918b0c98e Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Thu, 2 Jan 2020 19:14:55 +0530
Subject: [PATCH 172/193] ux: add description for minimum purchase qty

---
 erpnext/stock/doctype/item/item.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index af8e13288a9..3503e7cc1c5 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_guest_to_view": 1,
  "allow_import": 1,
  "allow_rename": 1,
@@ -569,6 +570,7 @@
   {
    "default": "0.00",
    "depends_on": "is_stock_item",
+   "description": "Minimum quantity should be as per Stock UOM",
    "fieldname": "min_order_qty",
    "fieldtype": "Float",
    "label": "Minimum Order Qty",
@@ -1041,8 +1043,9 @@
  "icon": "fa fa-tag",
  "idx": 2,
  "image_field": "image",
+ "links": [],
  "max_attachments": 1,
- "modified": "2019-12-13 12:15:56.197246",
+ "modified": "2020-01-02 19:13:59.295963",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",

From 03bf1a875f76ff75b50c8c778a0ef7d4daff424a Mon Sep 17 00:00:00 2001
From: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
Date: Sat, 4 Jan 2020 13:26:42 +0530
Subject: [PATCH 173/193] feat: Allow write-off for Fees doctype

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
---
 .../doctype/journal_entry_account/journal_entry_account.json  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index ab811d81b25..c3f95fa42ec 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -201,7 +201,7 @@
    "fieldname": "reference_type",
    "fieldtype": "Select",
    "label": "Reference Type",
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting"
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees"
   },
   {
    "fieldname": "reference_name",
@@ -281,4 +281,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 9496b8453f234fdc14794a30db3135603dc5343a Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Mon, 6 Jan 2020 00:17:16 +0530
Subject: [PATCH 174/193] fix(plaid): change json structure  (#20189)

---
 .../plaid_settings/plaid_settings.json        | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
index 9903048d0be..df77ad8bc93 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2018-10-25 10:02:48.656165",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -23,48 +24,41 @@
   },
   {
    "default": "0",
-   "depends_on": "eval:doc.enabled==1",
+   "depends_on": "enabled",
    "fieldname": "automatic_sync",
    "fieldtype": "Check",
    "label": "Synchronize all accounts every hour"
   },
   {
-   "depends_on": "eval:doc.enabled==1",
    "fieldname": "plaid_client_id",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Plaid Client ID",
-   "reqd": 1
+   "label": "Plaid Client ID"
   },
   {
-   "depends_on": "eval:doc.enabled==1",
    "fieldname": "plaid_secret",
    "fieldtype": "Password",
    "in_list_view": 1,
-   "label": "Plaid Secret",
-   "reqd": 1
+   "label": "Plaid Secret"
   },
   {
-   "depends_on": "eval:doc.enabled==1",
    "fieldname": "plaid_public_key",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Plaid Public Key",
-   "reqd": 1
+   "label": "Plaid Public Key"
   },
   {
-   "depends_on": "eval:doc.enabled==1",
    "fieldname": "plaid_env",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Plaid Environment",
-   "reqd": 1
+   "label": "Plaid Environment"
   },
   {
    "fieldname": "column_break_2",
    "fieldtype": "Column Break"
   },
   {
+   "depends_on": "enabled",
    "fieldname": "section_break_4",
    "fieldtype": "Section Break"
   },
@@ -74,7 +68,8 @@
   }
  ],
  "issingle": 1,
- "modified": "2019-08-13 17:00:06.939422",
+ "links": [],
+ "modified": "2020-01-05 10:00:22.137832",
  "modified_by": "Administrator",
  "module": "ERPNext Integrations",
  "name": "Plaid Settings",

From fe2afc643e37c0502599e1690e52851589ae4fc9 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 6 Jan 2020 11:51:43 +0530
Subject: [PATCH 175/193] fix: incorrect valuation rate for finished good entry
 (#20165)

---
 .../stock/doctype/stock_entry/stock_entry.py  | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 01d54deadf3..1c9d4c0cdfc 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -103,9 +103,8 @@ class StockEntry(StockController):
 
 		if self.work_order and self.purpose == "Material Consumption for Manufacture":
 			self.validate_work_order_status()
-		else:
-			self.update_work_order()
 
+		self.update_work_order()
 		self.update_stock_ledger()
 		self.make_gl_entries_on_cancel()
 		self.update_cost_in_project()
@@ -479,10 +478,16 @@ class StockEntry(StockController):
 	def set_basic_rate_for_finished_goods(self, raw_material_cost, scrap_material_cost):
 		if self.purpose in ["Manufacture", "Repack"]:
 			for d in self.get("items"):
-				if d.transfer_qty and (d.bom_no or d.t_warehouse) and (getattr(self, "pro_doc", frappe._dict()).scrap_warehouse != d.t_warehouse):
+				if (d.transfer_qty and (d.bom_no or d.t_warehouse) and raw_material_cost
+					and (getattr(self, "pro_doc", frappe._dict()).scrap_warehouse != d.t_warehouse)):
 					d.basic_rate = flt((raw_material_cost - scrap_material_cost) / flt(d.transfer_qty), d.precision("basic_rate"))
 					d.basic_amount = flt((raw_material_cost - scrap_material_cost), d.precision("basic_amount"))
 
+				if (not d.basic_rate and self.work_order and
+					frappe.db.get_single_value("Manufacturing Settings", "material_consumption")):
+					d.basic_rate = get_valuation_rate_for_finished_good_entry(self.work_order) or 0
+					d.basic_amount = d.basic_rate * d.qty
+
 	def distribute_additional_costs(self):
 		if self.purpose == "Material Issue":
 			self.additional_costs = []
@@ -833,7 +838,6 @@ class StockEntry(StockController):
 					(self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture")
 					and frappe.db.get_single_value("Manufacturing Settings", "material_consumption")== 1):
 					self.get_unconsumed_raw_materials()
-
 				else:
 					if not self.fg_completed_qty:
 						frappe.throw(_("Manufacturing Quantity is mandatory"))
@@ -1152,20 +1156,17 @@ class StockEntry(StockController):
 			se_child.s_warehouse = item_dict[d].get("from_warehouse")
 			se_child.t_warehouse = item_dict[d].get("to_warehouse")
 			se_child.item_code = item_dict[d].get('item_code') or cstr(d)
-			se_child.item_name = item_dict[d]["item_name"]
-			se_child.description = item_dict[d]["description"]
 			se_child.uom = item_dict[d]["uom"] if item_dict[d].get("uom") else stock_uom
 			se_child.stock_uom = stock_uom
 			se_child.qty = flt(item_dict[d]["qty"], se_child.precision("qty"))
-			se_child.expense_account = item_dict[d].get("expense_account")
 			se_child.cost_center = item_dict[d].get("cost_center") or cost_center
 			se_child.allow_alternative_item = item_dict[d].get("allow_alternative_item", 0)
 			se_child.subcontracted_item = item_dict[d].get("main_item_code")
-			se_child.original_item = item_dict[d].get("original_item")
-			se_child.po_detail = item_dict[d].get("po_detail")
 
-			if item_dict[d].get("idx"):
-				se_child.idx = item_dict[d].get("idx")
+			for field in ["idx", "po_detail", "original_item",
+				"expense_account", "description", "item_name"]:
+				if item_dict[d].get(field):
+					se_child.set(field, item_dict[d].get(field))
 
 			if se_child.s_warehouse==None:
 				se_child.s_warehouse = self.from_warehouse
@@ -1470,6 +1471,24 @@ def get_used_alternative_items(purchase_order=None, work_order=None):
 
 	return used_alternative_items
 
+def get_valuation_rate_for_finished_good_entry(work_order):
+	work_order_qty = flt(frappe.get_cached_value("Work Order",
+		work_order, 'material_transferred_for_manufacturing'))
+
+	field = "(SUM(total_outgoing_value) / %s) as valuation_rate" % (work_order_qty)
+
+	stock_data = frappe.get_all("Stock Entry",
+		fields = field,
+		filters = {
+			"docstatus": 1,
+			"purpose": "Material Transfer for Manufacture",
+			"work_order": work_order
+		}
+	)
+
+	if stock_data:
+		return stock_data[0].valuation_rate
+
 @frappe.whitelist()
 def get_uom_details(item_code, uom, qty):
 	"""Returns dict `{"conversion_factor": [value], "transfer_qty": qty * [value]}`

From 8641f9ce77f4b37da733d4c4ad5737ed318f9c25 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Mon, 6 Jan 2020 15:07:06 +0530
Subject: [PATCH 176/193] fix: party type in payment request

---
 .../doctype/payment_request/payment_request.js         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js
index e2510f675f3..e1e43140c01 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.js
+++ b/erpnext/accounts/doctype/payment_request/payment_request.js
@@ -2,6 +2,16 @@ cur_frm.add_fetch("payment_gateway_account", "payment_account", "payment_account
 cur_frm.add_fetch("payment_gateway_account", "payment_gateway", "payment_gateway")
 cur_frm.add_fetch("payment_gateway_account", "message", "message")
 
+frappe.ui.form.on("Payment Request", {
+	setup: function(frm) {
+		frm.set_query("party_type", function() {
+			return {
+				query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
+			};
+		});
+	}
+})
+
 frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){
 	if (frm.doc.reference_doctype) {
 		frappe.call({

From ef0d26c16185112913d1ccf374c4296836f6e007 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 6 Jan 2020 15:34:15 +0530
Subject: [PATCH 177/193] feat: Validity for Item taxes (#20135)

* feat: Validity for Item taxes

* fix: Trigger for gst hsn code

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
---
 .../sales_invoice/test_sales_invoice.py       |  22 ++-
 erpnext/controllers/queries.py                |  32 +++-
 erpnext/controllers/taxes_and_totals.py       |  34 ++++
 erpnext/public/js/controllers/buying.js       |   6 +
 erpnext/public/js/controllers/transaction.js  |  23 +++
 .../doctype/gst_hsn_code/gst_hsn_code.py      |   6 +-
 erpnext/selling/sales_common.js               |   7 +
 erpnext/stock/doctype/item/item.js            |  10 +-
 erpnext/stock/doctype/item_tax/item_tax.json  | 145 ++++++------------
 erpnext/stock/get_item_details.py             |  41 ++++-
 10 files changed, 212 insertions(+), 114 deletions(-)

diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 530bd893c0e..a2a47b3a19c 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import frappe
 
 import unittest, copy, time
-from frappe.utils import nowdate, flt, getdate, cint
+from frappe.utils import nowdate, flt, getdate, cint, add_days
 from frappe.model.dynamic_links import get_dynamic_link_map
 from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry, get_qty_after_transaction
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import unlink_payment_on_cancel_of_invoice
@@ -1847,6 +1847,26 @@ class TestSalesInvoice(unittest.TestCase):
 		self.assertEqual(data['billLists'][0]['vehicleNo'], 'KA12KA1234')
 		self.assertEqual(data['billLists'][0]['itemList'][0]['taxableAmount'], 60000)
 
+	def test_item_tax_validity(self):
+		item = frappe.get_doc("Item", "_Test Item 2")
+
+		if item.taxes:
+			item.taxes = []
+			item.save()
+
+		item.append("taxes", {
+			"item_tax_template": "_Test Item Tax Template 1",
+			"valid_from": add_days(nowdate(), 1)
+		})
+
+		item.save()
+
+		sales_invoice = create_sales_invoice(item = "_Test Item 2", do_not_save=1)
+		sales_invoice.items[0].item_tax_template = "_Test Item Tax Template 1"
+		self.assertRaises(frappe.ValidationError, sales_invoice.save)
+
+		item.taxes = []
+		item.save()
 
 def create_sales_invoice(**args):
 	si = frappe.new_doc("Sales Invoice")
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 5c319008a85..d18f8e54d8f 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -4,9 +4,9 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.desk.reportview import get_match_cond, get_filters_cond
-from frappe.utils import nowdate
+from frappe.utils import nowdate, getdate
 from collections import defaultdict
-
+from erpnext.stock.get_item_details import _get_item_tax_template
 
  # searches for active employees
 def employee_query(doctype, txt, searchfield, start, page_len, filters):
@@ -486,7 +486,7 @@ def item_manufacturer_query(doctype, txt, searchfield, start, page_len, filters)
 @frappe.whitelist()
 def get_purchase_receipts(doctype, txt, searchfield, start, page_len, filters):
 	query = """
-		select pr.name 
+		select pr.name
 		from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pritem
 		where pr.docstatus = 1 and pritem.parent = pr.name
 		and pr.name like {txt}""".format(txt = frappe.db.escape('%{0}%'.format(txt)))
@@ -499,7 +499,7 @@ def get_purchase_receipts(doctype, txt, searchfield, start, page_len, filters):
 @frappe.whitelist()
 def get_purchase_invoices(doctype, txt, searchfield, start, page_len, filters):
 	query = """
-		select pi.name 
+		select pi.name
 		from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` piitem
 		where pi.docstatus = 1 and piitem.parent = pi.name
 		and pi.name like {txt}""".format(txt = frappe.db.escape('%{0}%'.format(txt)))
@@ -508,3 +508,27 @@ def get_purchase_invoices(doctype, txt, searchfield, start, page_len, filters):
 		query += " and piitem.item_code = {item_code}".format(item_code = frappe.db.escape(filters.get('item_code')))
 
 	return frappe.db.sql(query, filters)
+
+@frappe.whitelist()
+def get_tax_template(doctype, txt, searchfield, start, page_len, filters):
+
+	item_doc = frappe.get_cached_doc('Item', filters.get('item_code'))
+	item_group = filters.get('item_group')
+	taxes = item_doc.taxes or []
+
+	while item_group:
+		item_group_doc = frappe.get_cached_doc('Item Group', item_group)
+		taxes += item_group_doc.taxes or []
+		item_group = item_group_doc.parent_item_group
+
+	if not taxes:
+		return frappe.db.sql(""" SELECT name FROM `tabItem Tax Template` """)
+	else:
+		args = {
+			'item_code': filters.get('item_code'),
+			'posting_date': filters.get('valid_from'),
+			'tax_category': filters.get('tax_category')
+		}
+
+		taxes = _get_item_tax_template(args, taxes, for_validate=True)
+		return [(d,) for d in set(taxes)]
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 049a837eaf6..b52a07dbdf0 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -8,6 +8,7 @@ from frappe import _, scrub
 from frappe.utils import cint, flt, round_based_on_smallest_currency_fraction
 from erpnext.controllers.accounts_controller import validate_conversion_rate, \
 	validate_taxes_and_charges, validate_inclusive_tax
+from erpnext.stock.get_item_details import _get_item_tax_template
 
 class calculate_taxes_and_totals(object):
 	def __init__(self, doc):
@@ -34,6 +35,7 @@ class calculate_taxes_and_totals(object):
 	def _calculate(self):
 		self.validate_conversion_rate()
 		self.calculate_item_values()
+		self.validate_item_tax_template()
 		self.initialize_taxes()
 		self.determine_exclusive_rate()
 		self.calculate_net_total()
@@ -43,6 +45,38 @@ class calculate_taxes_and_totals(object):
 		self._cleanup()
 		self.calculate_total_net_weight()
 
+	def validate_item_tax_template(self):
+		for item in self.doc.get('items'):
+			if item.item_code and item.get('item_tax_template'):
+				item_doc = frappe.get_cached_doc("Item", item.item_code)
+				args = {
+					'tax_category': self.doc.get('tax_category'),
+					'posting_date': self.doc.get('posting_date'),
+					'bill_date': self.doc.get('bill_date'),
+					'transaction_date': self.doc.get('transaction_date')
+				}
+
+				item_group = item_doc.item_group
+				item_group_taxes = []
+
+				while item_group:
+					item_group_doc = frappe.get_cached_doc('Item Group', item_group)
+					item_group_taxes += item_group_doc.taxes or []
+					item_group = item_group_doc.parent_item_group
+
+				item_taxes = item_doc.taxes or []
+
+				if not item_group_taxes and (not item_taxes):
+					# No validation if no taxes in item or item group
+					continue
+
+				taxes = _get_item_tax_template(args, item_taxes + item_group_taxes, for_validate=True)
+
+				if item.item_tax_template not in taxes:
+					frappe.throw(_("Row {0}: Invalid Item Tax Template for item {1}").format(
+						item.idx, frappe.bold(item.item_code)
+					))
+
 	def validate_conversion_rate(self):
 		# validate conversion rate
 		company_currency = erpnext.get_company_currency(self.doc.company)
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 926227b24c8..3d4c4a64595 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -107,6 +107,12 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
 				filters:{ 'item_code': row.item_code }
 			}
 		});
+
+		if(this.frm.fields_dict["items"].grid.get_field('item_code')) {
+			this.frm.set_query("item_tax_template", "items", function(doc, cdt, cdn) {
+				return me.set_query_for_item_tax_template(doc, cdt, cdn)
+			});
+		}
 	},
 
 	refresh: function(doc) {
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 748e623730d..51ab48a3ab5 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1700,6 +1700,29 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		}
 	},
 
+	set_query_for_item_tax_template: function(doc, cdt, cdn) {
+
+		var item = frappe.get_doc(cdt, cdn);
+		if(!item.item_code) {
+			frappe.throw(__("Please enter Item Code to get item taxes"));
+		} else {
+
+			let filters = {
+				'item_code': item.item_code,
+				'valid_from': doc.transaction_date || doc.bill_date || doc.posting_date,
+				'item_group': item.item_group,
+			}
+
+			if (doc.tax_category)
+				filters['tax_category'] = doc.tax_category;
+
+			return {
+				query: "erpnext.controllers.queries.get_tax_template",
+				filters: filters
+			}
+		}
+	},
+
 	payment_terms_template: function() {
 		var me = this;
 		const doc = this.frm.doc;
diff --git a/erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.py b/erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.py
index fa2cb1299a5..86cd4d1545d 100644
--- a/erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.py
+++ b/erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.py
@@ -25,5 +25,9 @@ def update_item_document(items, taxes):
 		item_to_be_updated.taxes = []
 		for tax in taxes:
 			tax = frappe._dict(tax)
-			item_to_be_updated.append("taxes", {'item_tax_template': tax.item_tax_template, 'tax_category': tax.tax_category})
+			item_to_be_updated.append("taxes", {
+				'item_tax_template': tax.item_tax_template,
+				'tax_category': tax.tax_category,
+				'valid_from': tax.valid_from
+			})
 			item_to_be_updated.save()
\ No newline at end of file
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 1c9b30b8289..8278745a804 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -84,6 +84,13 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
 				return me.set_query_for_batch(doc, cdt, cdn)
 			});
 		}
+
+		if(this.frm.fields_dict["items"].grid.get_field('item_code')) {
+			this.frm.set_query("item_tax_template", "items", function(doc, cdt, cdn) {
+				return me.set_query_for_item_tax_template(doc, cdt, cdn)
+			});
+		}
+
 	},
 
 	refresh: function() {
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index e3d356f93b3..253390ac501 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -49,7 +49,7 @@ frappe.ui.form.on("Item", {
 		if (!frm.doc.is_fixed_asset) {
 			erpnext.item.make_dashboard(frm);
 		}
-		
+
 		if (frm.doc.is_fixed_asset) {
 			frm.trigger('is_fixed_asset');
 			frm.trigger('auto_create_assets');
@@ -136,14 +136,14 @@ frappe.ui.form.on("Item", {
 		frm.toggle_reqd('customer', frm.doc.is_customer_provided_item ? 1:0);
 	},
 
-	gst_hsn_code: function(frm){
-		if(!frm.doc.taxes){
-			frappe.db.get_doc("GST HSN Code", frm.doc.gst_hsn_code).then(hsn_doc=>{
-				frm.doc.taxes = [];
+	gst_hsn_code: function(frm) {
+		if(!frm.doc.taxes.length) {
+			frappe.db.get_doc("GST HSN Code", frm.doc.gst_hsn_code).then(hsn_doc => {
 				$.each(hsn_doc.taxes || [], function(i, tax) {
 					let a = frappe.model.add_child(cur_frm.doc, 'Item Tax', 'taxes');
 					a.item_tax_template = tax.item_tax_template;
 					a.tax_category = tax.tax_category;
+					a.valid_from = tax.valid_from;
 					frm.refresh_field('taxes');
 				});
 			});
diff --git a/erpnext/stock/doctype/item_tax/item_tax.json b/erpnext/stock/doctype/item_tax/item_tax.json
index 37daa2938da..a93e4636add 100644
--- a/erpnext/stock/doctype/item_tax/item_tax.json
+++ b/erpnext/stock/doctype/item_tax/item_tax.json
@@ -1,107 +1,50 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-02-22 01:28:01", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2013-02-22 01:28:01",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_tax_template",
+  "tax_category",
+  "valid_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_tax_template", 
-   "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 Tax Template", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "tax_type", 
-   "oldfieldtype": "Link", 
-   "options": "Item Tax Template", 
-   "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
-  }, 
+   "fieldname": "item_tax_template",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Tax Template",
+   "oldfieldname": "tax_type",
+   "oldfieldtype": "Link",
+   "options": "Item Tax Template",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "", 
-   "fieldname": "tax_category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Tax Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "tax_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "Tax Category", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_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
+   "fieldname": "tax_category",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Tax Category",
+   "oldfieldname": "tax_rate",
+   "oldfieldtype": "Currency",
+   "options": "Tax Category"
+  },
+  {
+   "fieldname": "valid_from",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Valid From"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-12-21 23:52:40.798944", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Tax", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2019-12-28 21:54:40.807849",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Tax",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 76644ed846c..4e5b933a3f0 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _, throw
-from frappe.utils import flt, cint, add_days, cstr, add_months
+from frappe.utils import flt, cint, add_days, cstr, add_months, getdate
 import json, copy
 from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item, set_transaction_type
 from erpnext.setup.utils import get_exchange_rate
@@ -52,6 +52,16 @@ def get_item_details(args, doc=None, for_validate=False, overwrite_warehouse=Tru
 
 	out = get_basic_details(args, item, overwrite_warehouse)
 
+	if isinstance(doc, string_types):
+		doc = json.loads(doc)
+
+	if doc and doc.get('doctype') == 'Purchase Invoice':
+		args['bill_date'] = doc.get('bill_date')
+
+	if doc:
+		args['posting_date'] = doc.get('posting_date')
+		args['transaction_date'] = doc.get('transaction_date')
+
 	get_item_tax_template(args, item, out)
 	out["item_tax_rate"] = get_item_tax_map(args.company, args.get("item_tax_template") if out.get("item_tax_template") is None \
 		else out.get("item_tax_template"), as_json=True)
@@ -395,7 +405,34 @@ def get_item_tax_template(args, item, out):
 			item_tax_template = _get_item_tax_template(args, item_group_doc.taxes, out)
 			item_group = item_group_doc.parent_item_group
 
-def _get_item_tax_template(args, taxes, out):
+def _get_item_tax_template(args, taxes, out={}, for_validate=False):
+	taxes_with_validity = []
+	taxes_with_no_validity = []
+
+	for tax in taxes:
+		if tax.valid_from:
+			# In purchase Invoice first preference will be given to supplier invoice date
+			# if supplier date is not present then posting date
+			validation_date = args.get('transaction_date') or args.get('bill_date') or args.get('posting_date')
+
+			if getdate(tax.valid_from) <= getdate(validation_date):
+				taxes_with_validity.append(tax)
+		else:
+			taxes_with_no_validity.append(tax)
+
+	if taxes_with_validity:
+		taxes = sorted(taxes_with_validity, key = lambda i: i.valid_from, reverse=True)
+	else:
+		taxes = taxes_with_no_validity
+
+	if for_validate:
+		return [tax.item_tax_template for tax in taxes if (cstr(tax.tax_category) == cstr(args.get('tax_category')) \
+			and (tax.item_tax_template not in taxes))]
+
+	# all templates have validity and no template is valid
+	if not taxes_with_validity and (not taxes_with_no_validity):
+		return None
+
 	for tax in taxes:
 		if cstr(tax.tax_category) == cstr(args.get("tax_category")):
 			out["item_tax_template"] = tax.item_tax_template

From 7c8aaba44926e1430669fce78e09f89f0c555a1e Mon Sep 17 00:00:00 2001
From: Rohan <Alchez@users.noreply.github.com>
Date: Tue, 7 Jan 2020 11:23:53 +0530
Subject: [PATCH 178/193] fix: integer UOM check in transactions (#20176)

---
 erpnext/utilities/transaction_base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index f845cef9b10..20998108467 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -164,8 +164,8 @@ def validate_uom_is_integer(doc, uom_field, qty_fields, child_dt=None):
 		qty_fields = [qty_fields]
 
 	distinct_uoms = list(set([d.get(uom_field) for d in doc.get_all_children()]))
-	integer_uoms = filter(lambda uom: frappe.db.get_value("UOM", uom,
-		"must_be_whole_number", cache=True) or None, distinct_uoms)
+	integer_uoms = list(filter(lambda uom: frappe.db.get_value("UOM", uom,
+		"must_be_whole_number", cache=True) or None, distinct_uoms))
 
 	if not integer_uoms:
 		return

From 971458043da357a004c8ec298d8131c1f669a717 Mon Sep 17 00:00:00 2001
From: Pranav Nachnekar <prnvnachnekar@gmail.com>
Date: Tue, 7 Jan 2020 05:59:35 +0000
Subject: [PATCH 179/193] fix: add new delivery note button in Sales Order
 (#20199)

* fix: add new delivery note button in Sales Order

* fix: removed debugger

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
---
 erpnext/selling/doctype/sales_order/sales_order.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index cb016a1a744..fa765dfaad9 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -6,7 +6,7 @@
 frappe.ui.form.on("Sales Order", {
 	setup: function(frm) {
 		frm.custom_make_buttons = {
-			'Delivery Note': 'Delivery',
+			'Delivery Note': 'Delivery Note',
 			'Pick List': 'Pick List',
 			'Sales Invoice': 'Invoice',
 			'Material Request': 'Material Request',
@@ -135,7 +135,6 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 			}
 			if(doc.status !== 'Closed') {
 				if(doc.status !== 'On Hold') {
-
 					allow_delivery = this.frm.doc.items.some(item => item.delivered_by_supplier === 0 && item.qty > flt(item.delivered_qty))
 						&& !this.frm.doc.skip_delivery_note
 
@@ -697,4 +696,4 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 		});
 	}
 });
-$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));
\ No newline at end of file
+$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));

From 88737e38f2fab95215c7a2f6ec4626d4541c6808 Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Tue, 7 Jan 2020 11:30:22 +0530
Subject: [PATCH 180/193] fix(item_tax_template): fetch parent account if not
 set (#20198)

---
 .../v12_0/move_item_tax_to_item_tax_template.py   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
index e47344bd92c..5a127950006 100644
--- a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
+++ b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
@@ -60,10 +60,10 @@ def execute():
 		'Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice',
 		'Supplier Quotation', 'Purchase Order', 'Purchase Receipt', 'Purchase Invoice'
 	]
-	
+
 	for dt in doctypes:
 		for d in frappe.db.sql("""select name, parenttype, parent, item_code, item_tax_rate from `tab{0} Item`
-								where ifnull(item_tax_rate, '') not in ('', '{{}}') 
+								where ifnull(item_tax_rate, '') not in ('', '{{}}')
 								and item_tax_template is NULL""".format(dt), as_dict=1):
 			item_tax_map = json.loads(d.item_tax_rate)
 			item_tax_template_name = get_item_tax_template(item_tax_templates,
@@ -98,12 +98,15 @@ def get_item_tax_template(item_tax_templates, item_tax_map, item_code, parenttyp
 			company = get_company(parts[-1], parenttype, parent)
 			parent_account = frappe.db.get_value("Account",
 				filters={"account_type": "Tax", "root_type": "Liability", "is_group": 0, "company": company}, fieldname="parent_account")
+			if not parent_account:
+				parent_account = frappe.db.get_value("Account",
+					filters={"account_type": "Tax", "root_type": "Liability", "is_group": 1, "company": company})
 			filters = {
 				"account_name": account_name,
-                                "company": company,
-                                "account_type": "Tax",
-                                "parent_account": parent_account
-                        }
+				"company": company,
+				"account_type": "Tax",
+				"parent_account": parent_account
+			}
 			tax_type = frappe.db.get_value("Account", filters)
 			if not tax_type:
 				account = frappe.new_doc("Account")

From aab96b7fbf69708f00ad91b48c555720663af3c3 Mon Sep 17 00:00:00 2001
From: Wolfram Schmidt <wolfram.schmidt@tueit.de>
Date: Tue, 7 Jan 2020 07:07:08 +0100
Subject: [PATCH 181/193] Update de.csv (#20205)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

changed translation of "leave/-s" to "Urlaub/Urlaubstage" instead of "Blätter" (Blätter is leaves as in tree or sheet as in paper)
---
 erpnext/translations/de.csv | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index cdff3ff422b..954f6db5b4e 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -304,7 +304,7 @@ apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_
 DocType: BOM,Total Cost,Gesamtkosten
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.js,Allocation Expired!,Zuteilung abgelaufen!
 DocType: Soil Analysis,Ca/K,Ca / K
-DocType: Leave Type,Maximum Carry Forwarded Leaves,Maximale Anzahl weitergeleiteter Blätter
+DocType: Leave Type,Maximum Carry Forwarded Leaves,Obergrenze für übertragbaren Urlaub erreicht
 DocType: Salary Slip,Employee Loan,MItarbeiterdarlehen
 DocType: Additional Salary,HR-ADS-.YY.-.MM.-,HR-ADS-.YY .-. MM.-
 DocType: Fee Schedule,Send Payment Request Email,Zahlungaufforderung per E-Mail versenden
@@ -893,7 +893,7 @@ DocType: Supplier Scorecard Standing,Notify Other,Andere benachrichtigen
 DocType: Vital Signs,Blood Pressure (systolic),Blutdruck (systolisch)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ist {2}
 DocType: Item Price,Valid Upto,Gültig bis
-DocType: Leave Type,Expire Carry Forwarded Leaves (Days),Verfallsdatum für weitergeleitete Blätter (Tage)
+DocType: Leave Type,Expire Carry Forwarded Leaves (Days),Verfallsdatum für übertragenen Urlaub (Tage)
 DocType: Training Event,Workshop,Werkstatt
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Warnung Bestellungen
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
@@ -1103,7 +1103,7 @@ apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,
 DocType: Payroll Entry,Select Payment Account to make Bank Entry,Wählen Sie ein Zahlungskonto für die Buchung
 apps/erpnext/erpnext/config/accounting.py,Opening and Closing,Öffnen und Schließen
 DocType: Hotel Settings,Default Invoice Naming Series,Standard-Rechnungsnummernkreis
-apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
+apps/erpnext/erpnext/utilities/activation.py,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten für Urlaubs, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,An error occurred during the update process,Während des Aktualisierungsprozesses ist ein Fehler aufgetreten
 DocType: Restaurant Reservation,Restaurant Reservation,Restaurant Reservierung
 apps/erpnext/erpnext/public/js/hub/Sidebar.vue,Your Items,Ihre Artikel
@@ -1548,7 +1548,7 @@ DocType: Share Transfer,To Shareholder,An den Aktionär
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Aus dem Staat
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Institution,Einrichtung Einrichtung
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py,Allocating leaves...,Blätter zuordnen...
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.py,Allocating leaves...,Urlaub zuordnen...
 DocType: Program Enrollment,Vehicle/Bus Number,Fahrzeug / Bus Nummer
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Create New Contact,Neuen Kontakt erstellen
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Kurstermine
@@ -1806,7 +1806,7 @@ apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Chemical,Chemische
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Standard Bank / Geldkonto wird automatisch in Gehalts Journal Entry aktualisiert werden, wenn dieser Modus ausgewählt ist."
 DocType: Quiz,Latest Attempt,Letzter Versuch
 DocType: Quiz Result,Quiz Result,Quiz-Ergebnis
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total leaves allocated is mandatory for Leave Type {0},Die Gesamtzahl der zugewiesenen Blätter ist für Abwesenheitsart {0} erforderlich.
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total leaves allocated is mandatory for Leave Type {0},Die Gesamtzahl der zugewiesenen Urlaube ist für Abwesenheitsart {0} erforderlich.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Row # {0}: Die Rate kann nicht größer sein als die Rate, die in {1} {2}"
 apps/erpnext/erpnext/utilities/user_progress.py,Meter,Meter
 DocType: Workstation,Electricity Cost,Stromkosten
@@ -1916,7 +1916,7 @@ apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html,Go to
 apps/erpnext/erpnext/templates/pages/order.js,Pay Remaining,Verbleibende Bezahlung
 DocType: Purchase Invoice Item,Manufacturer,Hersteller
 DocType: Landed Cost Item,Purchase Receipt Item,Kaufbeleg-Artikel
-DocType: Leave Allocation,Total Leaves Encashed,Insgesamt Blätter umkränzt
+DocType: Leave Allocation,Total Leaves Encashed,Summe ausbezahlter Urlaubstage
 DocType: POS Profile,Sales Invoice Payment,Ausgangsrechnung-Zahlungen
 DocType: Quality Inspection Template,Quality Inspection Template Name,Name der Qualitätsinspektionsvorlage
 DocType: Project,First Email,Erste E-Mail
@@ -2540,7 +2540,7 @@ Used for Taxes and Charges",Die Tabelle Steuerdetails wird aus dem Artikelstamm
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
 apps/erpnext/erpnext/templates/pages/order.html,Rate:,Bewertung:
 DocType: Bank Account,Change this date manually to setup the next synchronization start date,"Ändern Sie dieses Datum manuell, um das nächste Startdatum für die Synchronisierung festzulegen"
-DocType: Leave Type,Max Leaves Allowed,Max Blätter erlaubt
+DocType: Leave Type,Max Leaves Allowed,Höchstzahl erlaubter Urlaubstage
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt."
 DocType: Email Digest,Bank Balance,Kontostand
 apps/erpnext/erpnext/controllers/accounts_controller.py,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
@@ -2990,7 +2990,7 @@ DocType: Student Group Creation Tool,Separate course based Group for every Batch
 apps/erpnext/erpnext/config/support.py,Single unit of an Item.,Einzelnes Element eines Artikels
 DocType: Fee Category,Fee Category,Gebührenkategorie
 DocType: Agriculture Task,Next Business Day,Nächster Arbeitstag
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Allocated Leaves,Zugewiesene Blätter
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Allocated Leaves,Genehmigter Urlaub
 DocType: Drug Prescription,Dosage by time interval,Dosierung nach Zeitintervall
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Total Taxable Value,Steuerpflichtiger Gesamtwert
 DocType: Cash Flow Mapper,Section Header,Abschnitt Kopfzeile
@@ -3774,10 +3774,10 @@ apps/erpnext/erpnext/public/js/templates/address_list.html,New Address,Neue Adre
 DocType: Quality Inspection,Sample Size,Stichprobenumfang
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Please enter Receipt Document,Bitte geben Sie Eingangsbeleg
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
-apps/erpnext/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py,Leaves Taken,Blätter genommen
+apps/erpnext/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py,Leaves Taken,Urlaubstage genommen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Please specify a valid 'From Case No.',"Bitte eine eine gültige ""Von Fall Nr."" angeben"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more days than maximum allocation of {0} leave type for employee {1} in the period,Die insgesamt zugewiesenen Blätter sind mehr Tage als die maximale Zuweisung von {0} Abwesenheitsart für den Mitarbeiter {1} in der Periode
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Total allocated leaves are more days than maximum allocation of {0} leave type for employee {1} in the period,Die insgesamt zugewiesenen Urlaubstage sind mehr Tage als die maximale Zuweisung von {0} Abwesenheitsart für den Mitarbeiter {1} in der Periode
 DocType: Branch,Branch,Betrieb
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Other outward supplies(Nil rated,Exempted)","Sonstige Auslandslieferungen (ohne Rating, ausgenommen)"
 DocType: Soil Analysis,Ca/(K+Ca+Mg),Ca / (K + Ca + Mg)
@@ -4097,7 +4097,7 @@ DocType: Work Order,Actual End Date,Tatsächliches Enddatum
 DocType: Cash Flow Mapping,Is Finance Cost Adjustment,Ist Finanzkostenanpassung
 DocType: BOM,Operating Cost (Company Currency),Betriebskosten (Gesellschaft Währung)
 DocType: Authorization Rule,Applicable To (Role),Anwenden auf (Rolle)
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Pending Leaves,Ausstehende Blätter
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Pending Leaves,Schwebende Urlaubstage
 DocType: BOM Update Tool,Replace BOM,Erstelle Stückliste
 apps/erpnext/erpnext/healthcare/doctype/lab_test_template/lab_test_template.py,Code {0} already exist,Code {0} existiert bereits
 DocType: Patient Encounter,Procedures,Verfahren
@@ -4342,7 +4342,7 @@ apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depr
 DocType: Sales Invoice,Is Return (Credit Note),ist Rücklieferung (Gutschrift)
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.js,Start Job,Job starten
 apps/erpnext/erpnext/assets/doctype/asset_movement/asset_movement.py,Serial no is required for the asset {0},Für Vermögenswert {0} ist eine Seriennr. Erforderlich.
-DocType: Leave Control Panel,Allocate Leaves,Blätter zuweisen
+DocType: Leave Control Panel,Allocate Leaves,Urlaubstage zuweisen
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py,Disabled template must not be default template,Deaktivierte Vorlage darf nicht Standardvorlage sein
 DocType: Pricing Rule,Price or Product Discount,Preis- oder Produktrabatt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Für Zeile {0}: Geben Sie die geplante Menge ein
@@ -4440,7 +4440,7 @@ DocType: Loan,Loan Application,Kreditantrag
 DocType: Crop,Scientific Name,Wissenschaftlicher Name
 DocType: Healthcare Service Unit,Service Unit Type,Serviceeinheitstyp
 DocType: Bank Account,Branch Code,Bankleitzahl / BIC
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Total Leaves,insgesamt Blätter
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Total Leaves,summe der Urlaubstage
 DocType: Customer,"Reselect, if the chosen contact is edited after save","Wählen Sie erneut, wenn der ausgewählte Kontakt nach dem Speichern bearbeitet wird"
 DocType: Quality Procedure,Parent Procedure,Übergeordnetes Verfahren
 DocType: Patient Encounter,In print,in Druckbuchstaben
@@ -5658,7 +5658,7 @@ apps/erpnext/erpnext/education/report/course_wise_assessment_report/course_wise_
 DocType: Depreciation Schedule,Finance Book Id,Finanzbuch-ID
 DocType: Item,Safety Stock,Sicherheitsbestand
 DocType: Healthcare Settings,Healthcare Settings,Gesundheitswesen
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Total Allocated Leaves,Insgesamt zugeteilte Blätter
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Total Allocated Leaves,Insgesamt zugeteilte Urlaubstage
 apps/erpnext/erpnext/projects/doctype/task/task.py,Progress % for a task cannot be more than 100.,Fortschritt-% eines Vorgangs darf nicht größer 100 sein.
 DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py,To {0},An {0}
@@ -5769,7 +5769,7 @@ apps/erpnext/erpnext/accounts/doctype/bank_account/test_bank_account.py,BankAcco
 DocType: Normal Test Items,Normal Test Items,Normale Testartikel
 DocType: QuickBooks Migrator,Company Settings,Unternehmenseinstellungen
 DocType: Additional Salary,Overwrite Salary Structure Amount,Gehaltsstruktur überschreiben
-DocType: Leave Ledger Entry,Leaves,Blätter
+DocType: Leave Ledger Entry,Leaves,Urlaubstage
 DocType: Student Language,Student Language,Student Sprache
 DocType: Cash Flow Mapping,Is Working Capital,Ist Arbeitskapital
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.js,Submit Proof,Nachweis einreichen
@@ -6362,7 +6362,7 @@ apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax
 DocType: Sales Partner,Contact Desc,Kontakt-Beschr.
 DocType: Email Digest,Send regular summary reports via Email.,Regelmäßig zusammenfassende Berichte per E-Mail senden.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default account in Expense Claim Type {0},Bitte setzen Sie Standardkonto in Kostenabrechnung Typ {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Available Leaves,Verfügbare Blätter
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Available Leaves,Verfügbare Urlaubstage
 DocType: Assessment Result,Student Name,Name des Studenten
 DocType: Hub Tracked Item,Item Manager,Artikel-Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Payroll Payable,Payroll Kreditoren
@@ -7508,7 +7508,7 @@ DocType: Pricing Rule,Percentage,Prozentsatz
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard-Fertigungslager
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Schedules for {0} overlaps, do you want to proceed after skiping overlaped slots ?","Schedules für {0} Überlappungen, möchten Sie nach Überlappung überlappender Slots fortfahren?"
-apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.js,Grant Leaves,Grant Blätter
+apps/erpnext/erpnext/hr/doctype/leave_period/leave_period.js,Grant Leaves,Urlaubstage gewähren
 DocType: Restaurant,Default Tax Template,Standardsteuervorlage
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,{0} Students have been enrolled,{0} Studenten wurden angemeldet
 DocType: Fees,Student Details,Studenten Details

From 6b316cd7cb112168cfaff1a262320c6ca1792953 Mon Sep 17 00:00:00 2001
From: Vishal Dhayagude <vishdha@users.noreply.github.com>
Date: Tue, 7 Jan 2020 11:48:38 +0530
Subject: [PATCH 182/193] feat: Backdated leave application  (#20201)

* fix: only HR Managers can make backdated leave applications

* fix (leave application): error message changed and user check modified

* fix: Move hardcoded logic to HR Settings

* fix: added role as mandetory field on check restict field

* fix: minor changes
---
 erpnext/hr/doctype/hr_settings/hr_settings.js   |  3 ++-
 erpnext/hr/doctype/hr_settings/hr_settings.json | 17 ++++++++++++++++-
 .../leave_application/leave_application.py      |  6 ++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.js b/erpnext/hr/doctype/hr_settings/hr_settings.js
index 4004c1cc2db..2e8c99f0615 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.js
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.js
@@ -19,5 +19,6 @@ frappe.ui.form.on('HR Settings', {
 			}
 			frm.set_value('password_policy', policy.split(new RegExp(" |-", 'g')).filter((token) => token).join('-'));
 		}
+		frm.toggle_reqd("role_allowed_to_create_backdated_leave_application", frm.doc.restrict_backdated_leave_application);
 	}
-});
+});
\ No newline at end of file
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index 6cb0e211f94..90f49886f84 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -23,10 +23,12 @@
   "leave_settings",
   "leave_approval_notification_template",
   "leave_status_notification_template",
+  "role_allowed_to_create_backdated_leave_application",
   "column_break_18",
   "leave_approver_mandatory_in_leave_application",
   "show_leaves_of_all_department_members_in_calendar",
   "auto_leave_encashment",
+  "restrict_backdated_leave_application",
   "hiring_settings",
   "check_vacancies"
  ],
@@ -169,13 +171,26 @@
    "fieldname": "disable_rounded_total",
    "fieldtype": "Check",
    "label": "Disable Rounded Total"
+  },
+  {
+   "default": "0",
+   "fieldname": "restrict_backdated_leave_application",
+   "fieldtype": "Check",
+   "label": "Restrict Backdated Leave Application"
+  },
+  {
+   "depends_on": "eval:doc.restrict_backdated_leave_application == 1",
+   "fieldname": "role_allowed_to_create_backdated_leave_application",
+   "fieldtype": "Link",
+   "label": "Role Allowed to Create Backdated Leave Application",
+   "options": "Role"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2019-12-31 14:28:32.004121",
+ "modified": "2020-01-06 18:46:30.189815",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 5222712ea2b..7594cb72ae6 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -79,6 +79,12 @@ class LeaveApplication(Document):
 						frappe.throw(_("{0} applicable after {1} working days").format(self.leave_type, leave_type.applicable_after))
 
 	def validate_dates(self):
+		if frappe.db.get_single_value("HR Settings", "restrict_backdated_leave_application"):
+			if self.from_date and self.from_date < frappe.utils.today():
+				allowed_role = frappe.db.get_single_value("HR Settings", "role_allowed_to_create_backdated_leave_application")
+				if allowed_role not in frappe.get_roles():
+					frappe.throw(_("Only users with the {0} role can create backdated leave applications").format(allowed_role))
+
 		if self.from_date and self.to_date and (getdate(self.to_date) < getdate(self.from_date)):
 			frappe.throw(_("To date cannot be before from date"))
 

From 7ae11005c406dea062dd83455c2c38f71e7585f7 Mon Sep 17 00:00:00 2001
From: Vishal Dhayagude <vishdha@users.noreply.github.com>
Date: Tue, 7 Jan 2020 13:02:13 +0530
Subject: [PATCH 183/193] fix: UX improvement. move trigger on fieldname
 restrict_backdated_leave_application (#20211)

---
 erpnext/hr/doctype/hr_settings/hr_settings.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.js b/erpnext/hr/doctype/hr_settings/hr_settings.js
index 2e8c99f0615..b629b42f9b1 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.js
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.js
@@ -2,10 +2,6 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('HR Settings', {
-	refresh: function(frm) {
-
-	},
-
 	encrypt_salary_slips_in_emails: function(frm) {
 		let encrypt_state = frm.doc.encrypt_salary_slips_in_emails;
 		frm.set_df_property('password_policy', 'reqd', encrypt_state);
@@ -19,6 +15,9 @@ frappe.ui.form.on('HR Settings', {
 			}
 			frm.set_value('password_policy', policy.split(new RegExp(" |-", 'g')).filter((token) => token).join('-'));
 		}
+	},
+
+	restrict_backdated_leave_application: function(frm) {
 		frm.toggle_reqd("role_allowed_to_create_backdated_leave_application", frm.doc.restrict_backdated_leave_application);
 	}
 });
\ No newline at end of file

From c72de6edaa3492a44128248ae2568167239528d9 Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Tue, 7 Jan 2020 13:06:08 +0530
Subject: [PATCH 184/193] fix: Added description and title to supplier
 selection popup in Material Request. (#20179)

---
 erpnext/stock/doctype/material_request/material_request.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 99195c300da..935d61310eb 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -230,7 +230,8 @@ frappe.ui.form.on('Material Request', {
 
 	make_purchase_order: function(frm) {
 		frappe.prompt(
-			{fieldname:'default_supplier', label: __('For Default Supplier (optional)'), fieldtype: 'Link', options: 'Supplier'},
+			{fieldname:'default_supplier', label: __('For Default Supplier (optional)'), description: __('Selected Supplier\
+			must be the Default Supplier of one of the items below.'), fieldtype: 'Link', options: 'Supplier'},
 			(values) => {
 				frappe.model.open_mapped_doc({
 					method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order",
@@ -238,7 +239,8 @@ frappe.ui.form.on('Material Request', {
 					args: { default_supplier: values.default_supplier },
 					run_link_triggers: true
 				});
-			}
+			},
+			__('Enter Supplier')
 		)
 	},
 

From 229e5398b55fc9eaecd34222567e1bc9af314567 Mon Sep 17 00:00:00 2001
From: Pranav Nachnekar <prnvnachnekar@gmail.com>
Date: Thu, 9 Jan 2020 06:51:26 +0000
Subject: [PATCH 185/193] fix: escape % in customer name (#20202)

---
 .../doctype/authorization_control/authorization_control.py    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.py b/erpnext/setup/doctype/authorization_control/authorization_control.py
index 7db703fadf5..0c52b834de6 100644
--- a/erpnext/setup/doctype/authorization_control/authorization_control.py
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.py
@@ -76,7 +76,7 @@ class AuthorizationControl(TransactionBase):
 		add_cond = ''
 		auth_value = av_dis
 
-		if val == 1: add_cond += " and system_user = '"+session['user'].replace("'", "\\'")+"'"
+		if val == 1: add_cond += " and system_user = '"+ frappe.db.escape(session['user'])+"'"
 		elif val == 2: add_cond += " and system_role IN %s" % ("('"+"','".join(frappe.get_roles())+"')")
 		else: add_cond += " and ifnull(system_user,'') = '' and ifnull(system_role,'') = ''"
 
@@ -85,7 +85,7 @@ class AuthorizationControl(TransactionBase):
 			if doc_obj:
 				if doc_obj.doctype == 'Sales Invoice': customer = doc_obj.customer
 				else: customer = doc_obj.customer_name
-				add_cond = " and master_name = '"+cstr(customer).replace("'", "\\'")+"'"
+				add_cond = " and master_name = '"+ frappe.db.escape(customer) +"'"
 		if based_on == 'Itemwise Discount':
 			if doc_obj:
 				for t in doc_obj.get("items"):

From ccdf19314d317eb1e7b4eda9f2040aed989ba554 Mon Sep 17 00:00:00 2001
From: Don-Leopardo <46027152+Don-Leopardo@users.noreply.github.com>
Date: Thu, 9 Jan 2020 03:54:43 -0300
Subject: [PATCH 186/193] fix: min_qty and valid_from for the price selection
 (#20217)

---
 erpnext/public/js/controllers/transaction.js | 2 +-
 erpnext/stock/get_item_details.py            | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 51ab48a3ab5..8cfde8cf97b 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -968,7 +968,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 
 	qty: function(doc, cdt, cdn) {
 		let item = frappe.get_doc(cdt, cdn);
-		this.conversion_factor(doc, cdt, cdn, true);
+		this.conversion_factor(doc, cdt, cdn, false);
 		this.apply_pricing_rule(item, true);
 	},
 
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 4e5b933a3f0..b80f99d5514 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -610,7 +610,7 @@ def get_item_price(args, item_code, ignore_party=False):
 
 	return frappe.db.sql(""" select name, price_list_rate, uom
 		from `tabItem Price` {conditions}
-		order by uom desc, min_qty desc """.format(conditions=conditions), args)
+		order by uom desc, min_qty desc, valid_from desc """.format(conditions=conditions), args)
 
 def get_price_list_rate_for(args, item_code):
 	"""
@@ -643,10 +643,15 @@ def get_price_list_rate_for(args, item_code):
 		if desired_qty and check_packing_list(price_list_rate[0][0], desired_qty, item_code):
 			item_price_data = price_list_rate
 	else:
-		for field in ["customer", "supplier", "min_qty"]:
+		for field in ["customer", "supplier"]:
 			del item_price_args[field]
 
 		general_price_list_rate = get_item_price(item_price_args, item_code, ignore_party=args.get("ignore_party"))
+
+		if not general_price_list_rate:
+			del item_price_args["min_qty"]
+			general_price_list_rate = get_item_price(item_price_args, item_code, ignore_party=args.get("ignore_party"))
+
 		if not general_price_list_rate and args.get("uom") != args.get("stock_uom"):
 			item_price_args["uom"] = args.get("stock_uom")
 			general_price_list_rate = get_item_price(item_price_args, item_code, ignore_party=args.get("ignore_party"))

From 1612432f45416a069993b180be59c1258d3f6914 Mon Sep 17 00:00:00 2001
From: Pranav Nachnekar <prnvnachnekar@gmail.com>
Date: Thu, 9 Jan 2020 08:02:15 +0000
Subject: [PATCH 187/193] fix: parent item should not appear in raw material
 request dialog (#20216)

---
 erpnext/selling/doctype/sales_order/sales_order.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 346200262d4..e7cbf405e1b 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -376,6 +376,9 @@ class SalesOrder(SellingController):
 	def get_work_order_items(self, for_raw_material_request=0):
 		'''Returns items with BOM that already do not have a linked work order'''
 		items = []
+		item_codes = [i.item_code for i in self.items]
+		product_bundle_parents = [pb.new_item_code for pb in frappe.get_all("Product Bundle", {"new_item_code": ["in", item_codes]}, ["new_item_code"])]
+
 		for table in [self.items, self.packed_items]:
 			for i in table:
 				bom = get_default_bom_item(i.item_code)
@@ -387,7 +390,7 @@ class SalesOrder(SellingController):
 				else:
 					pending_qty = stock_qty
 
-				if pending_qty:
+				if pending_qty and i.item_code not in product_bundle_parents:
 					if bom:
 						items.append(dict(
 							name= i.name,

From 287f491f7bd07e166b60b55f5b4ecd6d41c3f993 Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Thu, 9 Jan 2020 13:35:06 +0530
Subject: [PATCH 188/193] fix: Employee name in Report trial balance for party
 (#20223)

* fix: Employee name in Report trial balance for party

* fix: Add account filter in trial balance for party report

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
---
 .../trial_balance_for_party.js                 | 15 +++++++++++++++
 .../trial_balance_for_party.py                 | 18 +++++++++++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
index 873c65ebf11..0e93035a35d 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.js
@@ -65,6 +65,21 @@ frappe.query_reports["Trial Balance for Party"] = {
 				return party_type;
 			}
 		},
+		{
+			"fieldname": "account",
+			"label": __("Account"),
+			"fieldtype": "Link",
+			"options": "Account",
+			"get_query": function() {
+				var company = frappe.query_report.get_filter_value('company');
+				return {
+					"doctype": "Account",
+					"filters": {
+						"company": company,
+					}
+				}
+			}
+		},
 		{
 			"fieldname": "show_zero_values",
 			"label": __("Show zero values"),
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
index 3e47906a98b..78c7e439d38 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
@@ -20,7 +20,7 @@ def execute(filters=None):
 def get_data(filters, show_party_name):
 	if filters.get('party_type') in ('Customer', 'Supplier', 'Employee', 'Member'):
 		party_name_field = "{0}_name".format(frappe.scrub(filters.get('party_type')))
-	if filters.get('party_type') == 'Student':
+	elif filters.get('party_type') == 'Student':
 		party_name_field = 'first_name'
 	elif filters.get('party_type') == 'Shareholder':
 		party_name_field = 'title'
@@ -96,13 +96,19 @@ def get_data(filters, show_party_name):
 	return data
 
 def get_opening_balances(filters):
+
+	account_filter = ''
+	if filters.get('account'):
+		account_filter = "and account = %s" % (frappe.db.escape(filters.get('account')))
+
 	gle = frappe.db.sql("""
 		select party, sum(debit) as opening_debit, sum(credit) as opening_credit
 		from `tabGL Entry`
 		where company=%(company)s
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
 			and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
-		group by party""", {
+			{account_filter}
+		group by party""".format(account_filter=account_filter), {
 			"company": filters.company,
 			"from_date": filters.from_date,
 			"party_type": filters.party_type
@@ -116,6 +122,11 @@ def get_opening_balances(filters):
 	return opening
 
 def get_balances_within_period(filters):
+
+	account_filter = ''
+	if filters.get('account'):
+		account_filter = "and account = %s" % (frappe.db.escape(filters.get('account')))
+
 	gle = frappe.db.sql("""
 		select party, sum(debit) as debit, sum(credit) as credit
 		from `tabGL Entry`
@@ -123,7 +134,8 @@ def get_balances_within_period(filters):
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
 			and posting_date >= %(from_date)s and posting_date <= %(to_date)s
 			and ifnull(is_opening, 'No') = 'No'
-		group by party""", {
+			{account_filter}
+		group by party""".format(account_filter=account_filter), {
 			"company": filters.company,
 			"from_date": filters.from_date,
 			"to_date": filters.to_date,

From d4d7d211ead84d26a029fbed9e6e6d06011a4bf3 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Thu, 9 Jan 2020 15:05:05 +0530
Subject: [PATCH 189/193] feat: report to show difference between stock and
 account value (#20186)

---
 erpnext/accounts/utils.py                     |   6 +
 erpnext/config/stock.py                       |   6 +
 erpnext/stock/doctype/warehouse/warehouse.py  |  23 ++-
 .../__init__.py                               |   0
 .../stock_and_account_value_comparison.js     |  37 +++++
 .../stock_and_account_value_comparison.json   |  28 ++++
 .../stock_and_account_value_comparison.py     | 131 ++++++++++++++++++
 .../report/stock_balance/stock_balance.py     |   2 +-
 8 files changed, 230 insertions(+), 3 deletions(-)
 create mode 100644 erpnext/stock/report/stock_and_account_value_comparison/__init__.py
 create mode 100644 erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
 create mode 100644 erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.json
 create mode 100644 erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py

diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 89c8467da26..e01d6d5dc7f 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -891,3 +891,9 @@ def get_allow_cost_center_in_entry_of_bs_account():
 	def generator():
 		return cint(frappe.db.get_value('Accounts Settings', None, 'allow_cost_center_in_entry_of_bs_account'))
 	return frappe.local_cache("get_allow_cost_center_in_entry_of_bs_account", (), generator, regenerate_if_none=True)
+
+def get_stock_accounts(company):
+	return frappe.get_all("Account", filters = {
+		"account_type": "Stock",
+		"company": company
+	})
\ No newline at end of file
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 03e26b2b863..dd35f5ab368 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -348,6 +348,12 @@ def get_data():
 					"is_query_report": True,
 					"name": "Subcontracted Item To Be Received",
 					"doctype": "Purchase Order"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Stock and Account Value Comparison",
+					"doctype": "Stock Ledger Entry"
 				}
 			]
 		},
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 6cdb56be7fb..6ed6044f329 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -177,7 +177,26 @@ def convert_to_group_or_ledger():
 	return frappe.get_doc("Warehouse", args.docname).convert_to_group_or_ledger()
 
 def get_child_warehouses(warehouse):
-	p_warehouse = frappe.get_doc("Warehouse", warehouse)
+	lft, rgt = frappe.get_cached_value("Warehouse", warehouse, [lft, rgt])
 
 	return frappe.db.sql_list("""select name from `tabWarehouse`
-		where lft >= %s and rgt =< %s""", (p_warehouse.lft, p_warehouse.rgt))
+		where lft >= %s and rgt =< %s""", (lft, rgt))
+
+def get_warehouses_based_on_account(account, company=None):
+	warehouses = []
+	for d in frappe.get_all("Warehouse", fields = ["name", "is_group"],
+		filters = {"account": account}):
+		if d.is_group:
+			warehouses.extend(get_child_warehouses(d.name))
+		else:
+			warehouses.append(d.name)
+
+	if (not warehouses and company and
+		frappe.get_cached_value("Company", company, "default_inventory_account") == account):
+		warehouses = [d.name for d in frappe.get_all("Warehouse", filters={'is_group': 0})]
+
+	if not warehouses:
+		frappe.throw(_("Warehouse not found against the account {0}")
+			.format(account))
+
+	return warehouses
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/__init__.py b/erpnext/stock/report/stock_and_account_value_comparison/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
new file mode 100644
index 00000000000..7a170beec37
--- /dev/null
+++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js
@@ -0,0 +1,37 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Stock and Account Value Comparison"] = {
+	"filters": [
+		{
+			"label": __("Company"),
+			"fieldname": "company",
+			"fieldtype": "Link",
+			"options": "Company",
+			"reqd": 1,
+			"default": frappe.defaults.get_user_default("Company")
+		},
+		{
+			"label": __("Account"),
+			"fieldname": "account",
+			"fieldtype": "Link",
+			"options": "Account",
+			get_query: function() {
+				var company = frappe.query_report.get_filter_value('company');
+				return {
+					filters: {
+						"account_type": "Stock",
+						"company": company
+					}
+				}
+			}
+		},
+		{
+			"label": __("As On Date"),
+			"fieldname": "as_on_date",
+			"fieldtype": "Date",
+			"default": frappe.datetime.get_today(),
+		},
+	]
+};
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.json b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.json
new file mode 100644
index 00000000000..021159a89d4
--- /dev/null
+++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.json
@@ -0,0 +1,28 @@
+{
+ "add_total_row": 1,
+ "creation": "2020-01-09 14:42:45.254751",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "letter_head": "",
+ "modified": "2020-01-09 14:42:45.254751",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Stock and Account Value Comparison",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Stock Ledger Entry",
+ "report_name": "Stock and Account Value Comparison",
+ "report_type": "Script Report",
+ "roles": [
+  {
+   "role": "Stock User"
+  },
+  {
+   "role": "Accounts Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
new file mode 100644
index 00000000000..eef121e542f
--- /dev/null
+++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
@@ -0,0 +1,131 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, erpnext
+from frappe import _
+from erpnext.accounts.utils import get_stock_accounts
+from erpnext.accounts.utils import get_currency_precision
+from erpnext.stock.doctype.warehouse.warehouse import get_warehouses_based_on_account
+
+def execute(filters=None):
+	if not erpnext.is_perpetual_inventory_enabled(filters.company):
+		frappe.throw(_("Perpetual inventory required for the company {0} to view this report.")
+			.format(filters.company))
+
+	data = get_data(filters)
+	columns = get_columns(filters)
+
+	return columns, data
+
+def get_data(report_filters):
+	data = []
+
+	filters = {
+		"company": report_filters.company,
+		"posting_date": ("<=", report_filters.as_on_date)
+	}
+
+	currency_precision = get_currency_precision() or 2
+	stock_ledger_entries = get_stock_ledger_data(report_filters, filters)
+	voucher_wise_gl_data = get_gl_data(report_filters, filters)
+
+	for d in stock_ledger_entries:
+		key = (d.voucher_type, d.voucher_no)
+		gl_data = voucher_wise_gl_data.get(key) or {}
+		d.account_value = gl_data.get("account_value", 0)
+		d.difference_value = (d.stock_value - d.account_value)
+		if abs(d.difference_value) > 1.0/10 ** currency_precision:
+			data.append(d)
+
+	return data
+
+def get_stock_ledger_data(report_filters, filters):
+	if report_filters.account:
+		warehouses = get_warehouses_based_on_account(report_filters.account,
+			report_filters.warehouse)
+
+		filters["warehouse"] = ("in", warehouses)
+
+	return frappe.get_all("Stock Ledger Entry", filters=filters,
+		fields = ["name", "voucher_type", "voucher_no",
+			"sum(stock_value_difference) as stock_value", "posting_date", "posting_time"],
+		group_by = "voucher_type, voucher_no",
+		order_by = "posting_date ASC, posting_time ASC")
+
+def get_gl_data(report_filters, filters):
+	if report_filters.account:
+		stock_accounts = [report_filters.account]
+	else:
+		stock_accounts = [k.name
+			for k in get_stock_accounts(report_filters.company)]
+
+	filters.update({
+		"account": ("in", stock_accounts)
+	})
+
+	if filters.get("warehouse"):
+		del filters["warehouse"]
+
+	gl_entries = frappe.get_all("GL Entry", filters=filters,
+		fields = ["name", "voucher_type", "voucher_no",
+			"sum(debit_in_account_currency) - sum(credit_in_account_currency) as account_value"],
+		group_by = "voucher_type, voucher_no")
+
+	voucher_wise_gl_data = {}
+	for d in gl_entries:
+		key = (d.voucher_type, d.voucher_no)
+		voucher_wise_gl_data[key] = d
+
+	return voucher_wise_gl_data
+
+def get_columns(filters):
+	return [
+		{
+			"label": _("Stock Ledger ID"),
+			"fieldname": "name",
+			"fieldtype": "Link",
+			"options": "Stock Ledger Entry",
+			"width": "80"
+		},
+		{
+			"label": _("Posting Date"),
+			"fieldname": "posting_date",
+			"fieldtype": "Date"
+		},
+		{
+			"label": _("Posting Time"),
+			"fieldname": "posting_time",
+			"fieldtype": "Time"
+		},
+		{
+			"label": _("Voucher Type"),
+			"fieldname": "voucher_type",
+			"width": "110"
+		},
+		{
+			"label": _("Voucher No"),
+			"fieldname": "voucher_no",
+			"fieldtype": "Dynamic Link",
+			"options": "voucher_type",
+			"width": "110"
+		},
+		{
+			"label": _("Stock Value"),
+			"fieldname": "stock_value",
+			"fieldtype": "Currency",
+			"width": "120"
+		},
+		{
+			"label": _("Account Value"),
+			"fieldname": "account_value",
+			"fieldtype": "Currency",
+			"width": "120"
+		},
+		{
+			"label": _("Difference Value"),
+			"fieldname": "difference_value",
+			"fieldtype": "Currency",
+			"width": "120"
+		}
+	]
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index ccba8b0e239..ff03381389c 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -264,7 +264,7 @@ def get_item_details(items, sle, filters):
 			`tabItem` item
 			%s
 		where
-			item.name in (%s) and ifnull(item.disabled, 0) = 0
+			item.name in (%s)
 	""" % (cf_field, cf_join, ','.join(['%s'] *len(items))), items, as_dict=1)
 
 	for item in res:

From 00746306a300b81cea3c63f5ec422578de6f029d Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Fri, 10 Jan 2020 15:01:50 +0530
Subject: [PATCH 190/193] fix: Item tax template fetching from HSN Code

---
 erpnext/stock/doctype/item/item.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 253390ac501..dd3248baf2d 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -137,7 +137,7 @@ frappe.ui.form.on("Item", {
 	},
 
 	gst_hsn_code: function(frm) {
-		if(!frm.doc.taxes.length) {
+		if(!frm.doc.taxes || !frm.doc.taxes.length) {
 			frappe.db.get_doc("GST HSN Code", frm.doc.gst_hsn_code).then(hsn_doc => {
 				$.each(hsn_doc.taxes || [], function(i, tax) {
 					let a = frappe.model.add_child(cur_frm.doc, 'Item Tax', 'taxes');

From 1e7a127dfaf8ce340d0339d4e549e7743832f748 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Sat, 11 Jan 2020 14:19:02 +0530
Subject: [PATCH 191/193] fix: auto cancel if movement exists

---
 erpnext/assets/doctype/asset/asset.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 3e7f6833a0c..86b5a11a1d1 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -132,9 +132,10 @@ class Asset(AccountsController):
 		if len(movements) > 1:
 			frappe.throw(_('Asset has multiple Asset Movement Entries which has to be \
 				cancelled manually to cancel this asset.'))
-		movement = frappe.get_doc('Asset Movement', movements[0].get('name'))
-		movement.flags.ignore_validate = True
-		movement.cancel()
+		if movements:
+			movement = frappe.get_doc('Asset Movement', movements[0].get('name'))
+			movement.flags.ignore_validate = True
+			movement.cancel()
 
 	def make_asset_movement(self):
 		reference_doctype = 'Purchase Receipt' if self.purchase_receipt else 'Purchase Invoice'

From f04d054faabea0ae8da4e9a62479a80c9b795ab6 Mon Sep 17 00:00:00 2001
From: thefalconx33 <thefalconx33@gmail.com>
Date: Mon, 13 Jan 2020 12:43:49 +0530
Subject: [PATCH 192/193] fix: remove default customer as party type

---
 .../doctype/journal_entry_account/journal_entry_account.json   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index ab811d81b25..dbf4e5c4b41 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -90,7 +90,6 @@
    "fieldtype": "Column Break"
   },
   {
-   "default": "Customer",
    "fieldname": "party_type",
    "fieldtype": "Link",
    "in_list_view": 1,
@@ -272,7 +271,7 @@
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-10-02 12:23:21.693443",
+ "modified": "2020-01-13 12:41:33.968025",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Account",

From 2d151a7b85acc2bd530793ff3586a58f117ee270 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 13 Jan 2020 15:09:27 +0530
Subject: [PATCH 193/193] fix: Remove patch to set automatic tax fetching from
 item tax template (#20234)

---
 erpnext/patches.txt                                          | 1 -
 .../set_default_for_add_taxes_from_item_tax_template.py      | 5 -----
 2 files changed, 6 deletions(-)
 delete mode 100644 erpnext/patches/v12_0/set_default_for_add_taxes_from_item_tax_template.py

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index cea46625694..1989f4d8143 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -645,7 +645,6 @@ erpnext.patches.v12_0.set_expense_account_in_landed_cost_voucher_taxes
 erpnext.patches.v12_0.replace_accounting_with_accounts_in_home_settings
 erpnext.patches.v12_0.set_payment_entry_status
 erpnext.patches.v12_0.update_owner_fields_in_acc_dimension_custom_fields
-erpnext.patches.v12_0.set_default_for_add_taxes_from_item_tax_template
 erpnext.patches.v12_0.add_export_type_field_in_party_master
 erpnext.patches.v12_0.remove_denied_leaves_from_leave_ledger
 erpnext.patches.v12_0.update_price_or_product_discount
diff --git a/erpnext/patches/v12_0/set_default_for_add_taxes_from_item_tax_template.py b/erpnext/patches/v12_0/set_default_for_add_taxes_from_item_tax_template.py
deleted file mode 100644
index 06ee7981980..00000000000
--- a/erpnext/patches/v12_0/set_default_for_add_taxes_from_item_tax_template.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import frappe
-
-def execute():
-	frappe.db.set_value("Accounts Settings", None, "add_taxes_from_item_tax_template", 1)
-	frappe.db.set_default("add_taxes_from_item_tax_template", 1)
\ No newline at end of file