diff --git a/erpnext/accounts/doctype/discounted_invoice/__init__.py b/erpnext/accounts/doctype/discounted_invoice/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/discounted_invoice/__init__.py
diff --git a/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json b/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json
new file mode 100644
index 0000000..0d04b19
--- /dev/null
+++ b/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json
@@ -0,0 +1,177 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2019-03-07 12:07:09.416101",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "sales_invoice",
+   "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": "Invoice",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Sales Invoice",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 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": "sales_invoice.customer",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "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": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_from": "sales_invoice.posting_date",
+   "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": "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,
+   "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": "sales_invoice.grand_total",
+   "fieldname": "outstanding_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": "Outstanding 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
+  }
+ ],
+ "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-03-07 16:38:03.622666",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Discounted Invoice",
+ "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,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.py b/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.py
new file mode 100644
index 0000000..93dfcc1
--- /dev/null
+++ b/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.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 DiscountedInvoice(Document):
+	pass
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index e264467..3ced9a3 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -175,13 +175,20 @@
 	else:
 		party_condition = ""
 
+	if against_voucher_type == "Sales Invoice":
+		party_account = frappe.db.get_value(against_voucher_type, against_voucher, "debit_to")
+		account_condition = "and account in ({0}, {1})".format(frappe.db.escape(account), frappe.db.escape(party_account))
+	else:
+		account_condition = " and account = {0}".format(frappe.db.escape(account))
+
 	# get final outstanding amt
 	bal = flt(frappe.db.sql("""
 		select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 		from `tabGL Entry`
 		where against_voucher_type=%s and against_voucher=%s
-		and account = %s {0}""".format(party_condition),
-		(against_voucher_type, against_voucher, account))[0][0] or 0.0)
+		and voucher_type != 'Invoice Discounting'
+		{0} {1}""".format(party_condition, account_condition),
+		(against_voucher_type, against_voucher))[0][0] or 0.0)
 
 	if against_voucher_type == 'Purchase Invoice':
 		bal = -bal
diff --git a/erpnext/accounts/doctype/invoice_discounting/__init__.py b/erpnext/accounts/doctype/invoice_discounting/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/invoice_discounting/__init__.py
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
new file mode 100644
index 0000000..5563f03
--- /dev/null
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
@@ -0,0 +1,197 @@
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Invoice Discounting', {
+	setup: (frm) => {
+		frm.set_query("sales_invoice", "invoices", (doc) => {
+			return {
+				"filters": {
+					"docstatus": 1,
+					"company": doc.company,
+					"outstanding_amount": [">", 0]
+				},
+			};
+		});
+
+		frm.events.filter_accounts("bank_account", frm, {"account_type": "Bank"});
+		frm.events.filter_accounts("bank_charges_account", frm, {"root_type": "Expense"});
+		frm.events.filter_accounts("short_term_loan", frm, {"root_type": "Liability"});
+		frm.events.filter_accounts("accounts_receivable_credit", frm, {"account_type": "Receivable"});
+		frm.events.filter_accounts("accounts_receivable_discounted", frm, {"account_type": "Receivable"});
+		frm.events.filter_accounts("accounts_receivable_unpaid", frm, {"account_type": "Receivable"});
+
+	},
+
+	filter_accounts: (fieldname, frm, addl_filters) => {
+		let filters = {
+			"company": frm.doc.company,
+			"is_group": 0
+		};
+		if(addl_filters) Object.assign(filters, addl_filters);
+
+		frm.set_query(fieldname, () => { return { "filters": filters }; });
+	},
+
+	refresh: (frm) => {
+		frm.events.show_general_ledger(frm);
+
+		if(frm.doc.docstatus === 0) {
+			frm.add_custom_button(__('Get Invoices'), function() {
+				frm.events.get_invoices(frm);
+			});
+		}
+
+		if(frm.doc.docstatus === 1 && frm.doc.status !== "Settled") {
+			if(frm.doc.status == "Sanctioned") {
+				frm.add_custom_button(__('Disburse Loan'), function() {
+					frm.events.create_disbursement_entry(frm);
+				}).addClass("btn-primary");
+			}
+			if(frm.doc.status == "Disbursed") {
+				frm.add_custom_button(__('Close Loan'), function() {
+					frm.events.close_loan(frm);
+				}).addClass("btn-primary");
+			}
+		}
+	},
+
+	loan_start_date: (frm) => {
+		frm.events.set_end_date(frm);
+	},
+
+	loan_period: (frm) => {
+		frm.events.set_end_date(frm);
+	},
+
+	set_end_date: (frm) => {
+		if(frm.doc.loan_start_date && frm.doc.loan_period) {
+			let end_date = frappe.datetime.add_days(frm.doc.loan_start_date, frm.doc.loan_period);
+			frm.set_value("loan_end_date", end_date);
+		}
+	},
+
+	validate: (frm) => {
+		frm.events.calculate_total_amount(frm);
+	},
+
+	calculate_total_amount: (frm) => {
+		let total_amount = 0.0;
+		for (let row of (frm.doc.invoices || [])) {
+			total_amount += flt(row.outstanding_amount);
+		}
+		frm.set_value("total_amount", total_amount);
+	},
+
+	get_invoices: (frm) => {
+		var d = new frappe.ui.Dialog({
+			title: __('Get Invoices based on Filters'),
+			fields: [
+				{
+					"label": "Customer",
+					"fieldname": "customer",
+					"fieldtype": "Link",
+					"options": "Customer"
+				},
+				{
+					"label": "From Date",
+					"fieldname": "from_date",
+					"fieldtype": "Date"
+				},
+				{
+					"label": "To Date",
+					"fieldname": "to_date",
+					"fieldtype": "Date"
+				},
+				{
+					"fieldname": "col_break",
+					"fieldtype": "Column Break",
+				},
+				{
+					"label": "Min Amount",
+					"fieldname": "min_amount",
+					"fieldtype": "Currency"
+				},
+				{
+					"label": "Max Amount",
+					"fieldname": "max_amount",
+					"fieldtype": "Currency"
+				}
+			],
+			primary_action: function() {
+				var data = d.get_values();
+
+				frappe.call({
+					method: "erpnext.accounts.doctype.invoice_discounting.invoice_discounting.get_invoices",
+					args: {
+						filters: data
+					},
+					callback: function(r) {
+						if(!r.exc) {
+							d.hide();
+							$.each(r.message, function(i, v) {
+								frm.doc.invoices = frm.doc.invoices.filter(row => row.sales_invoice);
+								let row = frm.add_child("invoices");
+								$.extend(row, v);
+							});
+							refresh_field("invoices");
+						}
+					}
+				});
+			},
+			primary_action_label: __('Get Invocies')
+		});
+		d.show();
+	},
+
+	create_disbursement_entry: (frm) => {
+		frappe.call({
+			method:"create_disbursement_entry",
+			doc: frm.doc,
+			callback: function(r) {
+				if(!r.exc){
+					var doclist = frappe.model.sync(r.message);
+					frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+				}
+			}
+		});
+
+	},
+
+	close_loan: (frm) => {
+		frappe.call({
+			method:"close_loan",
+			doc: frm.doc,
+			callback: function(r) {
+				if(!r.exc){
+					var doclist = frappe.model.sync(r.message);
+					frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+				}
+			}
+		});
+
+	},
+
+	show_general_ledger: (frm) => {
+		if(frm.doc.docstatus===1) {
+			cur_frm.add_custom_button(__('Accounting Ledger'), function() {
+				frappe.route_options = {
+					voucher_no: frm.doc.name,
+					from_date: frm.doc.posting_date,
+					to_date: frm.doc.posting_date,
+					company: frm.doc.company,
+					group_by: "Group by Voucher (Consolidated)"
+				};
+				frappe.set_route("query-report", "General Ledger");
+			}, __("View"));
+		}
+	}
+});
+
+frappe.ui.form.on('Discounted Invoice', {
+	sales_invoice: (frm) => {
+		frm.events.calculate_total_amount(frm);
+	},
+	invoices_remove: (frm) => {
+		frm.events.calculate_total_amount(frm);
+	}
+});
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
new file mode 100644
index 0000000..8927ca7
--- /dev/null
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
@@ -0,0 +1,773 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "ACC-INV-DISC-.YYYY.-.#####",
+ "beta": 0,
+ "creation": "2019-03-07 12:01:56.296952",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "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": "loan_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": "Loan 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,
+   "fieldname": "loan_period",
+   "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": "Loan Period",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "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": "loan_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": "Loan End Date",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "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\nSanctioned\nDisbursed\nSettled\nCancelled",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Company",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_5",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "invoices",
+   "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": "Invoices",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Discounted Invoice",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "total_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 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_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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank_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": "Bank Charges",
+   "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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "section_break_6",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "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": "short_term_loan",
+   "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": "Short Term 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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank_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": "Bank 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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "bank_charges_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": "Bank Charges 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
+  },
+  {
+   "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,
+   "fieldname": "accounts_receivable_credit",
+   "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": "Accounts Receivable Credit 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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "accounts_receivable_discounted",
+   "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": "Accounts Receivable Discounted 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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "accounts_receivable_unpaid",
+   "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": "Accounts Receivable Unpaid 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
+  },
+  {
+   "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": "Invoice Discounting",
+   "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,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-03-08 14:24:31.222027",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Invoice Discounting",
+ "name_case": "",
+ "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": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
new file mode 100644
index 0000000..64aa4e4
--- /dev/null
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
@@ -0,0 +1,198 @@
+# -*- 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, json
+from frappe import _
+from frappe.utils import flt, getdate, nowdate, add_days
+from erpnext.controllers.accounts_controller import AccountsController
+from erpnext.accounts.general_ledger import make_gl_entries
+
+class InvoiceDiscounting(AccountsController):
+	def validate(self):
+		self.validate_mandatory()
+		self.calculate_total_amount()
+		self.set_status()
+		self.set_end_date()
+
+	def set_end_date(self):
+		if self.loan_start_date and self.loan_period:
+			self.loan_end_date = add_days(self.loan_start_date, self.loan_period)
+
+	def validate_mandatory(self):
+		if self.docstatus == 1 and not (self.loan_start_date and self.loan_period):
+			frappe.throw(_("Loan Start Date and Loan Period are mandatory to save the Invoice Discounting"))
+
+	def calculate_total_amount(self):
+		self.total_amount = sum([flt(d.outstanding_amount) for d in self.invoices])
+
+	def on_submit(self):
+		self.make_gl_entries()
+
+	def on_cancel(self):
+		self.set_status()
+		self.make_gl_entries()
+
+	def set_status(self):
+		self.status = "Draft"
+		if self.docstatus == 1:
+			self.status = "Sanctioned"
+		elif self.docstatus == 2:
+			self.status = "Cancelled"
+
+	def make_gl_entries(self):
+		company_currency = frappe.get_cached_value('Company',  self.company, "default_currency")
+
+		gl_entries = []
+		for d in self.invoices:
+			inv = frappe.db.get_value("Sales Invoice", d.sales_invoice,
+				["debit_to", "party_account_currency", "conversion_rate", "cost_center"], as_dict=1)
+
+			if d.outstanding_amount:
+				outstanding_in_company_currency = flt(d.outstanding_amount * inv.conversion_rate,
+					d.precision("outstanding_amount"))
+				ar_credit_account_currency = frappe.get_cached_value("Account", self.accounts_receivable_credit, "currency")
+
+				gl_entries.append(self.get_gl_dict({
+					"account": inv.debit_to,
+					"party_type": "Customer",
+					"party": d.customer,
+					"against": self.accounts_receivable_credit,
+					"credit": outstanding_in_company_currency,
+					"credit_in_account_currency": outstanding_in_company_currency \
+						if inv.party_account_currency==company_currency else d.outstanding_amount,
+					"cost_center": inv.cost_center,
+					"against_voucher": d.sales_invoice,
+					"against_voucher_type": "Sales Invoice"
+				}, inv.party_account_currency))
+
+				gl_entries.append(self.get_gl_dict({
+					"account": self.accounts_receivable_credit,
+					"party_type": "Customer",
+					"party": d.customer,
+					"against": inv.debit_to,
+					"debit": outstanding_in_company_currency,
+					"debit_in_account_currency": outstanding_in_company_currency \
+						if ar_credit_account_currency==company_currency else d.outstanding_amount,
+					"cost_center": inv.cost_center,
+					"against_voucher": d.sales_invoice,
+					"against_voucher_type": "Sales Invoice"
+				}, ar_credit_account_currency))
+
+		make_gl_entries(gl_entries, cancel=(self.docstatus == 2), update_outstanding='No')
+
+	def create_disbursement_entry(self):
+		je = frappe.new_doc("Journal Entry")
+		je.voucher_type = 'Journal Entry'
+		je.company = self.company
+		je.remark = 'Loan Disbursement entry against Invoice Discounting: ' + self.name
+
+		je.append("accounts", {
+			"account": self.bank_account,
+			"debit_in_account_currency": flt(self.total_amount) - flt(self.bank_charges),
+		})
+
+		je.append("accounts", {
+			"account": self.bank_charges_account,
+			"debit_in_account_currency": flt(self.bank_charges)
+		})
+
+		je.append("accounts", {
+			"account": self.short_term_loan,
+			"credit_in_account_currency": flt(self.total_amount),
+			"reference_type": "Invoice Discounting",
+			"reference_name": self.name
+		})
+		for d in self.invoices:
+			je.append("accounts", {
+				"account": self.accounts_receivable_discounted,
+				"debit_in_account_currency": flt(d.outstanding_amount),
+				"reference_type": "Invoice Discounting",
+				"reference_name": self.name,
+				"party_type": "Customer",
+				"party": d.customer
+			})
+
+			je.append("accounts", {
+				"account": self.accounts_receivable_credit,
+				"credit_in_account_currency": flt(d.outstanding_amount),
+				"reference_type": "Invoice Discounting",
+				"reference_name": self.name,
+				"party_type": "Customer",
+				"party": d.customer
+			})
+
+		return je
+
+	def close_loan(self):
+		je = frappe.new_doc("Journal Entry")
+		je.voucher_type = 'Journal Entry'
+		je.company = self.company
+		je.remark = 'Loan Settlement entry against Invoice Discounting: ' + self.name
+
+		je.append("accounts", {
+			"account": self.short_term_loan,
+			"debit_in_account_currency": flt(self.total_amount),
+			"reference_type": "Invoice Discounting",
+			"reference_name": self.name,
+		})
+
+		je.append("accounts", {
+			"account": self.bank_account,
+			"credit_in_account_currency": flt(self.total_amount)
+		})
+
+		if getdate(self.loan_end_date) > getdate(nowdate()):
+			for d in self.invoices:
+				je.append("accounts", {
+					"account": self.accounts_receivable_discounted,
+					"credit_in_account_currency": flt(d.outstanding_amount),
+					"reference_type": "Invoice Discounting",
+					"reference_name": self.name,
+					"party_type": "Customer",
+					"party": d.customer
+				})
+
+				je.append("accounts", {
+					"account": self.accounts_receivable_unpaid,
+					"debit_in_account_currency": flt(d.outstanding_amount),
+					"reference_type": "Invoice Discounting",
+					"reference_name": self.name,
+					"party_type": "Customer",
+					"party": d.customer
+				})
+
+		return je
+
+@frappe.whitelist()
+def get_invoices(filters):
+	filters = frappe._dict(json.loads(filters))
+	cond = []
+	if filters.customer:
+		cond.append("customer=%(customer)s")
+	if filters.from_date:
+		cond.append("posting_date >= %(from_date)s")
+	if filters.to_date:
+		cond.append("posting_date <= %(to_date)s")
+	if filters.min_amount:
+		cond.append("base_grand_total >= %(min_amount)s")
+	if filters.max_amount:
+		cond.append("base_grand_total <= %(max_amount)s")
+
+	where_condition = ""
+	if cond:
+		where_condition += " and " + " and ".join(cond)
+
+	return frappe.db.sql("""
+		select
+			name as sales_invoice,
+			customer,
+			posting_date,
+			outstanding_amount
+		from `tabSales Invoice`
+		where
+			docstatus = 1
+			and outstanding_amount > 0
+			%s
+	""" % where_condition, filters, as_dict=1)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js
new file mode 100644
index 0000000..a72023d
--- /dev/null
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js
@@ -0,0 +1,21 @@
+frappe.listview_settings['Invoice Discounting'] = {
+	add_fields: ["status"],
+	get_indicator: function(doc)
+	{
+		if(doc.status == "Draft") {
+			return [__("Draft"), "red", "status,=,Draft"];
+		}
+		else if(doc.status == "Sanctioned") {
+			return [__("Sanctioned"), "green", "status,=,Sanctioned"];
+		}
+		else if(doc.status == "Disbursed") {
+			return [__("Disbursed"), "blue", "status,=,Disbursed"];
+		}
+		else if(doc.status == "Settled") {
+			return [__("Settled"), "orange", "status,=,Settled"];
+		}
+		else if(doc.status == "Canceled") {
+			return [__("Canceled"), "red", "status,=,Canceled"];
+		}
+	}
+};
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py
new file mode 100644
index 0000000..4f93e11
--- /dev/null
+++ b/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py
@@ -0,0 +1,269 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+from frappe.utils import nowdate, add_days, flt
+import unittest
+from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
+from erpnext.accounts.doctype.account.test_account import create_account
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_payment_entry_against_invoice
+class TestInvoiceDiscounting(unittest.TestCase):
+	def setUp(self):
+		self.ar_credit = create_account(account_name="_Test Accounts Receivable Credit", parent_account = "Accounts Receivable - _TC", company="_Test Company")
+		self.ar_discounted = create_account(account_name="_Test Accounts Receivable Discounted", parent_account = "Accounts Receivable - _TC", company="_Test Company")
+		self.ar_unpaid = create_account(account_name="_Test Accounts Receivable Unpaid", parent_account = "Accounts Receivable - _TC", company="_Test Company")
+		self.short_term_loan = create_account(account_name="_Test Short Term Loan", parent_account = "Source of Funds (Liabilities) - _TC", company="_Test Company")
+		self.bank_account = create_account(account_name="_Test Bank 2", parent_account = "Bank Accounts - _TC", company="_Test Company")
+		self.bank_charges_account = create_account(account_name="_Test Bank Charges Account", parent_account = "Expenses - _TC", company="_Test Company")
+		frappe.db.set_value("Company", "_Test Company", "default_bank_account", self.bank_account)
+
+	def test_total_amount(self):
+		inv1 = create_sales_invoice(rate=200)
+		inv2 = create_sales_invoice(rate=500)
+
+		inv_disc = create_invoice_discounting([inv1.name, inv2.name],
+			do_not_submit=True,
+			accounts_receivable_credit=self.ar_credit,
+			accounts_receivable_discounted=self.ar_discounted,
+			accounts_receivable_unpaid=self.ar_unpaid,
+			short_term_loan=self.short_term_loan,
+			bank_charges_account=self.bank_charges_account,
+			bank_account=self.bank_account
+			)
+		self.assertEqual(inv_disc.total_amount, 700)
+
+	def test_gl_entries_in_base_currency(self):
+		inv = create_sales_invoice(rate=200)
+		inv_disc = create_invoice_discounting([inv.name],
+			accounts_receivable_credit=self.ar_credit,
+			accounts_receivable_discounted=self.ar_discounted,
+			accounts_receivable_unpaid=self.ar_unpaid,
+			short_term_loan=self.short_term_loan,
+			bank_charges_account=self.bank_charges_account,
+			bank_account=self.bank_account
+			)
+
+		gle = get_gl_entries("Invoice Discounting", inv_disc.name)
+
+		expected_gle = {
+			inv.debit_to: [0.0, 200],
+			self.ar_credit: [200, 0.0]
+		}
+		for i, gle in enumerate(gle):
+			self.assertEqual([gle.debit, gle.credit], expected_gle.get(gle.account))
+
+	def test_loan_on_submit(self):
+		inv = create_sales_invoice(rate=300)
+		inv_disc = create_invoice_discounting([inv.name],
+			accounts_receivable_credit=self.ar_credit,
+			accounts_receivable_discounted=self.ar_discounted,
+			accounts_receivable_unpaid=self.ar_unpaid,
+			short_term_loan=self.short_term_loan,
+			bank_charges_account=self.bank_charges_account,
+			bank_account=self.bank_account,
+			start=nowdate(),
+			period=60
+			)
+		self.assertEqual(inv_disc.status, "Sanctioned")
+		self.assertEqual(inv_disc.loan_end_date, add_days(inv_disc.loan_start_date, inv_disc.loan_period))
+
+
+	def test_on_disbursed(self):
+		inv = create_sales_invoice(rate=500)
+		inv_disc = create_invoice_discounting([inv.name],
+			accounts_receivable_credit=self.ar_credit,
+			accounts_receivable_discounted=self.ar_discounted,
+			accounts_receivable_unpaid=self.ar_unpaid,
+			short_term_loan=self.short_term_loan,
+			bank_charges_account=self.bank_charges_account,
+			bank_account=self.bank_account,
+			)
+
+		je = inv_disc.create_disbursement_entry()
+
+		self.assertEqual(je.accounts[0].account, self.bank_account)
+		self.assertEqual(je.accounts[0].debit_in_account_currency, flt(inv_disc.total_amount) - flt(inv_disc.bank_charges))
+
+		self.assertEqual(je.accounts[1].account, self.bank_charges_account)
+		self.assertEqual(je.accounts[1].debit_in_account_currency, flt(inv_disc.bank_charges))
+
+		self.assertEqual(je.accounts[2].account, self.short_term_loan)
+		self.assertEqual(je.accounts[2].credit_in_account_currency, flt(inv_disc.total_amount))
+
+		self.assertEqual(je.accounts[3].account, self.ar_discounted)
+		self.assertEqual(je.accounts[3].debit_in_account_currency, flt(inv.outstanding_amount))
+
+		self.assertEqual(je.accounts[4].account, self.ar_credit)
+		self.assertEqual(je.accounts[4].credit_in_account_currency, flt(inv.outstanding_amount))
+
+
+		je.posting_date = nowdate()
+		je.submit()
+
+		inv_disc.reload()
+		self.assertEqual(inv_disc.status, "Disbursed")
+
+		inv.reload()
+		self.assertEqual(inv.outstanding_amount, 500)
+
+	def test_on_close_after_loan_period(self):
+		inv = create_sales_invoice(rate=600)
+		inv_disc = create_invoice_discounting([inv.name],
+			accounts_receivable_credit=self.ar_credit,
+			accounts_receivable_discounted=self.ar_discounted,
+			accounts_receivable_unpaid=self.ar_unpaid,
+			short_term_loan=self.short_term_loan,
+			bank_charges_account=self.bank_charges_account,
+			bank_account=self.bank_account,
+			start=nowdate(),
+			period=60
+			)
+
+		inv_disc.create_disbursement_entry()
+		je = inv_disc.close_loan()
+
+		self.assertEqual(je.accounts[0].account, self.short_term_loan)
+		self.assertEqual(je.accounts[0].debit_in_account_currency, flt(inv_disc.total_amount))
+
+		self.assertEqual(je.accounts[1].account, self.bank_account)
+		self.assertEqual(je.accounts[1].credit_in_account_currency, flt(inv_disc.total_amount))
+
+		self.assertEqual(je.accounts[2].account, self.ar_discounted)
+		self.assertEqual(je.accounts[2].credit_in_account_currency, flt(inv.outstanding_amount))
+
+		self.assertEqual(je.accounts[3].account, self.ar_unpaid)
+		self.assertEqual(je.accounts[3].debit_in_account_currency, flt(inv.outstanding_amount))
+
+		je.posting_date = nowdate()
+		je.submit()
+		inv_disc.reload()
+
+		self.assertEqual(inv_disc.status, "Settled")
+
+	def test_on_close_before_loan_period(self):
+		inv = create_sales_invoice(rate=700)
+		inv_disc = create_invoice_discounting([inv.name],
+			accounts_receivable_credit=self.ar_credit,
+			accounts_receivable_discounted=self.ar_discounted,
+			accounts_receivable_unpaid=self.ar_unpaid,
+			short_term_loan=self.short_term_loan,
+			bank_charges_account=self.bank_charges_account,
+			bank_account=self.bank_account,
+			start=add_days(nowdate(), -80),
+			period=60
+			)
+
+		inv_disc.create_disbursement_entry()
+		je = inv_disc.close_loan()
+
+		je.posting_date = nowdate()
+		je.submit()
+
+		self.assertEqual(je.accounts[0].account, self.short_term_loan)
+		self.assertEqual(je.accounts[0].debit_in_account_currency, flt(inv_disc.total_amount))
+
+		self.assertEqual(je.accounts[1].account, self.bank_account)
+		self.assertEqual(je.accounts[1].credit_in_account_currency, flt(inv_disc.total_amount))
+
+		inv_disc.reload()
+
+		self.assertEqual(inv_disc.status, "Settled")
+
+	def test_make_payment_before_loan_period(self):
+		#it has problem
+		inv = create_sales_invoice(rate=700)
+		inv_disc = create_invoice_discounting([inv.name],
+				accounts_receivable_credit=self.ar_credit,
+				accounts_receivable_discounted=self.ar_discounted,
+				accounts_receivable_unpaid=self.ar_unpaid,
+				short_term_loan=self.short_term_loan,
+				bank_charges_account=self.bank_charges_account,
+				bank_account=self.bank_account
+				)
+		je = inv_disc.create_disbursement_entry()
+		inv_disc.reload()
+		je.posting_date = nowdate()
+		je.submit()
+
+		je_on_payment = frappe.get_doc(get_payment_entry_against_invoice("Sales Invoice", inv.name))
+		je_on_payment.posting_date = nowdate()
+		je_on_payment.cheque_no = "126981"
+		je_on_payment.cheque_date = nowdate()
+		je_on_payment.save()
+		je_on_payment.submit()
+
+		self.assertEqual(je_on_payment.accounts[0].account, self.ar_discounted)
+		self.assertEqual(je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount))
+		self.assertEqual(je_on_payment.accounts[1].account, self.bank_account)
+		self.assertEqual(je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount))
+
+		inv.reload()
+		self.assertEqual(inv.outstanding_amount, 0)
+
+	def test_make_payment_before_after_period(self):
+		#it has problem
+		inv = create_sales_invoice(rate=700)
+		inv_disc = create_invoice_discounting([inv.name],
+				accounts_receivable_credit=self.ar_credit,
+				accounts_receivable_discounted=self.ar_discounted,
+				accounts_receivable_unpaid=self.ar_unpaid,
+				short_term_loan=self.short_term_loan,
+				bank_charges_account=self.bank_charges_account,
+				bank_account=self.bank_account,
+				loan_start_date=add_days(nowdate(), -10),
+				period=5
+				)
+		je = inv_disc.create_disbursement_entry()
+		inv_disc.reload()
+		je.posting_date = nowdate()
+		je.submit()
+
+		je = inv_disc.close_loan()
+		inv_disc.reload()
+		je.posting_date = nowdate()
+		je.submit()
+
+		je_on_payment = frappe.get_doc(get_payment_entry_against_invoice("Sales Invoice", inv.name))
+		je_on_payment.posting_date = nowdate()
+		je_on_payment.cheque_no = "126981"
+		je_on_payment.cheque_date = nowdate()
+		je_on_payment.submit()
+
+		self.assertEqual(je_on_payment.accounts[0].account, self.ar_unpaid)
+		self.assertEqual(je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount))
+		self.assertEqual(je_on_payment.accounts[1].account, self.bank_account)
+		self.assertEqual(je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount))
+
+		inv.reload()
+		self.assertEqual(inv.outstanding_amount, 0)
+
+
+def create_invoice_discounting(invoices, **args):
+	args = frappe._dict(args)
+	inv_disc = frappe.new_doc("Invoice Discounting")
+	inv_disc.posting_date = args.posting_date or nowdate()
+	inv_disc.company = args.company or "_Test Company"
+	inv_disc.bank_account = args.bank_account
+	inv_disc.short_term_loan = args.short_term_loan
+	inv_disc.accounts_receivable_credit = args.accounts_receivable_credit
+	inv_disc.accounts_receivable_discounted = args.accounts_receivable_discounted
+	inv_disc.accounts_receivable_unpaid = args.accounts_receivable_unpaid
+	inv_disc.short_term_loan=args.short_term_loan
+	inv_disc.bank_charges_account=args.bank_charges_account
+	inv_disc.bank_account=args.bank_account
+	inv_disc.loan_start_date = args.start or nowdate()
+	inv_disc.loan_period = args.period or 30
+
+	for d in invoices:
+		inv_disc.append("invoices", {
+			"sales_invoice": d
+		})
+	inv_disc.insert()
+
+	if not args.do_not_submit:
+		inv_disc.submit()
+
+	return inv_disc
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 00aba41..28869d8 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -51,6 +51,7 @@
 		self.update_expense_claim()
 		self.update_loan()
 		self.update_inter_company_jv()
+		self.update_invoice_discounting()
 
 
 	def get_title(self):
@@ -81,6 +82,18 @@
 			frappe.db.set_value("Journal Entry", self.inter_company_journal_entry_reference,\
 				"inter_company_journal_entry_reference", self.name)
 
+	def update_invoice_discounting(self):
+		invoice_discounting_list = [d.reference_name for d in self.accounts if d.reference_type=="Invoice Discounting"]
+		for inv_disc in invoice_discounting_list:
+			short_term_loan_account = frappe.db.get_value("Invoice Discounting", inv_disc, "short_term_loan")
+			for d in self.accounts:
+				if d.account == short_term_loan_account and d.reference_name == inv_disc:
+					if d.credit > 0:
+						status = "Disbursed"
+					elif d.debit > 0:
+						status = "Settled"
+					frappe.db.set_value("Invoice Discounting", inv_disc, "status", status)
+
 	def on_cancel(self):
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
 		from erpnext.hr.doctype.salary_slip.salary_slip import unlink_ref_doc_from_salary_slip
@@ -246,7 +259,11 @@
 
 				# check if party and account match
 				if d.reference_type in ("Sales Invoice", "Purchase Invoice"):
-					if (against_voucher[0] != d.party or against_voucher[1] != d.account):
+					if d.reference_type == "Sales Invoice":
+						party_account = get_party_account_based_on_invoice_discounting(d.reference_name) or against_voucher[1]
+					else:
+						party_account = against_voucher[1]
+					if (against_voucher[0] != d.party or party_account != d.account):
 						frappe.throw(_("Row {0}: Party / Account does not match with {1} / {2} in {3} {4}")
 							.format(d.idx, field_dict.get(d.reference_type)[0], field_dict.get(d.reference_type)[1],
 								d.reference_type, d.reference_name))
@@ -688,7 +705,7 @@
 	ref_doc = frappe.get_doc(dt, dn)
 	if dt == "Sales Invoice":
 		party_type = "Customer"
-		party_account = ref_doc.debit_to
+		party_account = get_party_account_based_on_invoice_discounting(dn) or ref_doc.debit_to
 	else:
 		party_type = "Supplier"
 		party_account = ref_doc.credit_to
@@ -715,6 +732,22 @@
 		"journal_entry": journal_entry
 	})
 
+def get_party_account_based_on_invoice_discounting(sales_invoice):
+	party_account = None
+	invoice_discounting = frappe.db.sql("""
+		select par.accounts_receivable_discounted, par.accounts_receivable_unpaid, par.status
+		from `tabInvoice Discounting` par, `tabDiscounted Invoice` ch
+		where par.name=ch.parent
+			and par.docstatus=1
+			and ch.sales_invoice = %s
+	""", (sales_invoice), as_dict=1)
+	if invoice_discounting:
+		if invoice_discounting[0].status == "Disbursed":
+			party_account = invoice_discounting[0].accounts_receivable_discounted
+		elif invoice_discounting[0].status == "Settled":
+			party_account = invoice_discounting[0].accounts_receivable_unpaid
+
+	return party_account
 
 def get_payment_entry(ref_doc, args):
 	cost_center = ref_doc.get("cost_center") or frappe.get_cached_value('Company',  ref_doc.company,  "cost_center")
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 6aa37d8..7c6111a 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -1,987 +1,987 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2013-02-22 01:27:39", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fetch_if_empty": 0, 
-   "fieldname": "account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "account", 
-   "oldfieldtype": "Link", 
-   "options": "Account", 
-   "permlevel": 0, 
-   "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": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
-   "width": "250px"
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "account_type", 
-   "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": "Account Type", 
-   "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, 
-   "fetch_if_empty": 0, 
-   "fieldname": "balance", 
-   "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": "Account Balance", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "balance", 
-   "oldfieldtype": "Data", 
-   "options": "account_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, 
-   "default": ":Company", 
-   "description": "If Income or Expense", 
-   "fetch_if_empty": 0, 
-   "fieldname": "cost_center", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Cost Center", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "cost_center", 
-   "oldfieldtype": "Link", 
-   "options": "Cost Center", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "180px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
-   "width": "180px"
-  }, 
-  {
-   "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_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "bank_account_no", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Account No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Bank Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "party_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Party Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fetch_if_empty": 0, 
-   "fieldname": "party", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Party", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "party_type", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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": "party_balance", 
-   "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": "Party Balance", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "account_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, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "currency_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": "Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "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_if_empty": 0, 
-   "fieldname": "account_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": "Account Currency", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 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": "column_break_10", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "exchange_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, 
-   "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, 
-   "fetch_if_empty": 0, 
-   "fieldname": "sec_break1", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "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": 2, 
-   "fetch_if_empty": 0, 
-   "fieldname": "debit_in_account_currency", 
-   "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": "Debit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "account_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": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "debit", 
-   "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": "Debit in Company Currency", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "debit", 
-   "oldfieldtype": "Currency", 
-   "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, 
-   "fetch_if_empty": 0, 
-   "fieldname": "col_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fetch_if_empty": 0, 
-   "fieldname": "credit_in_account_currency", 
-   "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": "Credit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "account_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": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "credit", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Credit in Company Currency", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "credit", 
-   "oldfieldtype": "Currency", 
-   "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, 
-   "fetch_if_empty": 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, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "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_if_empty": 0, 
-   "fieldname": "reference_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": "Reference Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "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_if_empty": 0, 
-   "fieldname": "reference_name", 
-   "fieldtype": "Dynamic 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": "Reference Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "reference_type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan', 'Employee Advance'])", 
-   "fetch_if_empty": 0, 
-   "fieldname": "reference_due_date", 
-   "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": "Reference Due 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": 0, 
-   "search_index": 0, 
-   "set_only_once": 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": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Project", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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": "col_break3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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": "is_advance", 
-   "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 Advance", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "is_advance", 
-   "oldfieldtype": "Select", 
-   "options": "No\nYes", 
-   "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, 
-   "fetch_if_empty": 0, 
-   "fieldname": "user_remark", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "User Remark", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "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": "against_account", 
-   "fieldtype": "Text", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Against Account", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "against_account", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }
- ], 
- "has_web_view": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2019-04-09 18:48:29.494134", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Journal Entry Account", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "show_name_in_global_search": 0, 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
-}
\ No newline at end of file
+   "allow_copy": 0,
+   "allow_events_in_timeline": 0,
+   "allow_guest_to_view": 0,
+   "allow_import": 0,
+   "allow_rename": 0,
+   "autoname": "hash",
+   "beta": 0,
+   "creation": "2013-02-22 01:27:39",
+   "custom": 0,
+   "docstatus": 0,
+   "doctype": "DocType",
+   "document_type": "Document",
+   "editable_grid": 1,
+   "engine": "InnoDB",
+   "fields": [
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 3,
+     "fetch_if_empty": 0,
+     "fieldname": "account",
+     "fieldtype": "Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 1,
+     "in_list_view": 1,
+     "in_standard_filter": 0,
+     "label": "Account",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "account",
+     "oldfieldtype": "Link",
+     "options": "Account",
+     "permlevel": 0,
+     "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": 1,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "250px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "account_type",
+     "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": "Account Type",
+     "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,
+     "fetch_if_empty": 0,
+     "fieldname": "balance",
+     "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": "Account Balance",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "balance",
+     "oldfieldtype": "Data",
+     "options": "account_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,
+     "default": ":Company",
+     "description": "If Income or Expense",
+     "fetch_if_empty": 0,
+     "fieldname": "cost_center",
+     "fieldtype": "Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Cost Center",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "cost_center",
+     "oldfieldtype": "Link",
+     "options": "Cost Center",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "print_width": "180px",
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "180px"
+    },
+    {
+     "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_break1",
+     "fieldtype": "Column Break",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "bank_account_no",
+     "fieldtype": "Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Bank Account No",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Bank Account",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "party_type",
+     "fieldtype": "Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Party Type",
+     "length": 0,
+     "no_copy": 0,
+     "options": "DocType",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 1,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 3,
+     "fetch_if_empty": 0,
+     "fieldname": "party",
+     "fieldtype": "Dynamic Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 1,
+     "in_standard_filter": 0,
+     "label": "Party",
+     "length": 0,
+     "no_copy": 0,
+     "options": "party_type",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "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": "party_balance",
+     "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": "Party Balance",
+     "length": 0,
+     "no_copy": 0,
+     "options": "account_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,
+     "collapsible_depends_on": "",
+     "columns": 0,
+     "depends_on": "",
+     "fetch_if_empty": 0,
+     "fieldname": "currency_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": "Currency",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "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_if_empty": 0,
+     "fieldname": "account_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": "Account Currency",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 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": "column_break_10",
+     "fieldtype": "Column Break",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "exchange_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,
+     "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,
+     "fetch_if_empty": 0,
+     "fieldname": "sec_break1",
+     "fieldtype": "Section Break",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Amount",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "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": 2,
+     "fetch_if_empty": 0,
+     "fieldname": "debit_in_account_currency",
+     "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": "Debit",
+     "length": 0,
+     "no_copy": 0,
+     "options": "account_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": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "debit",
+     "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": "Debit in Company Currency",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "debit",
+     "oldfieldtype": "Currency",
+     "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,
+     "fetch_if_empty": 0,
+     "fieldname": "col_break2",
+     "fieldtype": "Column Break",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 2,
+     "fetch_if_empty": 0,
+     "fieldname": "credit_in_account_currency",
+     "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": "Credit",
+     "length": 0,
+     "no_copy": 0,
+     "options": "account_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": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "credit",
+     "fieldtype": "Currency",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Credit in Company Currency",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "credit",
+     "oldfieldtype": "Currency",
+     "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,
+     "fetch_if_empty": 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "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_if_empty": 0,
+     "fieldname": "reference_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": "Reference Type",
+     "length": 0,
+     "no_copy": 0,
+     "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "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_if_empty": 0,
+     "fieldname": "reference_name",
+     "fieldtype": "Dynamic 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": "Reference Name",
+     "length": 0,
+     "no_copy": 0,
+     "options": "reference_type",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:doc.reference_type&&!in_list(doc.reference_type, ['Expense Claim', 'Asset', 'Employee Loan', 'Employee Advance'])",
+     "fetch_if_empty": 0,
+     "fieldname": "reference_due_date",
+     "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": "Reference Due 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": 0,
+     "search_index": 0,
+     "set_only_once": 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": "project",
+     "fieldtype": "Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Project",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Project",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "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": "col_break3",
+     "fieldtype": "Column Break",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "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": "is_advance",
+     "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 Advance",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "is_advance",
+     "oldfieldtype": "Select",
+     "options": "No\nYes",
+     "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,
+     "fetch_if_empty": 0,
+     "fieldname": "user_remark",
+     "fieldtype": "Small Text",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "User Remark",
+     "length": 0,
+     "no_copy": 1,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "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": "against_account",
+     "fieldtype": "Text",
+     "hidden": 1,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Against Account",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "against_account",
+     "oldfieldtype": "Text",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    }
+   ],
+   "has_web_view": 0,
+   "hide_toolbar": 0,
+   "idx": 1,
+   "in_create": 0,
+   "is_submittable": 0,
+   "issingle": 0,
+   "istable": 1,
+   "max_attachments": 0,
+   "modified": "2019-04-15 18:48:29.494134",
+   "modified_by": "Administrator",
+   "module": "Accounts",
+   "name": "Journal Entry Account",
+   "owner": "Administrator",
+   "permissions": [],
+   "quick_entry": 0,
+   "read_only": 0,
+   "show_name_in_global_search": 0,
+   "sort_order": "DESC",
+   "track_changes": 1,
+   "track_seen": 0,
+   "track_views": 0
+  }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
index 28da815..4a8fcc0 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
@@ -18,7 +18,7 @@
 		'transactions': [
 			{
 				'label': _('Payment'),
-				'items': ['Payment Entry', 'Payment Request', 'Journal Entry']
+				'items': ['Payment Entry', 'Payment Request', 'Journal Entry', 'Invoice Discounting']
 			},
 			{
 				'label': _('Reference'),