fix: linter issue

fix: negative stock error for the batch (#40389)

(cherry picked from commit a419812864)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

.editorconfig

@@ -9,6 +9,13 @@ trim_trailing_whitespace = true
 charset = utf-8
 
 # python, js indentation settings
-[{*.py,*.js}]
+[{*.py,*.js,*.vue,*.css,*.scss,*.html}]
 indent_style = tab
 indent_size = 4
+max_line_length = 110
+
+# JSON files - mostly doctype schema files
+[{*.json}]
+insert_final_newline = false
+indent_style = space
+indent_size = 2

.eslintrc

@@ -124,6 +124,7 @@
 		"beforeEach": true,
 		"onScan": true,
 		"extend_cscript": true,
-		"localforage": true
+		"localforage": true,
+		"Plaid": true
 	}
 }

.pre-commit-config.yaml

@@ -20,6 +20,23 @@ repos:
       - id: check-yaml
       - id: debug-statements
 
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.7.1
+    hooks:
+      - id: prettier
+        types_or: [javascript, vue, scss]
+        # Ignore any files that might contain jinja / bundles
+        exclude: |
+            (?x)^(
+                erpnext/public/dist/.*|
+                cypress/.*|
+                .*node_modules.*|
+                .*boilerplate.*|
+                erpnext/public/js/controllers/.*|
+                erpnext/templates/pages/order.js|
+                erpnext/templates/includes/.*
+            )$
+
   - repo: https://github.com/pre-commit/mirrors-eslint
     rev: v8.44.0
     hooks:

commitlint.config.js

@@ -1,25 +1,13 @@
 module.exports = {
-	parserPreset: 'conventional-changelog-conventionalcommits',
+	parserPreset: "conventional-changelog-conventionalcommits",
 	rules: {
-		'subject-empty': [2, 'never'],
+		"subject-empty": [2, "never"],
-		'type-case': [2, 'always', 'lower-case'],
+		"type-case": [2, "always", "lower-case"],
-		'type-empty': [2, 'never'],
+		"type-empty": [2, "never"],
-		'type-enum': [
+		"type-enum": [
 			2,
-			'always',
+			"always",
-			[
+			["build", "chore", "ci", "docs", "feat", "fix", "perf", "refactor", "revert", "style", "test"],
-				'build',
-				'chore',
-				'ci',
-				'docs',
-				'feat',
-				'fix',
-				'perf',
-				'refactor',
-				'revert',
-				'style',
-				'test',
-			],
 		],
 	},
 };

erpnext/__init__.py

@@ -3,7 +3,7 @@ import inspect
 
 import frappe
 
-__version__ = "15.16.1"
+__version__ = "15.16.2"
 
 
 def get_default_company(user=None):
@@ -13,7 +13,7 @@ def get_default_company(user=None):
 	if not user:
 		user = frappe.session.user
 
-	companies = get_user_default_as_list(user, "company")
+	companies = get_user_default_as_list("company", user)
 	if companies:
 		default_company = companies[0]
 	else:

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js

@@ -1,4 +1,4 @@
-frappe.provide('frappe.dashboards.chart_sources');
+frappe.provide("frappe.dashboards.chart_sources");
 
 frappe.dashboards.chart_sources["Account Balance Timeline"] = {
 	method: "erpnext.accounts.dashboard_chart_source.account_balance_timeline.account_balance_timeline.get",
@@ -9,14 +9,14 @@ frappe.dashboards.chart_sources["Account Balance Timeline"] = {
 			fieldtype: "Link",
 			options: "Company",
 			default: frappe.defaults.get_user_default("Company"),
-			reqd: 1
+			reqd: 1,
 		},
 		{
 			fieldname: "account",
 			label: __("Account"),
 			fieldtype: "Link",
 			options: "Account",
-			reqd: 1
+			reqd: 1,
 		},
-	]
+	],
 };

erpnext/accounts/doctype/account/account.js

@@ -26,19 +26,14 @@ frappe.ui.form.on("Account", {
 		frm.toggle_enable(["is_group", "company"], false);
 
 		if (cint(frm.doc.is_group) == 0) {
-			frm.toggle_display(
+			frm.toggle_display("freeze_account", frm.doc.__onload && frm.doc.__onload.can_freeze_account);
-				"freeze_account",
-				frm.doc.__onload && frm.doc.__onload.can_freeze_account
-			);
 		}
 
 		// read-only for root accounts
 		if (!frm.is_new()) {
 			if (!frm.doc.parent_account) {
 				frm.set_read_only();
-				frm.set_intro(
+				frm.set_intro(__("This is a root account and cannot be edited."));
-					__("This is a root account and cannot be edited.")
-				);
 			} else {
 				// credit days and type if customer or supplier
 				frm.set_intro(null);
@@ -80,27 +75,33 @@ frappe.ui.form.on("Account", {
 		);
 
 		if (frm.doc.is_group == 1) {
-			frm.add_custom_button(__('Convert to Non-Group'), function () {
+			frm.add_custom_button(
+				__("Convert to Non-Group"),
+				function () {
 					return frappe.call({
 						doc: frm.doc,
-					method: 'convert_group_to_ledger',
+						method: "convert_group_to_ledger",
 						callback: function () {
 							frm.refresh();
-					}
+						},
 					});
-			}, __('Actions'));
+				},
-
+				__("Actions")
-		} else if (cint(frm.doc.is_group) == 0
+			);
-			&& frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
+		} else if (cint(frm.doc.is_group) == 0 && frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
-			frm.add_custom_button(__('General Ledger'), function () {
+			frm.add_custom_button(
+				__("General Ledger"),
+				function () {
 					frappe.route_options = {
-					"account": frm.doc.name,
+						account: frm.doc.name,
-					"from_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+						from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
-					"to_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+						to_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
-					"company": frm.doc.company
+						company: frm.doc.company,
 					};
 					frappe.set_route("query-report", "General Ledger");
-			}, __('View'));
+				},
+				__("View")
+			);
 
 			frm.add_custom_button(
 				__("Convert to Group"),
@@ -193,14 +194,8 @@ frappe.ui.form.on("Account", {
 							if (r.message) {
 								frappe.set_route("Form", "Account", r.message);
 							} else {
-								frm.set_value(
+								frm.set_value("account_number", data.account_number);
-									"account_number",
+								frm.set_value("account_name", data.account_name);
-									data.account_number
-								);
-								frm.set_value(
-									"account_name",
-									data.account_name
-								);
 							}
 							d.hide();
 						}

erpnext/accounts/doctype/account/account_tree.js

@@ -1,4 +1,4 @@
-frappe.provide("frappe.treeview_settings")
+frappe.provide("frappe.treeview_settings");
 
 frappe.treeview_settings["Account"] = {
 	breadcrumb: "Accounts",
@@ -12,7 +12,7 @@ frappe.treeview_settings["Account"] = {
 			label: __("Company"),
 			default: erpnext.utils.get_tree_default("company"),
 			on_change: function () {
-				var me = frappe.treeview_settings['Account'].treeview;
+				var me = frappe.treeview_settings["Account"].treeview;
 				var company = me.page.fields_dict.company.get_value();
 				if (!company) {
 					frappe.throw(__("Please set a Company"));
@@ -27,24 +27,30 @@ frappe.treeview_settings["Account"] = {
 							let root_company = r.message.length ? r.message[0] : "";
 							me.page.fields_dict.root_company.set_value(root_company);
 
-							frappe.db.get_value("Company", {"name": company}, "allow_account_creation_against_child_company", (r) => {
+							frappe.db.get_value(
-								frappe.flags.ignore_root_company_validation = r.allow_account_creation_against_child_company;
+								"Company",
+								{ name: company },
+								"allow_account_creation_against_child_company",
+								(r) => {
+									frappe.flags.ignore_root_company_validation =
+										r.allow_account_creation_against_child_company;
+								}
+							);
+						}
+					},
 				});
-						}
+			},
-					}
-				});
-			}
 		},
 		{
 			fieldname: "root_company",
 			fieldtype: "Data",
 			label: __("Root Company"),
 			hidden: true,
-			disable_onchange: true
+			disable_onchange: true,
-		}
+		},
 	],
 	root_label: "Accounts",
-	get_tree_nodes: 'erpnext.accounts.utils.get_children',
+	get_tree_nodes: "erpnext.accounts.utils.get_children",
 	on_get_node: function (nodes, deep = false) {
 		if (frappe.boot.user.can_read.indexOf("GL Entry") == -1) return;
 
@@ -58,20 +64,18 @@ frappe.treeview_settings["Account"] = {
 
 		frappe.db.get_single_value("Accounts Settings", "show_balance_in_coa").then((value) => {
 			if (value) {
-
 				const get_balances = frappe.call({
-					method: 'erpnext.accounts.utils.get_account_balances',
+					method: "erpnext.accounts.utils.get_account_balances",
 					args: {
 						accounts: accounts,
-						company: cur_tree.args.company
+						company: cur_tree.args.company,
 					},
 				});
 
-				get_balances.then(r => {
+				get_balances.then((r) => {
 					if (!r.message || r.message.length == 0) return;
 
 					for (let account of r.message) {
-
 						const node = cur_tree.nodes && cur_tree.nodes[account.value];
 						if (!node || node.is_root) continue;
 
@@ -81,87 +85,161 @@ frappe.treeview_settings["Account"] = {
 						const format = (value, currency) => format_currency(Math.abs(value), currency);
 
 						if (account.balance !== undefined) {
-							node.parent && node.parent.find('.balance-area').remove();
+							node.parent && node.parent.find(".balance-area").remove();
-							$('<span class="balance-area pull-right">'
+							$(
-							  + (account.balance_in_account_currency ?
+								'<span class="balance-area pull-right">' +
-							     (format(account.balance_in_account_currency, account.account_currency) + " / ") : "")
+									(account.balance_in_account_currency
-							  + format(account.balance, account.company_currency)
+										? format(
-							  + " " + dr_or_cr
+												account.balance_in_account_currency,
-							  + '</span>').insertBefore(node.$ul);
+												account.account_currency
+										  ) + " / "
+										: "") +
+									format(account.balance, account.company_currency) +
+									" " +
+									dr_or_cr +
+									"</span>"
+							).insertBefore(node.$ul);
 						}
 					}
 				});
 			}
 		});
 	},
-	add_tree_node: 'erpnext.accounts.utils.add_ac',
+	add_tree_node: "erpnext.accounts.utils.add_ac",
 	menu_items: [
 		{
-			label: __('New Company'),
+			label: __("New Company"),
-			action: function() { frappe.new_doc("Company", true) },
+			action: function () {
-			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1'
+				frappe.new_doc("Company", true);
-		}
+			},
+			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1',
+		},
 	],
 	fields: [
-		{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
+		{
-			description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers")},
+			fieldtype: "Data",
-		{fieldtype:'Data', fieldname:'account_number', label:__('Account Number'),
+			fieldname: "account_name",
-			description: __("Number of new Account, it will be included in the account name as a prefix")},
+			label: __("New Account Name"),
-		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
+			reqd: true,
-			description: __('Further accounts can be made under Groups, but entries can be made against non-Groups')},
+			description: __(
-		{fieldtype:'Select', fieldname:'root_type', label:__('Root Type'),
+				"Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
-			options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
+			),
-			depends_on: 'eval:doc.is_group && !doc.parent_account'},
+		},
-		{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
+		{
-			options: frappe.get_meta("Account").fields.filter(d => d.fieldname=='account_type')[0].options,
+			fieldtype: "Data",
-			description: __("Optional. This setting will be used to filter in various transactions.")
+			fieldname: "account_number",
+			label: __("Account Number"),
+			description: __("Number of new Account, it will be included in the account name as a prefix"),
+		},
+		{
+			fieldtype: "Check",
+			fieldname: "is_group",
+			label: __("Is Group"),
+			description: __(
+				"Further accounts can be made under Groups, but entries can be made against non-Groups"
+			),
+		},
+		{
+			fieldtype: "Select",
+			fieldname: "root_type",
+			label: __("Root Type"),
+			options: ["Asset", "Liability", "Equity", "Income", "Expense"].join("\n"),
+			depends_on: "eval:doc.is_group && !doc.parent_account",
+		},
+		{
+			fieldtype: "Select",
+			fieldname: "account_type",
+			label: __("Account Type"),
+			options: frappe.get_meta("Account").fields.filter((d) => d.fieldname == "account_type")[0]
+				.options,
+			description: __("Optional. This setting will be used to filter in various transactions."),
+		},
+		{
+			fieldtype: "Float",
+			fieldname: "tax_rate",
+			label: __("Tax Rate"),
+			depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"',
+		},
+		{
+			fieldtype: "Link",
+			fieldname: "account_currency",
+			label: __("Currency"),
+			options: "Currency",
+			description: __("Optional. Sets company's default currency, if not specified."),
 		},
-		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
-			depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"'},
-		{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
-			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
 	ignore_fields: ["parent_account"],
 	onload: function (treeview) {
-		frappe.treeview_settings['Account'].treeview = {};
+		frappe.treeview_settings["Account"].treeview = {};
-		$.extend(frappe.treeview_settings['Account'].treeview, treeview);
+		$.extend(frappe.treeview_settings["Account"].treeview, treeview);
 		function get_company() {
 			return treeview.page.fields_dict.company.get_value();
 		}
 
 		// tools
-		treeview.page.add_inner_button(__("Chart of Cost Centers"), function() {
+		treeview.page.add_inner_button(
-			frappe.set_route('Tree', 'Cost Center', {company: get_company()});
+			__("Chart of Cost Centers"),
-		}, __('View'));
+			function () {
+				frappe.set_route("Tree", "Cost Center", { company: get_company() });
+			},
+			__("View")
+		);
 
-		treeview.page.add_inner_button(__("Opening Invoice Creation Tool"), function() {
+		treeview.page.add_inner_button(
-			frappe.set_route('Form', 'Opening Invoice Creation Tool', {company: get_company()});
+			__("Opening Invoice Creation Tool"),
-		}, __('View'));
+			function () {
+				frappe.set_route("Form", "Opening Invoice Creation Tool", { company: get_company() });
+			},
+			__("View")
+		);
 
-		treeview.page.add_inner_button(__("Period Closing Voucher"), function() {
+		treeview.page.add_inner_button(
-			frappe.set_route('List', 'Period Closing Voucher', {company: get_company()});
+			__("Period Closing Voucher"),
-		}, __('View'));
+			function () {
+				frappe.set_route("List", "Period Closing Voucher", { company: get_company() });
+			},
+			__("View")
+		);
 
-
+		treeview.page.add_inner_button(
-		treeview.page.add_inner_button(__("Journal Entry"), function() {
+			__("Journal Entry"),
-			frappe.new_doc('Journal Entry', {company: get_company()});
+			function () {
-		}, __('Create'));
+				frappe.new_doc("Journal Entry", { company: get_company() });
-		treeview.page.add_inner_button(__("Company"), function() {
+			},
-			frappe.new_doc('Company');
+			__("Create")
-		}, __('Create'));
+		);
+		treeview.page.add_inner_button(
+			__("Company"),
+			function () {
+				frappe.new_doc("Company");
+			},
+			__("Create")
+		);
 
 		// financial statements
-		for (let report of ['Trial Balance', 'General Ledger', 'Balance Sheet',
+		for (let report of [
-			'Profit and Loss Statement', 'Cash Flow Statement', 'Accounts Payable', 'Accounts Receivable']) {
+			"Trial Balance",
-			treeview.page.add_inner_button(__(report), function() {
+			"General Ledger",
-				frappe.set_route('query-report', report, {company: get_company()});
+			"Balance Sheet",
-			}, __('Financial Statements'));
+			"Profit and Loss Statement",
+			"Cash Flow Statement",
+			"Accounts Payable",
+			"Accounts Receivable",
+		]) {
+			treeview.page.add_inner_button(
+				__(report),
+				function () {
+					frappe.set_route("query-report", report, { company: get_company() });
+				},
+				__("Financial Statements")
+			);
 		}
-
 	},
 	post_render: function (treeview) {
-		frappe.treeview_settings['Account'].treeview["tree"] = treeview.tree;
+		frappe.treeview_settings["Account"].treeview["tree"] = treeview.tree;
-		treeview.page.set_primary_action(__("New"), function() {
+		treeview.page.set_primary_action(
+			__("New"),
+			function () {
 				let root_company = treeview.page.fields_dict.root_company.get_value();
 
 				if (root_company) {
@@ -169,39 +247,47 @@ frappe.treeview_settings["Account"] = {
 				} else {
 					treeview.new_node();
 				}
-		}, "add");
+			},
+			"add"
+		);
 	},
 	toolbar: [
 		{
 			label: __("Add Child"),
 			condition: function (node) {
-				return frappe.boot.user.can_create.indexOf("Account") !== -1
+				return (
-					&& (!frappe.treeview_settings['Account'].treeview.page.fields_dict.root_company.get_value()
+					frappe.boot.user.can_create.indexOf("Account") !== -1 &&
-					|| frappe.flags.ignore_root_company_validation)
+					(!frappe.treeview_settings[
-					&& node.expandable && !node.hide_add;
+						"Account"
+					].treeview.page.fields_dict.root_company.get_value() ||
+						frappe.flags.ignore_root_company_validation) &&
+					node.expandable &&
+					!node.hide_add
+				);
 			},
 			click: function () {
-				var me = frappe.views.trees['Account'];
+				var me = frappe.views.trees["Account"];
 				me.new_node();
 			},
-			btnClass: "hidden-xs"
+			btnClass: "hidden-xs",
 		},
 		{
 			condition: function (node) {
-				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1
+				return !node.root && frappe.boot.user.can_read.indexOf("GL Entry") !== -1;
 			},
 			label: __("View Ledger"),
 			click: function (node, btn) {
 				frappe.route_options = {
-					"account": node.label,
+					account: node.label,
-					"from_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
+					from_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1],
-					"to_date": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
+					to_date: erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2],
-					"company": frappe.treeview_settings['Account'].treeview.page.fields_dict.company.get_value()
+					company:
+						frappe.treeview_settings["Account"].treeview.page.fields_dict.company.get_value(),
 				};
 				frappe.set_route("query-report", "General Ledger");
 			},
-			btnClass: "hidden-xs"
+			btnClass: "hidden-xs",
-		}
+		},
 	],
-	extend_toolbar: true
+	extend_toolbar: true,
-}
+};

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js

@@ -1,17 +1,22 @@
 // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Accounting Dimension', {
+frappe.ui.form.on("Accounting Dimension", {
 	refresh: function (frm) {
-		frm.set_query('document_type', () => {
+		frm.set_query("document_type", () => {
 			let invalid_doctypes = frappe.model.core_doctypes_list;
-			invalid_doctypes.push('Accounting Dimension', 'Project',
+			invalid_doctypes.push(
-				'Cost Center', 'Accounting Dimension Detail', 'Company');
+				"Accounting Dimension",
+				"Project",
+				"Cost Center",
+				"Accounting Dimension Detail",
+				"Company"
+			);
 
 			return {
 				filters: {
-					name: ['not in', invalid_doctypes]
+					name: ["not in", invalid_doctypes],
-				}
+				},
 			};
 		});
 
@@ -21,54 +26,61 @@ frappe.ui.form.on('Accounting Dimension', {
 				filters: {
 					company: d.company,
 					root_type: ["in", ["Asset", "Liability"]],
-					is_group: 0
+					is_group: 0,
-				}
+				},
-			}
+			};
 		});
 
 		if (!frm.is_new()) {
-			frm.add_custom_button(__('Show {0}', [frm.doc.document_type]), function () {
+			frm.add_custom_button(__("Show {0}", [frm.doc.document_type]), function () {
 				frappe.set_route("List", frm.doc.document_type);
 			});
 
 			let button = frm.doc.disabled ? "Enable" : "Disable";
 
 			frm.add_custom_button(__(button), function () {
-
+				frm.set_value("disabled", 1 - frm.doc.disabled);
-				frm.set_value('disabled', 1 - frm.doc.disabled);
 
 				frappe.call({
 					method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.disable_dimension",
 					args: {
-						doc: frm.doc
+						doc: frm.doc,
 					},
 					freeze: true,
 					callback: function (r) {
 						let message = frm.doc.disabled ? "Dimension Disabled" : "Dimension Enabled";
 						frm.save();
-						frappe.show_alert({message:__(message), indicator:'green'});
+						frappe.show_alert({ message: __(message), indicator: "green" });
-					}
+					},
 				});
 			});
 		}
 	},
 
 	document_type: function (frm) {
+		frm.set_value("label", frm.doc.document_type);
+		frm.set_value("fieldname", frappe.model.scrub(frm.doc.document_type));
 
-		frm.set_value('label', frm.doc.document_type);
+		frappe.db.get_value(
-		frm.set_value('fieldname', frappe.model.scrub(frm.doc.document_type));
+			"Accounting Dimension",
-
+			{ document_type: frm.doc.document_type },
-		frappe.db.get_value('Accounting Dimension', {'document_type': frm.doc.document_type}, 'document_type', (r) => {
+			"document_type",
+			(r) => {
 				if (r && r.document_type) {
-				frm.set_df_property('document_type', 'description', "Document type is already set as dimension");
+					frm.set_df_property(
+						"document_type",
+						"description",
+						"Document type is already set as dimension"
+					);
 				}
-		});
+			}
+		);
 	},
 });
 
-frappe.ui.form.on('Accounting Dimension Detail', {
+frappe.ui.form.on("Accounting Dimension Detail", {
 	dimension_defaults_add: function (frm, cdt, cdn) {
 		let row = locals[cdt][cdn];
 		row.reference_document = frm.doc.document_type;
-	}
+	},
 });

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js

@@ -1,10 +1,9 @@
 // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Accounting Dimension Filter', {
+frappe.ui.form.on("Accounting Dimension Filter", {
 	refresh: function (frm, cdt, cdn) {
-		let help_content =
+		let help_content = `<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
-			`<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
 				<tr><td>
 					<p>
 						<i class="fa fa-hand-right"></i>
@@ -13,29 +12,28 @@ frappe.ui.form.on('Accounting Dimension Filter', {
 				</td></tr>
 			</table>`;
 
-		frm.set_df_property('dimension_filter_help', 'options', help_content);
+		frm.set_df_property("dimension_filter_help", "options", help_content);
 	},
 	onload: function (frm) {
-		frm.set_query('applicable_on_account', 'accounts', function() {
+		frm.set_query("applicable_on_account", "accounts", function () {
 			return {
 				filters: {
-					'company': frm.doc.company
+					company: frm.doc.company,
-				}
+				},
 			};
 		});
 
-		frappe.db.get_list('Accounting Dimension',
+		frappe.db.get_list("Accounting Dimension", { fields: ["document_type"] }).then((res) => {
-			{fields: ['document_type']}).then((res) => {
+			let options = ["Cost Center", "Project"];
-			let options = ['Cost Center', 'Project'];
 
 			res.forEach((dimension) => {
 				options.push(dimension.document_type);
 			});
 
-			frm.set_df_property('accounting_dimension', 'options', options);
+			frm.set_df_property("accounting_dimension", "options", options);
 		});
 
-		frm.trigger('setup_filters');
+		frm.trigger("setup_filters");
 	},
 
 	setup_filters: function (frm) {
@@ -44,16 +42,16 @@ frappe.ui.form.on('Accounting Dimension Filter', {
 		if (frm.doc.accounting_dimension) {
 			frappe.model.with_doctype(frm.doc.accounting_dimension, function () {
 				if (frappe.model.is_tree(frm.doc.accounting_dimension)) {
-					filters['is_group'] = 0;
+					filters["is_group"] = 0;
 				}
 
-				if (frappe.meta.has_field(frm.doc.accounting_dimension, 'company')) {
+				if (frappe.meta.has_field(frm.doc.accounting_dimension, "company")) {
-					filters['company'] = frm.doc.company;
+					filters["company"] = frm.doc.company;
 				}
 
-				frm.set_query('dimension_value', 'dimensions', function() {
+				frm.set_query("dimension_value", "dimensions", function () {
 					return {
-						filters: filters
+						filters: filters,
 					};
 				});
 			});
@@ -64,9 +62,13 @@ frappe.ui.form.on('Accounting Dimension Filter', {
 		frm.clear_table("dimensions");
 		let row = frm.add_child("dimensions");
 		row.accounting_dimension = frm.doc.accounting_dimension;
-		frm.fields_dict["dimensions"].grid.update_docfield_property("dimension_value", "label", frm.doc.accounting_dimension);
+		frm.fields_dict["dimensions"].grid.update_docfield_property(
+			"dimension_value",
+			"label",
+			frm.doc.accounting_dimension
+		);
 		frm.refresh_field("dimensions");
-		frm.trigger('setup_filters');
+		frm.trigger("setup_filters");
 	},
 	apply_restriction_on_values: function (frm) {
 		/** If restriction on values is not applied, we should set "allow_or_restrict" to "Restrict" with an empty allowed dimension table.
@@ -77,13 +79,13 @@ frappe.ui.form.on('Accounting Dimension Filter', {
 			frm.clear_table("dimensions");
 			frm.refresh_field("dimensions");
 		}
-	}
+	},
 });
 
-frappe.ui.form.on('Allowed Dimension', {
+frappe.ui.form.on("Allowed Dimension", {
 	dimensions_add: function (frm, cdt, cdn) {
 		let row = locals[cdt][cdn];
 		row.accounting_dimension = frm.doc.accounting_dimension;
 		frm.refresh_field("dimensions");
-	}
+	},
 });

erpnext/accounts/doctype/accounting_period/accounting_period.js

@@ -1,9 +1,12 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Accounting Period', {
+frappe.ui.form.on("Accounting Period", {
 	onload: function (frm) {
-		if(frm.doc.closed_documents.length === 0 || (frm.doc.closed_documents.length === 1 && frm.doc.closed_documents[0].document_type == undefined)) {
+		if (
+			frm.doc.closed_documents.length === 0 ||
+			(frm.doc.closed_documents.length === 1 && frm.doc.closed_documents[0].document_type == undefined)
+		) {
 			frappe.call({
 				method: "get_doctypes_for_closing",
 				doc: frm.doc,
@@ -17,14 +20,14 @@ frappe.ui.form.on('Accounting Period', {
 						});
 						refresh_field("closed_documents");
 					}
-				}
+				},
 			});
 		}
 
 		frm.set_query("document_type", "closed_documents", () => {
 			return {
 				query: "erpnext.controllers.queries.get_doctypes_for_closing",
-			}
+			};
 		});
-	}
+	},
 });

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -1,8 +1,6 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Accounts Settings', {
+frappe.ui.form.on("Accounts Settings", {
-	refresh: function(frm) {
+	refresh: function (frm) {},
-
-	}
 });

erpnext/accounts/doctype/accounts_settings/regional/united_states.js

@@ -1,8 +1,11 @@
-
+frappe.ui.form.on("Accounts Settings", {
-frappe.ui.form.on('Accounts Settings', {
 	refresh: function (frm) {
 		frm.set_df_property("acc_frozen_upto", "label", "Books Closed Through");
-		frm.set_df_property("frozen_accounts_modifier", "label", "Role Allowed to Close Books & Make Changes to Closed Periods");
+		frm.set_df_property(
+			"frozen_accounts_modifier",
+			"label",
+			"Role Allowed to Close Books & Make Changes to Closed Periods"
+		);
 		frm.set_df_property("credit_controller", "label", "Credit Manager");
-	}
+	},
 });

erpnext/accounts/doctype/bank/bank.js

@@ -1,38 +1,36 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
-frappe.provide('erpnext.integrations');
+frappe.provide("erpnext.integrations");
 
-frappe.ui.form.on('Bank', {
+frappe.ui.form.on("Bank", {
 	onload: function (frm) {
 		add_fields_to_mapping_table(frm);
 	},
 	refresh: function (frm) {
 		add_fields_to_mapping_table(frm);
-		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+		frm.toggle_display(["address_html", "contact_html"], !frm.doc.__islocal);
 
 		if (frm.doc.__islocal) {
-			frm.set_df_property('address_and_contact', 'hidden', 1);
+			frm.set_df_property("address_and_contact", "hidden", 1);
 			frappe.contacts.clear_address_and_contact(frm);
-		}
+		} else {
-		else {
+			frm.set_df_property("address_and_contact", "hidden", 0);
-			frm.set_df_property('address_and_contact', 'hidden', 0);
 			frappe.contacts.render_address_and_contact(frm);
 		}
 		if (frm.doc.plaid_access_token) {
-			frm.add_custom_button(__('Refresh Plaid Link'), () => {
+			frm.add_custom_button(__("Refresh Plaid Link"), () => {
 				new erpnext.integrations.refreshPlaidLink(frm.doc.plaid_access_token);
 			});
 		}
-	}
+	},
 });
 
-
 let add_fields_to_mapping_table = function (frm) {
 	let options = [];
 
 	frappe.model.with_doctype("Bank Transaction", function () {
 		let meta = frappe.get_meta("Bank Transaction");
-		meta.fields.forEach(value => {
+		meta.fields.forEach((value) => {
 			if (!["Section Break", "Column Break"].includes(value.fieldtype)) {
 				options.push(value.fieldname);
 			}
@@ -40,30 +38,32 @@ let add_fields_to_mapping_table = function (frm) {
 	});
 
 	frm.fields_dict.bank_transaction_mapping.grid.update_docfield_property(
-		'bank_transaction_field', 'options', options
+		"bank_transaction_field",
+		"options",
+		options
 	);
 };
 
 erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 	constructor(access_token) {
 		this.access_token = access_token;
-		this.plaidUrl = 'https://cdn.plaid.com/link/v2/stable/link-initialize.js';
+		this.plaidUrl = "https://cdn.plaid.com/link/v2/stable/link-initialize.js";
 		this.init_config();
 	}
 
 	async init_config() {
-		this.plaid_env = await frappe.db.get_single_value('Plaid Settings', 'plaid_env');
+		this.plaid_env = await frappe.db.get_single_value("Plaid Settings", "plaid_env");
 		this.token = await this.get_link_token_for_update();
 		this.init_plaid();
 	}
 
 	async get_link_token_for_update() {
 		const token = frappe.xcall(
-			'erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.get_link_token_for_update',
+			"erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.get_link_token_for_update",
 			{ access_token: this.access_token }
-		)
+		);
 		if (!token) {
-			frappe.throw(__('Cannot retrieve link token for update. Check Error Log for more information'));
+			frappe.throw(__("Cannot retrieve link token for update. Check Error Log for more information"));
 		}
 		return token;
 	}
@@ -90,35 +90,45 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
 				resolve();
 				return;
 			}
-			const el = document.createElement('script');
+			const el = document.createElement("script");
-			el.type = 'text/javascript';
+			el.type = "text/javascript";
 			el.async = true;
 			el.src = src;
-			el.addEventListener('load', resolve);
+			el.addEventListener("load", resolve);
-			el.addEventListener('error', reject);
+			el.addEventListener("error", reject);
-			el.addEventListener('abort', reject);
+			el.addEventListener("abort", reject);
 			document.head.appendChild(el);
 		});
 	}
 
 	onScriptLoaded(me) {
-		me.linkHandler = Plaid.create({ // eslint-disable-line no-undef
+		me.linkHandler = Plaid.create({
+			// eslint-disable-line no-undef
 			env: me.plaid_env,
 			token: me.token,
-			onSuccess: me.plaid_success
+			onSuccess: me.plaid_success,
 		});
 	}
 
 	onScriptError(error) {
-		frappe.msgprint(__("There was an issue connecting to Plaid's authentication server. Check browser console for more information"));
+		frappe.msgprint(
+			__(
+				"There was an issue connecting to Plaid's authentication server. Check browser console for more information"
+			)
+		);
 		console.log(error);
 	}
 
 	plaid_success(token, response) {
-		frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.update_bank_account_ids', {
+		frappe
+			.xcall(
+				"erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.update_bank_account_ids",
+				{
 					response: response,
-		}).then(() => {
+				}
-			frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' });
+			)
+			.then(() => {
+				frappe.show_alert({ message: __("Plaid Link Updated"), indicator: "green" });
 			});
 	}
 };

erpnext/accounts/doctype/bank_account/bank_account.js

@@ -1,15 +1,15 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Bank Account', {
+frappe.ui.form.on("Bank Account", {
 	setup: function (frm) {
 		frm.set_query("account", function () {
 			return {
 				filters: {
-					'account_type': 'Bank',
+					account_type: "Bank",
-					'company': frm.doc.company,
+					company: frm.doc.company,
-					'is_group': 0
+					is_group: 0,
-				}
+				},
 			};
 		});
 		frm.set_query("party_type", function () {
@@ -19,27 +19,31 @@ frappe.ui.form.on('Bank Account', {
 		});
 	},
 	refresh: function (frm) {
-		frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank Account' }
+		frappe.dynamic_link = { doc: frm.doc, fieldname: "name", doctype: "Bank Account" };
 
-		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
+		frm.toggle_display(["address_html", "contact_html"], !frm.doc.__islocal);
 
 		if (frm.doc.__islocal) {
 			frappe.contacts.clear_address_and_contact(frm);
-		}
+		} else {
-		else {
 			frappe.contacts.render_address_and_contact(frm);
 		}
 
 		if (frm.doc.integration_id) {
 			frm.add_custom_button(__("Unlink external integrations"), function () {
-				frappe.confirm(__("This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"), function() {
+				frappe.confirm(
+					__(
+						"This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"
+					),
+					function () {
 						frm.set_value("integration_id", "");
-				});
+					}
+				);
 			});
 		}
 	},
 
 	is_company_account: function (frm) {
-		frm.set_df_property('account', 'reqd', frm.doc.is_company_account);
+		frm.set_df_property("account", "reqd", frm.doc.is_company_account);
-	}
+	},
 });

erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.js

@@ -1,8 +1,6 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Bank Account Subtype', {
+frappe.ui.form.on("Bank Account Subtype", {
-	refresh: function() {
+	refresh: function () {},
-
-	}
 });

erpnext/accounts/doctype/bank_account_type/bank_account_type.js

@@ -1,8 +1,7 @@
 // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Bank Account Type', {
+frappe.ui.form.on("Bank Account Type", {
 	// refresh: function(frm) {
-
 	// }
 });

erpnext/accounts/doctype/bank_clearance/bank_clearance.js

@@ -7,41 +7,37 @@ frappe.ui.form.on("Bank Clearance", {
 
 		frm.set_query("account", function () {
 			return {
-				"filters": {
+				filters: {
-					"account_type": ["in",["Bank","Cash"]],
+					account_type: ["in", ["Bank", "Cash"]],
-					"is_group": 0,
+					is_group: 0,
-				}
+				},
 			};
 		});
 
 		frm.set_query("bank_account", function () {
 			return {
 				filters: {
-					'is_company_account': 1
+					is_company_account: 1,
 				},
 			};
 		});
 	},
 
 	onload: function (frm) {
-
+		let default_bank_account = frappe.defaults.get_user_default("Company")
-		let default_bank_account =  frappe.defaults.get_user_default("Company")?
+			? locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]
-			locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "";
+			: "";
 		frm.set_value("account", default_bank_account);
 
-
-
 		frm.set_value("from_date", frappe.datetime.month_start());
 		frm.set_value("to_date", frappe.datetime.month_end());
 	},
 
 	refresh: function (frm) {
 		frm.disable_save();
-		frm.add_custom_button(__('Get Payment Entries'), () =>
+		frm.add_custom_button(__("Get Payment Entries"), () => frm.trigger("get_payment_entries"));
-			frm.trigger("get_payment_entries")
-		);
 
-		frm.change_custom_button_type(__('Get Payment Entries'), null, 'primary');
+		frm.change_custom_button_type(__("Get Payment Entries"), null, "primary");
 	},
 
 	update_clearance_date: function (frm) {
@@ -53,10 +49,10 @@ frappe.ui.form.on("Bank Clearance", {
 				frm.refresh_fields();
 
 				if (!frm.doc.payment_entries.length) {
-					frm.change_custom_button_type(__('Get Payment Entries'), null, 'primary');
+					frm.change_custom_button_type(__("Get Payment Entries"), null, "primary");
-					frm.change_custom_button_type(__('Update Clearance Date'), null, 'default');
+					frm.change_custom_button_type(__("Update Clearance Date"), null, "default");
-				}
 				}
+			},
 		});
 	},
 
@@ -68,14 +64,14 @@ frappe.ui.form.on("Bank Clearance", {
 				frm.refresh_field("payment_entries");
 
 				if (frm.doc.payment_entries.length) {
-					frm.add_custom_button(__('Update Clearance Date'), () =>
+					frm.add_custom_button(__("Update Clearance Date"), () =>
 						frm.trigger("update_clearance_date")
 					);
 
-					frm.change_custom_button_type(__('Get Payment Entries'), null, 'default');
+					frm.change_custom_button_type(__("Get Payment Entries"), null, "default");
-					frm.change_custom_button_type(__('Update Clearance Date'), null, 'primary');
+					frm.change_custom_button_type(__("Update Clearance Date"), null, "primary");
-				}
 				}
+			},
 		});
-	}
+	},
 });

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js

@@ -1,34 +1,34 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-cur_frm.add_fetch('bank_account','account','account');
+cur_frm.add_fetch("bank_account", "account", "account");
-cur_frm.add_fetch('bank_account','bank_account_no','bank_account_no');
+cur_frm.add_fetch("bank_account", "bank_account_no", "bank_account_no");
-cur_frm.add_fetch('bank_account','iban','iban');
+cur_frm.add_fetch("bank_account", "iban", "iban");
-cur_frm.add_fetch('bank_account','branch_code','branch_code');
+cur_frm.add_fetch("bank_account", "branch_code", "branch_code");
-cur_frm.add_fetch('bank','swift_number','swift_number');
+cur_frm.add_fetch("bank", "swift_number", "swift_number");
 
-frappe.ui.form.on('Bank Guarantee', {
+frappe.ui.form.on("Bank Guarantee", {
 	setup: function (frm) {
 		frm.set_query("bank", function () {
 			return {
 				filters: {
-					company: frm.doc.company
+					company: frm.doc.company,
-				}
+				},
 			};
 		});
 		frm.set_query("bank_account", function () {
 			return {
 				filters: {
 					company: frm.doc.company,
-					bank: frm.doc.bank
+					bank: frm.doc.bank,
-				}
+				},
-			}
+			};
 		});
 		frm.set_query("project", function () {
 			return {
 				filters: {
-					customer: frm.doc.customer
+					customer: frm.doc.customer,
-				}
+				},
 			};
 		});
 	},
@@ -48,8 +48,8 @@ frappe.ui.form.on('Bank Guarantee', {
 			frappe.call({
 				method: "erpnext.accounts.doctype.bank_guarantee.bank_guarantee.get_voucher_details",
 				args: {
-					"bank_guarantee_type": frm.doc.bg_type,
+					bank_guarantee_type: frm.doc.bg_type,
-					"reference_name": frm.doc.reference_docname
+					reference_name: frm.doc.reference_docname,
 				},
 				callback: function (r) {
 					if (r.message) {
@@ -57,9 +57,8 @@ frappe.ui.form.on('Bank Guarantee', {
 						if (r.message.project) frm.set_value("project", r.message.project);
 						if (r.message.grand_total) frm.set_value("amount", r.message.grand_total);
 					}
-				}
+				},
 			});
-
 		}
 	},
 
@@ -70,5 +69,5 @@ frappe.ui.form.on('Bank Guarantee', {
 	validity: function (frm) {
 		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
-	}
+	},
 });

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js

@@ -8,21 +8,22 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 			return {
 				filters: {
 					company: frm.doc.company,
-					'is_company_account': 1
+					is_company_account: 1,
 				},
 			};
 		});
-		let no_bank_transactions_text =
+		let no_bank_transactions_text = `<div class="text-muted text-center">${__(
-			`<div class="text-muted text-center">${__("No Matching Bank Transactions Found")}</div>`
+			"No Matching Bank Transactions Found"
+		)}</div>`;
 		set_field_options("no_bank_transactions", no_bank_transactions_text);
 	},
 
 	onload: function (frm) {
 		// Set default filter dates
-		let today = frappe.datetime.get_today()
+		let today = frappe.datetime.get_today();
 		frm.doc.bank_statement_from_date = frappe.datetime.add_months(today, -1);
 		frm.doc.bank_statement_to_date = today;
-		frm.trigger('bank_account');
+		frm.trigger("bank_account");
 	},
 
 	filter_by_reference_date: function (frm) {
@@ -37,14 +38,11 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 
 	refresh: function (frm) {
 		frm.disable_save();
-		frappe.require("bank-reconciliation-tool.bundle.js", () =>
+		frappe.require("bank-reconciliation-tool.bundle.js", () => frm.trigger("make_reconciliation_tool"));
-			frm.trigger("make_reconciliation_tool")
-		);
 
 		frm.add_custom_button(__("Upload Bank Statement"), () =>
 			frappe.call({
-					method:
+				method: "erpnext.accounts.doctype.bank_statement_import.bank_statement_import.upload_bank_statement",
-						"erpnext.accounts.doctype.bank_statement_import.bank_statement_import.upload_bank_statement",
 				args: {
 					dt: frm.doc.doctype,
 					dn: frm.doc.name,
@@ -54,17 +52,13 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 				callback: function (r) {
 					if (!r.exc) {
 						var doc = frappe.model.sync(r.message);
-							frappe.set_route(
+						frappe.set_route("Form", doc[0].doctype, doc[0].name);
-								"Form",
-								doc[0].doctype,
-								doc[0].name
-							);
 					}
 				},
 			})
 		);
 
-		frm.add_custom_button(__('Auto Reconcile'), function() {
+		frm.add_custom_button(__("Auto Reconcile"), function () {
 			frappe.call({
 				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers",
 				args: {
@@ -75,33 +69,22 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 					from_reference_date: frm.doc.from_reference_date,
 					to_reference_date: frm.doc.to_reference_date,
 				},
-			})
+			});
 		});
 
-		frm.add_custom_button(__('Get Unreconciled Entries'), function() {
+		frm.add_custom_button(__("Get Unreconciled Entries"), function () {
 			frm.trigger("make_reconciliation_tool");
 		});
-		frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'primary');
+		frm.change_custom_button_type(__("Get Unreconciled Entries"), null, "primary");
-
 	},
 
 	bank_account: function (frm) {
-		frappe.db.get_value(
+		frappe.db.get_value("Bank Account", frm.doc.bank_account, "account", (r) => {
-			"Bank Account",
+			frappe.db.get_value("Account", r.account, "account_currency", (r) => {
-			frm.doc.bank_account,
-			"account",
-			(r) => {
-				frappe.db.get_value(
-					"Account",
-					r.account,
-					"account_currency",
-					(r) => {
 				frm.doc.account_currency = r.account_currency;
 				frm.trigger("render_chart");
-					}
+			});
-				);
+		});
-			}
-		);
 		frm.trigger("get_account_opening_balance");
 	},
 
@@ -120,11 +103,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 				) {
 					frm.trigger("render_chart");
 					frm.trigger("render");
-					frappe.utils.scroll_to(
+					frappe.utils.scroll_to(frm.get_field("reconciliation_tool_cards").$wrapper, true, 30);
-						frm.get_field("reconciliation_tool_cards").$wrapper,
-						true,
-						30
-					);
 				}
 			});
 		}
@@ -133,11 +112,10 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	get_account_opening_balance(frm) {
 		if (frm.doc.bank_account && frm.doc.bank_statement_from_date) {
 			frappe.call({
-				method:
+				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
-					"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
 				args: {
 					bank_account: frm.doc.bank_account,
-					till_date: frappe.datetime.add_days(frm.doc.bank_statement_from_date, -1)
+					till_date: frappe.datetime.add_days(frm.doc.bank_statement_from_date, -1),
 				},
 				callback: (response) => {
 					frm.set_value("account_opening_balance", response.message);
@@ -149,8 +127,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	get_cleared_balance(frm) {
 		if (frm.doc.bank_account && frm.doc.bank_statement_to_date) {
 			return frappe.call({
-				method:
+				method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
-					"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_account_balance",
 				args: {
 					bank_account: frm.doc.bank_account,
 					till_date: frm.doc.bank_statement_to_date,
@@ -163,41 +140,30 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	render_chart(frm) {
-		frm.cards_manager = new erpnext.accounts.bank_reconciliation.NumberCardManager(
+		frm.cards_manager = new erpnext.accounts.bank_reconciliation.NumberCardManager({
-			{
+			$reconciliation_tool_cards: frm.get_field("reconciliation_tool_cards").$wrapper,
-				$reconciliation_tool_cards: frm.get_field(
+			bank_statement_closing_balance: frm.doc.bank_statement_closing_balance,
-					"reconciliation_tool_cards"
-				).$wrapper,
-				bank_statement_closing_balance:
-				frm.doc.bank_statement_closing_balance,
 			cleared_balance: frm.cleared_balance,
 			currency: frm.doc.account_currency,
-			}
+		});
-		);
 	},
 
 	render(frm) {
 		if (frm.doc.bank_account) {
-			frm.bank_reconciliation_data_table_manager = new erpnext.accounts.bank_reconciliation.DataTableManager(
+			frm.bank_reconciliation_data_table_manager =
-				{
+				new erpnext.accounts.bank_reconciliation.DataTableManager({
 					company: frm.doc.company,
 					bank_account: frm.doc.bank_account,
-					$reconciliation_tool_dt: frm.get_field(
+					$reconciliation_tool_dt: frm.get_field("reconciliation_tool_dt").$wrapper,
-						"reconciliation_tool_dt"
+					$no_bank_transactions: frm.get_field("no_bank_transactions").$wrapper,
-					).$wrapper,
-					$no_bank_transactions: frm.get_field(
-						"no_bank_transactions"
-					).$wrapper,
 					bank_statement_from_date: frm.doc.bank_statement_from_date,
 					bank_statement_to_date: frm.doc.bank_statement_to_date,
 					filter_by_reference_date: frm.doc.filter_by_reference_date,
 					from_reference_date: frm.doc.from_reference_date,
 					to_reference_date: frm.doc.to_reference_date,
-					bank_statement_closing_balance:
+					bank_statement_closing_balance: frm.doc.bank_statement_closing_balance,
-						frm.doc.bank_statement_closing_balance,
 					cards_manager: frm.cards_manager,
-				}
+				});
-			);
 		}
 	},
 });

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py

@@ -9,7 +9,6 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder.custom import ConstantColumn
 from frappe.utils import cint, flt
-from pypika.terms import Parameter
 
 from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.bank_transaction.bank_transaction import get_total_allocated_amount
@@ -509,6 +508,18 @@ def check_matching(
 	to_reference_date,
 ):
 	exact_match = True if "exact_match" in document_types else False
+
+	common_filters = frappe._dict(
+		{
+			"amount": transaction.unallocated_amount,
+			"payment_type": "Receive" if transaction.deposit > 0.0 else "Pay",
+			"reference_no": transaction.reference_number,
+			"party_type": transaction.party_type,
+			"party": transaction.party,
+			"bank_account": bank_account,
+		}
+	)
+
 	queries = get_queries(
 		bank_account,
 		company,
@@ -520,20 +531,12 @@ def check_matching(
 		from_reference_date,
 		to_reference_date,
 		exact_match,
+		common_filters,
 	)
 
-	filters = {
-		"amount": transaction.unallocated_amount,
-		"payment_type": "Receive" if transaction.deposit > 0.0 else "Pay",
-		"reference_no": transaction.reference_number,
-		"party_type": transaction.party_type,
-		"party": transaction.party,
-		"bank_account": bank_account,
-	}
-
 	matching_vouchers = []
 	for query in queries:
-		matching_vouchers.extend(frappe.db.sql(query, filters, as_dict=True))
+		matching_vouchers.extend(query.run(as_dict=True))
 
 	return (
 		sorted(matching_vouchers, key=lambda x: x["rank"], reverse=True) if matching_vouchers else []
@@ -551,6 +554,7 @@ def get_queries(
 	from_reference_date,
 	to_reference_date,
 	exact_match,
+	common_filters,
 ):
 	# get queries to get matching vouchers
 	account_from_to = "paid_to" if transaction.deposit > 0.0 else "paid_from"
@@ -571,6 +575,7 @@ def get_queries(
 				filter_by_reference_date,
 				from_reference_date,
 				to_reference_date,
+				common_filters,
 			)
 			or []
 		)
@@ -590,6 +595,7 @@ def get_matching_queries(
 	filter_by_reference_date,
 	from_reference_date,
 	to_reference_date,
+	common_filters,
 ):
 	queries = []
 	currency = get_account_currency(bank_account)
@@ -604,6 +610,7 @@ def get_matching_queries(
 			filter_by_reference_date,
 			from_reference_date,
 			to_reference_date,
+			common_filters,
 		)
 		queries.append(query)
 
@@ -616,16 +623,17 @@ def get_matching_queries(
 			filter_by_reference_date,
 			from_reference_date,
 			to_reference_date,
+			common_filters,
 		)
 		queries.append(query)
 
 	if transaction.deposit > 0.0 and "sales_invoice" in document_types:
-		query = get_si_matching_query(exact_match, currency)
+		query = get_si_matching_query(exact_match, currency, common_filters)
 		queries.append(query)
 
 	if transaction.withdrawal > 0.0:
 		if "purchase_invoice" in document_types:
-			query = get_pi_matching_query(exact_match, currency)
+			query = get_pi_matching_query(exact_match, currency, common_filters)
 			queries.append(query)
 
 	if "bank_transaction" in document_types:
@@ -680,7 +688,7 @@ def get_bt_matching_query(exact_match, transaction):
 		.where(amount_condition)
 		.where(bt.docstatus == 1)
 	)
-	return str(query)
+	return query
 
 
 def get_pe_matching_query(
@@ -692,6 +700,7 @@ def get_pe_matching_query(
 	filter_by_reference_date,
 	from_reference_date,
 	to_reference_date,
+	common_filters,
 ):
 	# get matching payment entries query
 	to_from = "to" if transaction.deposit > 0.0 else "from"
@@ -734,7 +743,7 @@ def get_pe_matching_query(
 		.where(pe.docstatus == 1)
 		.where(pe.payment_type.isin([payment_type, "Internal Transfer"]))
 		.where(pe.clearance_date.isnull())
-		.where(getattr(pe, account_from_to) == Parameter("%(bank_account)s"))
+		.where(getattr(pe, account_from_to) == common_filters.bank_account)
 		.where(amount_condition)
 		.where(filter_by_date)
 		.orderby(pe.reference_date if cint(filter_by_reference_date) else pe.posting_date)
@@ -743,7 +752,7 @@ def get_pe_matching_query(
 	if frappe.flags.auto_reconcile_vouchers == True:
 		query = query.where(ref_condition)
 
-	return str(query)
+	return query
 
 
 def get_je_matching_query(
@@ -754,6 +763,7 @@ def get_je_matching_query(
 	filter_by_reference_date,
 	from_reference_date,
 	to_reference_date,
+	common_filters,
 ):
 	# get matching journal entry query
 	# We have mapping at the bank level
@@ -793,7 +803,7 @@ def get_je_matching_query(
 		.where(je.docstatus == 1)
 		.where(je.voucher_type != "Opening Entry")
 		.where(je.clearance_date.isnull())
-		.where(jea.account == Parameter("%(bank_account)s"))
+		.where(jea.account == common_filters.bank_account)
 		.where(amount_equality if exact_match else getattr(jea, amount_field) > 0.0)
 		.where(je.docstatus == 1)
 		.where(filter_by_date)
@@ -803,19 +813,19 @@ def get_je_matching_query(
 	if frappe.flags.auto_reconcile_vouchers == True:
 		query = query.where(ref_condition)
 
-	return str(query)
+	return query
 
 
-def get_si_matching_query(exact_match, currency):
+def get_si_matching_query(exact_match, currency, common_filters):
 	# get matching sales invoice query
 	si = frappe.qb.DocType("Sales Invoice")
 	sip = frappe.qb.DocType("Sales Invoice Payment")
 
-	amount_equality = sip.amount == Parameter("%(amount)s")
+	amount_equality = sip.amount == common_filters.amount
 	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
 	amount_condition = amount_equality if exact_match else sip.amount > 0.0
 
-	party_condition = si.customer == Parameter("%(party)s")
+	party_condition = si.customer == common_filters.party
 	party_rank = frappe.qb.terms.Case().when(party_condition, 1).else_(0)
 
 	query = (
@@ -836,23 +846,23 @@ def get_si_matching_query(exact_match, currency):
 		)
 		.where(si.docstatus == 1)
 		.where(sip.clearance_date.isnull())
-		.where(sip.account == Parameter("%(bank_account)s"))
+		.where(sip.account == common_filters.bank_account)
 		.where(amount_condition)
 		.where(si.currency == currency)
 	)
 
-	return str(query)
+	return query
 
 
-def get_pi_matching_query(exact_match, currency):
+def get_pi_matching_query(exact_match, currency, common_filters):
 	# get matching purchase invoice query when they are also used as payment entries (is_paid)
 	purchase_invoice = frappe.qb.DocType("Purchase Invoice")
 
-	amount_equality = purchase_invoice.paid_amount == Parameter("%(amount)s")
+	amount_equality = purchase_invoice.paid_amount == common_filters.amount
 	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
 	amount_condition = amount_equality if exact_match else purchase_invoice.paid_amount > 0.0
 
-	party_condition = purchase_invoice.supplier == Parameter("%(party)s")
+	party_condition = purchase_invoice.supplier == common_filters.party
 	party_rank = frappe.qb.terms.Case().when(party_condition, 1).else_(0)
 
 	query = (
@@ -872,9 +882,9 @@ def get_pi_matching_query(exact_match, currency):
 		.where(purchase_invoice.docstatus == 1)
 		.where(purchase_invoice.is_paid == 1)
 		.where(purchase_invoice.clearance_date.isnull())
-		.where(purchase_invoice.cash_bank_account == Parameter("%(bank_account)s"))
+		.where(purchase_invoice.cash_bank_account == common_filters.bank_account)
 		.where(amount_condition)
 		.where(purchase_invoice.currency == currency)
 	)
 
-	return str(query)
+	return query

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js

@@ -7,9 +7,7 @@ frappe.ui.form.on("Bank Statement Import", {
 			frm.import_in_progress = false;
 			if (data_import !== frm.doc.name) return;
 			frappe.model.clear_doc("Bank Statement Import", frm.doc.name);
-			frappe.model
+			frappe.model.with_doc("Bank Statement Import", frm.doc.name).then(() => {
-				.with_doc("Bank Statement Import", frm.doc.name)
-				.then(() => {
 				frm.refresh();
 			});
 		});
@@ -38,20 +36,9 @@ frappe.ui.form.on("Bank Statement Import", {
 						: __("Updating {0} of {1}, {2}", message_args);
 			}
 			if (data.skipping) {
-				message = __(
+				message = __("Skipping {0} of {1}, {2}", [data.current, data.total, eta_message]);
-					"Skipping {0} of {1}, {2}",
-					[
-						data.current,
-						data.total,
-						eta_message,
-					]
-				);
 			}
-			frm.dashboard.show_progress(
+			frm.dashboard.show_progress(__("Import Progress"), percent, message);
-				__("Import Progress"),
-				percent,
-				message
-			);
 			frm.page.set_indicator(__("In Progress"), "orange");
 
 			// hide progress when complete
@@ -93,15 +80,12 @@ frappe.ui.form.on("Bank Statement Import", {
 		frm.trigger("show_report_error_button");
 
 		if (frm.doc.status === "Partial Success") {
-			frm.add_custom_button(__("Export Errored Rows"), () =>
+			frm.add_custom_button(__("Export Errored Rows"), () => frm.trigger("export_errored_rows"));
-				frm.trigger("export_errored_rows")
-			);
 		}
 
 		if (frm.doc.status.includes("Success")) {
-			frm.add_custom_button(
+			frm.add_custom_button(__("Go to {0} List", [__(frm.doc.reference_doctype)]), () =>
-				__("Go to {0} List", [__(frm.doc.reference_doctype)]),
+				frappe.set_route("List", frm.doc.reference_doctype)
-				() => frappe.set_route("List", frm.doc.reference_doctype)
 			);
 		}
 	},
@@ -118,13 +102,8 @@ frappe.ui.form.on("Bank Statement Import", {
 		frm.disable_save();
 		if (frm.doc.status !== "Success") {
 			if (!frm.is_new() && frm.has_import_file()) {
-				let label =
+				let label = frm.doc.status === "Pending" ? __("Start Import") : __("Retry");
-					frm.doc.status === "Pending"
+				frm.page.set_primary_action(label, () => frm.events.start_import(frm));
-						? __("Start Import")
-						: __("Retry");
-				frm.page.set_primary_action(label, () =>
-					frm.events.start_import(frm)
-				);
 			} else {
 				frm.page.set_primary_action(__("Save"), () => frm.save());
 			}
@@ -226,8 +205,7 @@ frappe.ui.form.on("Bank Statement Import", {
 	},
 
 	download_template() {
-		let method =
+		let method = "/api/method/frappe.core.doctype.data_import.data_import.download_template";
-			"/api/method/frappe.core.doctype.data_import.data_import.download_template";
 
 		open_url_post(method, {
 			doctype: "Bank Transaction",
@@ -240,7 +218,7 @@ frappe.ui.form.on("Bank Statement Import", {
 					"description",
 					"reference_number",
 					"bank_account",
-					"currency"
+					"currency",
 				],
 			},
 		});
@@ -311,10 +289,7 @@ frappe.ui.form.on("Bank Statement Import", {
 	show_import_preview(frm, preview_data) {
 		let import_log = JSON.parse(frm.doc.statement_import_log || "[]");
 
-		if (
+		if (frm.import_preview && frm.import_preview.doctype === frm.doc.reference_doctype) {
-			frm.import_preview &&
-			frm.import_preview.doctype === frm.doc.reference_doctype
-		) {
 			frm.import_preview.preview_data = preview_data;
 			frm.import_preview.import_log = import_log;
 			frm.import_preview.refresh();
@@ -330,19 +305,10 @@ frappe.ui.form.on("Bank Statement Import", {
 				frm,
 				events: {
 					remap_column(changed_map) {
-						let template_options = JSON.parse(
+						let template_options = JSON.parse(frm.doc.template_options || "{}");
-							frm.doc.template_options || "{}"
+						template_options.column_to_field_map = template_options.column_to_field_map || {};
-						);
+						Object.assign(template_options.column_to_field_map, changed_map);
-						template_options.column_to_field_map =
+						frm.set_value("template_options", JSON.stringify(template_options));
-							template_options.column_to_field_map || {};
-						Object.assign(
-							template_options.column_to_field_map,
-							changed_map
-						);
-						frm.set_value(
-							"template_options",
-							JSON.stringify(template_options)
-						);
 						frm.save().then(() => frm.trigger("import_file"));
 					},
 				},
@@ -376,8 +342,7 @@ frappe.ui.form.on("Bank Statement Import", {
 		let other_warnings = [];
 		for (let warning of warnings) {
 			if (warning.row) {
-				warnings_by_row[warning.row] =
+				warnings_by_row[warning.row] = warnings_by_row[warning.row] || [];
-					warnings_by_row[warning.row] || [];
 				warnings_by_row[warning.row].push(warning);
 			} else {
 				other_warnings.push(warning);
@@ -392,9 +357,7 @@ frappe.ui.form.on("Bank Statement Import", {
 						if (w.field) {
 							let label =
 								w.field.label +
-								(w.field.parent !== frm.doc.reference_doctype
+								(w.field.parent !== frm.doc.reference_doctype ? ` (${w.field.parent})` : "");
-									? ` (${w.field.parent})`
-									: "");
 							return `<li>${label}: ${w.message}</li>`;
 						}
 						return `<li>${w.message}</li>`;
@@ -413,10 +376,9 @@ frappe.ui.form.on("Bank Statement Import", {
 			.map((warning) => {
 				let header = "";
 				if (warning.col) {
-					let column_number = `<span class="text-uppercase">${__(
+					let column_number = `<span class="text-uppercase">${__("Column {0}", [
-						"Column {0}",
+						warning.col,
-						[warning.col]
+					])}</span>`;
-					)}</span>`;
 					let column_header = columns[warning.col].header_title;
 					header = `${column_number} (${column_header})`;
 				}
@@ -455,36 +417,28 @@ frappe.ui.form.on("Bank Statement Import", {
 				let html = "";
 				if (log.success) {
 					if (frm.doc.import_type === "Insert New Records") {
-						html = __(
+						html = __("Successfully imported {0}", [
-							"Successfully imported {0}", [
 							`<span class="underline">${frappe.utils.get_form_link(
 								frm.doc.reference_doctype,
 								log.docname,
 								true
 							)}<span>`,
-							]
+						]);
-						);
 					} else {
-						html = __(
+						html = __("Successfully updated {0}", [
-							"Successfully updated {0}", [
 							`<span class="underline">${frappe.utils.get_form_link(
 								frm.doc.reference_doctype,
 								log.docname,
 								true
 							)}<span>`,
-							]
+						]);
-						);
 					}
 				} else {
 					let messages = log.messages
 						.map(JSON.parse)
 						.map((m) => {
-							let title = m.title
+							let title = m.title ? `<strong>${m.title}</strong>` : "";
-								? `<strong>${m.title}</strong>`
+							let message = m.message ? `<div>${m.message}</div>` : "";
-								: "";
-							let message = m.message
-								? `<div>${m.message}</div>`
-								: "";
 							return title + message;
 						})
 						.join("");

erpnext/accounts/doctype/bank_statement_import/bank_statement_import_list.js

@@ -1,36 +1,34 @@
 let imports_in_progress = [];
 
-frappe.listview_settings['Bank Statement Import'] = {
+frappe.listview_settings["Bank Statement Import"] = {
 	onload(listview) {
-		frappe.realtime.on('data_import_progress', data => {
+		frappe.realtime.on("data_import_progress", (data) => {
 			if (!imports_in_progress.includes(data.data_import)) {
 				imports_in_progress.push(data.data_import);
 			}
 		});
-		frappe.realtime.on('data_import_refresh', data => {
+		frappe.realtime.on("data_import_refresh", (data) => {
-			imports_in_progress = imports_in_progress.filter(
+			imports_in_progress = imports_in_progress.filter((d) => d !== data.data_import);
-				d => d !== data.data_import
-			);
 			listview.refresh();
 		});
 	},
 	get_indicator: function (doc) {
 		var colors = {
-			'Pending': 'orange',
+			Pending: "orange",
-			'Not Started': 'orange',
+			"Not Started": "orange",
-			'Partial Success': 'orange',
+			"Partial Success": "orange",
-			'Success': 'green',
+			Success: "green",
-			'In Progress': 'orange',
+			"In Progress": "orange",
-			'Error': 'red'
+			Error: "red",
 		};
 		let status = doc.status;
 		if (imports_in_progress.includes(doc.name)) {
-			status = 'In Progress';
+			status = "In Progress";
 		}
-		if (status == 'Pending') {
+		if (status == "Pending") {
-			status = 'Not Started';
+			status = "Not Started";
 		}
-		return [__(status), colors[status], 'status,=,' + doc.status];
+		return [__(status), colors[status], "status,=," + doc.status];
 	},
-	hide_name_column: true
+	hide_name_column: true,
 };

erpnext/accounts/doctype/bank_transaction/bank_transaction.js

@@ -35,14 +35,8 @@ frappe.ui.form.on("Bank Transaction", {
 
 	get_payment_doctypes: function () {
 		// get payment doctypes from all the apps
-		return [
+		return ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Bank Transaction"];
-			"Payment Entry",
+	},
-			"Journal Entry",
-			"Sales Invoice",
-			"Purchase Invoice",
-			"Bank Transaction",
-		];
-	}
 });
 
 frappe.ui.form.on("Bank Transaction Payments", {
@@ -54,10 +48,11 @@ frappe.ui.form.on("Bank Transaction Payments", {
 const update_clearance_date = (frm, cdt, cdn) => {
 	if (frm.doc.docstatus === 1) {
 		frappe
-			.xcall(
+			.xcall("erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment", {
-				"erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment",
+				doctype: cdt,
-				{ doctype: cdt, docname: cdn, bt_name: frm.doc.name }
+				docname: cdn,
-			)
+				bt_name: frm.doc.name,
+			})
 			.then((e) => {
 				if (e == "success") {
 					frappe.show_alert({

erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.listview_settings['Bank Transaction'] = {
+frappe.listview_settings["Bank Transaction"] = {
 	add_fields: ["unallocated_amount"],
 	get_indicator: function (doc) {
 		if (doc.docstatus == 2) {
@@ -11,5 +11,5 @@ frappe.listview_settings['Bank Transaction'] = {
 		} else if (flt(doc.unallocated_amount) > 0) {
 			return [__("Unreconciled"), "orange", "unallocated_amount,>,0"];
 		}
-	}
+	},
 };

erpnext/accounts/doctype/budget/budget.js

@@ -2,23 +2,23 @@
 // For license information, please see license.txt
 frappe.provide("erpnext.accounts.dimensions");
 
-frappe.ui.form.on('Budget', {
+frappe.ui.form.on("Budget", {
 	onload: function (frm) {
 		frm.set_query("account", "accounts", function () {
 			return {
 				filters: {
 					company: frm.doc.company,
 					report_type: "Profit and Loss",
-					is_group: 0
+					is_group: 0,
-				}
+				},
 			};
 		});
 
 		frm.set_query("monthly_distribution", function () {
 			return {
 				filters: {
-					fiscal_year: frm.doc.fiscal_year
+					fiscal_year: frm.doc.fiscal_year,
-				}
+				},
 			};
 		});
 
@@ -26,24 +26,24 @@ frappe.ui.form.on('Budget', {
 	},
 
 	refresh: function (frm) {
-		frm.trigger("toggle_reqd_fields")
+		frm.trigger("toggle_reqd_fields");
 	},
 
 	budget_against: function (frm) {
-		frm.trigger("set_null_value")
+		frm.trigger("set_null_value");
-		frm.trigger("toggle_reqd_fields")
+		frm.trigger("toggle_reqd_fields");
 	},
 
 	set_null_value: function (frm) {
-		if(frm.doc.budget_against == 'Cost Center') {
+		if (frm.doc.budget_against == "Cost Center") {
-			frm.set_value('project', null)
+			frm.set_value("project", null);
 		} else {
-			frm.set_value('cost_center', null)
+			frm.set_value("cost_center", null);
 		}
 	},
 
 	toggle_reqd_fields: function (frm) {
 		frm.toggle_reqd("cost_center", frm.doc.budget_against == "Cost Center");
 		frm.toggle_reqd("project", frm.doc.budget_against == "Project");
-	}
+	},
 });

erpnext/accounts/doctype/cashier_closing/cashier_closing.js

@@ -1,11 +1,10 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on('Cashier Closing', {
+frappe.ui.form.on("Cashier Closing", {
-
 	setup: function (frm) {
 		if (frm.doc.user == "" || frm.doc.user == null) {
 			frm.doc.user = frappe.session.user;
 		}
-	}
+	},
 });

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js

@@ -1,4 +1,4 @@
-frappe.ui.form.on('Chart of Accounts Importer', {
+frappe.ui.form.on("Chart of Accounts Importer", {
 	onload: function (frm) {
 		frm.set_value("company", "");
 		frm.set_value("import_file", "");
@@ -8,19 +8,22 @@ frappe.ui.form.on('Chart of Accounts Importer', {
 		frm.disable_save();
 
 		// make company mandatory
-		frm.set_df_property('company', 'reqd', frm.doc.company ? 0 : 1);
+		frm.set_df_property("company", "reqd", frm.doc.company ? 0 : 1);
-		frm.set_df_property('import_file_section', 'hidden', frm.doc.company ? 0 : 1);
+		frm.set_df_property("import_file_section", "hidden", frm.doc.company ? 0 : 1);
 
 		if (frm.doc.import_file) {
 			frappe.run_serially([
 				() => generate_tree_preview(frm),
 				() => create_import_button(frm),
-				() => frm.set_df_property('chart_preview', 'hidden', 0)
+				() => frm.set_df_property("chart_preview", "hidden", 0),
 			]);
 		}
 
-		frm.set_df_property('chart_preview', 'hidden',
+		frm.set_df_property(
-			$(frm.fields_dict['chart_tree'].wrapper).html()!="" ? 0 : 1);
+			"chart_preview",
+			"hidden",
+			$(frm.fields_dict["chart_tree"].wrapper).html() != "" ? 0 : 1
+		);
 	},
 
 	download_template: function (frm) {
@@ -32,7 +35,7 @@ frappe.ui.form.on('Chart of Accounts Importer', {
 					fieldname: "file_type",
 					fieldtype: "Select",
 					reqd: 1,
-					options: ["Excel", "CSV"]
+					options: ["Excel", "CSV"],
 				},
 				{
 					label: "Template Type",
@@ -41,19 +44,25 @@ frappe.ui.form.on('Chart of Accounts Importer', {
 					reqd: 1,
 					options: ["Sample Template", "Blank Template"],
 					change: () => {
-						let template_type = d.get_value('template_type');
+						let template_type = d.get_value("template_type");
 
 						if (template_type === "Sample Template") {
-							d.set_df_property('template_type', 'description',
+							d.set_df_property(
+								"template_type",
+								"description",
 								`The Sample Template contains all the required accounts pre filled in the  template.
-								You can add more accounts or change existing accounts in the template as per your choice.`);
+								You can add more accounts or change existing accounts in the template as per your choice.`
+							);
 						} else {
-							d.set_df_property('template_type', 'description',
+							d.set_df_property(
+								"template_type",
+								"description",
 								`The Blank Template contains just the account type and root type required to build the Chart
-								of Accounts. Please enter the account names and add more rows as per your requirement.`);
+								of Accounts. Please enter the account names and add more rows as per your requirement.`
-						}
+							);
 						}
 					},
+				},
 				{
 					label: "Company",
 					fieldname: "company",
@@ -67,21 +76,21 @@ frappe.ui.form.on('Chart of Accounts Importer', {
 				let data = d.get_values();
 
 				if (!data.template_type) {
-					frappe.throw(__('Please select <b>Template Type</b> to download template'));
+					frappe.throw(__("Please select <b>Template Type</b> to download template"));
 				}
 
 				open_url_post(
-					'/api/method/erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.download_template',
+					"/api/method/erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.download_template",
 					{
 						file_type: data.file_type,
 						template_type: data.template_type,
-						company: data.company
+						company: data.company,
 					}
 				);
 
 				d.hide();
 			},
-			primary_action_label: __('Download')
+			primary_action_label: __("Download"),
 		});
 		d.show();
 	},
@@ -89,7 +98,7 @@ frappe.ui.form.on('Chart of Accounts Importer', {
 	import_file: function (frm) {
 		if (!frm.doc.import_file) {
 			frm.page.set_indicator("");
-			$(frm.fields_dict['chart_tree'].wrapper).empty(); // empty wrapper on removing file
+			$(frm.fields_dict["chart_tree"].wrapper).empty(); // empty wrapper on removing file
 		}
 	},
 
@@ -99,89 +108,97 @@ frappe.ui.form.on('Chart of Accounts Importer', {
 			frappe.call({
 				method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.validate_company",
 				args: {
-					company: frm.doc.company
+					company: frm.doc.company,
 				},
 				callback: function (r) {
 					if (r.message === false) {
 						frm.set_value("company", "");
-						frappe.throw(__("Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions."));
+						frappe.throw(
+							__(
+								"Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions."
+							)
+						);
 					} else {
 						frm.trigger("refresh");
 					}
-				}
+				},
 			});
 		}
-	}
+	},
 });
 
 var create_import_button = function (frm) {
-	frm.page.set_primary_action(__("Import"), function () {
+	frm.page
+		.set_primary_action(__("Import"), function () {
 			return frappe.call({
 				method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.import_coa",
 				args: {
 					file_name: frm.doc.import_file,
-				company: frm.doc.company
+					company: frm.doc.company,
 				},
 				freeze: true,
 				freeze_message: __("Creating Accounts..."),
 				callback: function (r) {
 					if (!r.exc) {
 						clearInterval(frm.page["interval"]);
-					frm.page.set_indicator(__('Import Successful'), 'blue');
+						frm.page.set_indicator(__("Import Successful"), "blue");
 						create_reset_button(frm);
 					}
-			}
+				},
 			});
-	}).addClass('btn btn-primary');
+		})
+		.addClass("btn btn-primary");
 };
 
 var create_reset_button = function (frm) {
-	frm.page.set_primary_action(__("Reset"), function () {
+	frm.page
+		.set_primary_action(__("Reset"), function () {
 			frm.page.clear_primary_action();
 			delete frm.page["show_import_button"];
 			frm.reload_doc();
-	}).addClass('btn btn-primary');
+		})
+		.addClass("btn btn-primary");
 };
 
 var validate_coa = function (frm) {
 	if (frm.doc.import_file) {
-		let parent = __('All Accounts');
+		let parent = __("All Accounts");
 		return frappe.call({
-			'method': 'erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.get_coa',
+			method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.get_coa",
-			'args': {
+			args: {
 				file_name: frm.doc.import_file,
 				parent: parent,
-				doctype: 'Chart of Accounts Importer',
+				doctype: "Chart of Accounts Importer",
 				file_type: frm.doc.file_type,
-				for_validate: 1
+				for_validate: 1,
 			},
 			callback: function (r) {
-				if (r.message['show_import_button']) {
+				if (r.message["show_import_button"]) {
-					frm.page['show_import_button'] = Boolean(r.message['show_import_button']);
+					frm.page["show_import_button"] = Boolean(r.message["show_import_button"]);
-				}
 				}
+			},
 		});
 	}
 };
 
 var generate_tree_preview = function (frm) {
-	let parent = __('All Accounts');
+	let parent = __("All Accounts");
-	$(frm.fields_dict['chart_tree'].wrapper).empty(); // empty wrapper to load new data
+	$(frm.fields_dict["chart_tree"].wrapper).empty(); // empty wrapper to load new data
 
 	// generate tree structure based on the csv data
 	return new frappe.ui.Tree({
-		parent: $(frm.fields_dict['chart_tree'].wrapper),
+		parent: $(frm.fields_dict["chart_tree"].wrapper),
 		label: parent,
 		expandable: true,
-		method: 'erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.get_coa',
+		method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.get_coa",
 		args: {
 			file_name: frm.doc.import_file,
 			parent: parent,
-			doctype: 'Chart of Accounts Importer',
+			doctype: "Chart of Accounts Importer",
-			file_type: frm.doc.file_type
+			file_type: frm.doc.file_type,
 		},
 		onclick: function (node) {
 			parent = node.value;
-		}
+		},
 	});
 };

erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js

@@ -3,18 +3,20 @@
 
 frappe.provide("erpnext.cheque_print");
 
-frappe.ui.form.on('Cheque Print Template', {
+frappe.ui.form.on("Cheque Print Template", {
 	refresh: function (frm) {
 		if (!frm.doc.__islocal) {
-			frm.add_custom_button(frm.doc.has_print_format?__("Update Print Format"):__("Create Print Format"),
+			frm.add_custom_button(
+				frm.doc.has_print_format ? __("Update Print Format") : __("Create Print Format"),
 				function () {
 					erpnext.cheque_print.view_cheque_print(frm);
-				}).addClass("btn-primary");
+				}
+			).addClass("btn-primary");
 
-			$(frm.fields_dict.cheque_print_preview.wrapper).empty()
+			$(frm.fields_dict.cheque_print_preview.wrapper).empty();
 
-
+			var template =
-			var template = '<div style="position: relative; overflow-x: scroll;">\
+				'<div style="position: relative; overflow-x: scroll;">\
 				<div id="cheque_preview" style="width: {{ cheque_width }}cm; \
 					height: {{ cheque_height }}cm;\
 					background-repeat: no-repeat;\
@@ -48,30 +50,30 @@ frappe.ui.form.on('Cheque Print Template', {
 				</div>\
 			</div>';
 
-			$(frappe.render(template, frm.doc)).appendTo(frm.fields_dict.cheque_print_preview.wrapper)
+			$(frappe.render(template, frm.doc)).appendTo(frm.fields_dict.cheque_print_preview.wrapper);
 
 			if (frm.doc.scanned_cheque) {
-				$(frm.fields_dict.cheque_print_preview.wrapper).find("#cheque_preview").css('background-image', 'url(' + frm.doc.scanned_cheque + ')');
+				$(frm.fields_dict.cheque_print_preview.wrapper)
-			}
+					.find("#cheque_preview")
+					.css("background-image", "url(" + frm.doc.scanned_cheque + ")");
 			}
 		}
+	},
 });
 
-
 erpnext.cheque_print.view_cheque_print = function (frm) {
 	frappe.call({
 		method: "erpnext.accounts.doctype.cheque_print_template.cheque_print_template.create_or_update_cheque_print_format",
 		args: {
-			"template_name": frm.doc.name
+			template_name: frm.doc.name,
 		},
 		callback: function (r) {
 			if (!r.exe && !frm.doc.has_print_format) {
 				var doc = frappe.model.sync(r.message);
 				frappe.set_route("Form", r.message.doctype, r.message.name);
+			} else {
+				frappe.msgprint(__("Print settings updated in respective print format"));
 			}
-			else {
+		},
-				frappe.msgprint(__("Print settings updated in respective print format"))
+	});
-			}
+};
-		}
-	})
-}

erpnext/accounts/doctype/cost_center/cost_center.js

@@ -3,75 +3,80 @@
 
 frappe.provide("erpnext.accounts");
 
-
+frappe.ui.form.on("Cost Center", {
-
-frappe.ui.form.on('Cost Center', {
 	onload: function (frm) {
 		frm.set_query("parent_cost_center", function () {
 			return {
 				filters: {
 					company: frm.doc.company,
-					is_group: 1
+					is_group: 1,
-				}
+				},
-			}
+			};
 		});
 	},
 	refresh: function (frm) {
 		if (!frm.is_new()) {
-			frm.add_custom_button(__('Update Cost Center Name / Number'), function () {
+			frm.add_custom_button(__("Update Cost Center Name / Number"), function () {
 				frm.trigger("update_cost_center_number");
 			});
 		}
 
-		let intro_txt = '';
+		let intro_txt = "";
 		let doc = frm.doc;
-		frm.toggle_display('cost_center_name', doc.__islocal);
+		frm.toggle_display("cost_center_name", doc.__islocal);
-		frm.toggle_enable(['is_group', 'company'], doc.__islocal);
+		frm.toggle_enable(["is_group", "company"], doc.__islocal);
 
 		if (!doc.__islocal && doc.is_group == 1) {
-			intro_txt += __('Note: This Cost Center is a Group. Cannot make accounting entries against groups.');
+			intro_txt += __(
+				"Note: This Cost Center is a Group. Cannot make accounting entries against groups."
+			);
 		}
 
 		frm.events.hide_unhide_group_ledger(frm);
 
-		frm.toggle_display('sb1', doc.is_group==0);
+		frm.toggle_display("sb1", doc.is_group == 0);
 		frm.set_intro(intro_txt);
 
 		if (!frm.doc.__islocal) {
-			frm.add_custom_button(__('Chart of Cost Centers'),
+			frm.add_custom_button(__("Chart of Cost Centers"), function () {
-				function() { frappe.set_route("Tree", "Cost Center"); });
+				frappe.set_route("Tree", "Cost Center");
+			});
 
-			frm.add_custom_button(__('Budget'),
+			frm.add_custom_button(__("Budget"), function () {
-				function() { frappe.set_route("List", "Budget", {'cost_center': frm.doc.name}); });
+				frappe.set_route("List", "Budget", { cost_center: frm.doc.name });
+			});
 		}
 	},
 	update_cost_center_number: function (frm) {
 		var d = new frappe.ui.Dialog({
-			title: __('Update Cost Center Name / Number'),
+			title: __("Update Cost Center Name / Number"),
 			fields: [
 				{
-					"label": "Cost Center Name",
+					label: "Cost Center Name",
-					"fieldname": "cost_center_name",
+					fieldname: "cost_center_name",
-					"fieldtype": "Data",
+					fieldtype: "Data",
-					"reqd": 1,
+					reqd: 1,
-					"default": frm.doc.cost_center_name
+					default: frm.doc.cost_center_name,
 				},
 				{
-					"label": "Cost Center Number",
+					label: "Cost Center Number",
-					"fieldname": "cost_center_number",
+					fieldname: "cost_center_number",
-					"fieldtype": "Data",
+					fieldtype: "Data",
-					"default": frm.doc.cost_center_number
+					default: frm.doc.cost_center_number,
 				},
 				{
-					"label": __("Merge with existing"),
+					label: __("Merge with existing"),
-					"fieldname": "merge",
+					fieldname: "merge",
-					"fieldtype": "Check",
+					fieldtype: "Check",
-					"default": 0
+					default: 0,
-				}
+				},
 			],
 			primary_action: function () {
 				let data = d.get_values();
-				if(data.cost_center_name === frm.doc.cost_center_name && data.cost_center_number === frm.doc.cost_center_number) {
+				if (
+					data.cost_center_name === frm.doc.cost_center_name &&
+					data.cost_center_number === frm.doc.cost_center_number
+				) {
 					d.hide();
 					return;
 				}
@@ -83,7 +88,7 @@ frappe.ui.form.on('Cost Center', {
 						cost_center_name: data.cost_center_name,
 						cost_center_number: cstr(data.cost_center_number),
 						company: frm.doc.company,
-						merge: data.merge
+						merge: data.merge,
 					},
 					callback: function (r) {
 						frappe.dom.unfreeze();
@@ -96,33 +101,31 @@ frappe.ui.form.on('Cost Center', {
 							}
 							d.hide();
 						}
-					}
+					},
 				});
 			},
-			primary_action_label: __('Update')
+			primary_action_label: __("Update"),
 		});
 		d.show();
 	},
 
 	parent_cost_center(frm) {
 		if (!frm.doc.company) {
-			frappe.msgprint(__('Please enter company name first'));
+			frappe.msgprint(__("Please enter company name first"));
 		}
 	},
 
 	hide_unhide_group_ledger(frm) {
 		let doc = frm.doc;
 		if (doc.is_group == 1) {
-			frm.add_custom_button(__('Convert to Non-Group'),
+			frm.add_custom_button(__("Convert to Non-Group"), () => frm.events.convert_to_ledger(frm));
-				() => frm.events.convert_to_ledger(frm));
 		} else if (doc.is_group == 0) {
-			frm.add_custom_button(__('Convert to Group'),
+			frm.add_custom_button(__("Convert to Group"), () => frm.events.convert_to_group(frm));
-				() => frm.events.convert_to_group(frm));
 		}
 	},
 
 	convert_to_group(frm) {
-		frm.call('convert_ledger_to_group').then(r => {
+		frm.call("convert_ledger_to_group").then((r) => {
 			if (r.message === 1) {
 				frm.refresh();
 			}
@@ -130,10 +133,10 @@ frappe.ui.form.on('Cost Center', {
 	},
 
 	convert_to_ledger(frm) {
-		frm.call('convert_group_to_ledger').then(r => {
+		frm.call("convert_group_to_ledger").then((r) => {
 			if (r.message === 1) {
 				frm.refresh();
 			}
 		});
-	}
+	},
 });

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -41,7 +41,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Cost Center Number",
-   "read_only": 1
+   "read_only_depends_on": "eval:!doc.__islocal"
   },
   {
    "fieldname": "parent_cost_center",

erpnext/accounts/doctype/cost_center/cost_center_tree.js

@@ -1,29 +1,45 @@
 frappe.treeview_settings["Cost Center"] = {
 	breadcrumb: "Accounts",
 	get_tree_root: false,
-	filters: [{
+	filters: [
+		{
 			fieldname: "company",
 			fieldtype: "Select",
 			options: erpnext.utils.get_tree_options("company"),
 			label: __("Company"),
-		default: erpnext.utils.get_tree_default("company")
+			default: erpnext.utils.get_tree_default("company"),
-	}],
+		},
+	],
 	root_label: "Cost Centers",
-	get_tree_nodes: 'erpnext.accounts.utils.get_children',
+	get_tree_nodes: "erpnext.accounts.utils.get_children",
-	add_tree_node: 'erpnext.accounts.utils.add_cc',
+	add_tree_node: "erpnext.accounts.utils.add_cc",
 	menu_items: [
 		{
-			label: __('New Company'),
+			label: __("New Company"),
-			action: function() { frappe.new_doc("Company", true) },
+			action: function () {
-			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1'
+				frappe.new_doc("Company", true);
-		}
+			},
+			condition: 'frappe.boot.user.can_create.indexOf("Company") !== -1',
+		},
 	],
 	fields: [
-		{fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true},
+		{ fieldtype: "Data", fieldname: "cost_center_name", label: __("New Cost Center Name"), reqd: true },
-		{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
+		{
-			description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')},
+			fieldtype: "Check",
-		{fieldtype:'Data', fieldname:'cost_center_number', label:__('Cost Center Number'),
+			fieldname: "is_group",
-			description: __("Number of new Cost Center, it will be included in the cost center name as a prefix")}
+			label: __("Is Group"),
+			description: __(
+				"Further cost centers can be made under Groups but entries can be made against non-Groups"
+			),
+		},
+		{
+			fieldtype: "Data",
+			fieldname: "cost_center_number",
+			label: __("Cost Center Number"),
+			description: __(
+				"Number of new Cost Center, it will be included in the cost center name as a prefix"
+			),
+		},
 	],
 	ignore_fields: ["parent_cost_center"],
 	onload: function (treeview) {
@@ -32,23 +48,37 @@ frappe.treeview_settings["Cost Center"] = {
 		}
 
 		// tools
-		treeview.page.add_inner_button(__("Chart of Accounts"), function() {
+		treeview.page.add_inner_button(
-			frappe.set_route('Tree', 'Account', {company: get_company()});
+			__("Chart of Accounts"),
-		}, __('View'));
+			function () {
+				frappe.set_route("Tree", "Account", { company: get_company() });
+			},
+			__("View")
+		);
 
 		// make
-		treeview.page.add_inner_button(__("Budget List"), function() {
+		treeview.page.add_inner_button(
-			frappe.set_route('List', 'Budget', {company: get_company()});
+			__("Budget List"),
-		}, __('Budget'));
+			function () {
+				frappe.set_route("List", "Budget", { company: get_company() });
+			},
+			__("Budget")
+		);
 
-		treeview.page.add_inner_button(__("Monthly Distribution"), function() {
+		treeview.page.add_inner_button(
-			frappe.set_route('List', 'Monthly Distribution', {company: get_company()});
+			__("Monthly Distribution"),
-		}, __('Budget'));
+			function () {
+				frappe.set_route("List", "Monthly Distribution", { company: get_company() });
+			},
+			__("Budget")
+		);
 
-		treeview.page.add_inner_button(__("Budget Variance Report"), function() {
+		treeview.page.add_inner_button(
-			frappe.set_route('query-report', 'Budget Variance Report', {company: get_company()});
+			__("Budget Variance Report"),
-		}, __('Budget'));
+			function () {
-
+				frappe.set_route("query-report", "Budget Variance Report", { company: get_company() });
-	}
+			},
-
+			__("Budget")
-}
+		);
+	},
+};

erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.js

@@ -1,24 +1,24 @@
 // Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Cost Center Allocation', {
+frappe.ui.form.on("Cost Center Allocation", {
 	setup: function (frm) {
-		frm.set_query('main_cost_center', function() {
+		frm.set_query("main_cost_center", function () {
 			return {
 				filters: {
 					company: frm.doc.company,
-					is_group: 0
+					is_group: 0,
-				}
+				},
 			};
 		});
 
-		frm.set_query('cost_center', 'allocation_percentages', function() {
+		frm.set_query("cost_center", "allocation_percentages", function () {
 			return {
 				filters: {
 					company: frm.doc.company,
-					is_group: 0
+					is_group: 0,
-				}
+				},
 			};
 		});
-	}
+	},
 });

erpnext/accounts/doctype/coupon_code/coupon_code.js

@@ -1,13 +1,11 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Coupon Code', {
+frappe.ui.form.on("Coupon Code", {
 	setup: function (frm) {
 		frm.set_query("pricing_rule", function () {
 			return {
-				filters: [
+				filters: [["Pricing Rule", "coupon_code_based", "=", "1"]],
-					["Pricing Rule","coupon_code_based", "=", "1"]
-				]
 			};
 		});
 	},
@@ -24,15 +22,14 @@ frappe.ui.form.on('Coupon Code', {
 	make_coupon_code: function (frm) {
 		var coupon_name = frm.doc.coupon_name;
 		var coupon_code;
-		if (frm.doc.coupon_type=='Gift Card') {
+		if (frm.doc.coupon_type == "Gift Card") {
 			coupon_code = Math.random().toString(12).substring(2, 12).toUpperCase();
-		}
+		} else if (frm.doc.coupon_type == "Promotional") {
-		else if(frm.doc.coupon_type=='Promotional'){
+			coupon_name = coupon_name.replace(/\s/g, "");
-			coupon_name=coupon_name.replace(/\s/g,'');
 			coupon_code = coupon_name.toUpperCase().slice(0, 8);
 		}
 		frm.doc.coupon_code = coupon_code;
-		frm.refresh_field('coupon_code');
+		frm.refresh_field("coupon_code");
 	},
 	refresh: function (frm) {
 		if (frm.doc.pricing_rule) {
@@ -40,5 +37,5 @@ frappe.ui.form.on('Coupon Code', {
 				frappe.set_route("Form", "Pricing Rule", frm.doc.pricing_rule);
 			});
 		}
-	}
+	},
 });

erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.js

@@ -1,28 +1,27 @@
 // Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Currency Exchange Settings', {
+frappe.ui.form.on("Currency Exchange Settings", {
 	service_provider: function (frm) {
 		if (frm.doc.service_provider == "exchangerate.host") {
-			let result = ['result'];
+			let result = ["result"];
 			let params = {
-				date: '{transaction_date}',
+				date: "{transaction_date}",
-				from: '{from_currency}',
+				from: "{from_currency}",
-				to: '{to_currency}'
+				to: "{to_currency}",
 			};
 			add_param(frm, "https://api.exchangerate.host/convert", params, result);
 		} else if (frm.doc.service_provider == "frankfurter.app") {
-			let result = ['rates', '{to_currency}'];
+			let result = ["rates", "{to_currency}"];
 			let params = {
-				base: '{from_currency}',
+				base: "{from_currency}",
-				symbols: '{to_currency}'
+				symbols: "{to_currency}",
 			};
 			add_param(frm, "https://frankfurter.app/{transaction_date}", params, result);
 		}
-	}
+	},
 });
 
-
 function add_param(frm, api, params, result) {
 	var row;
 	frm.clear_table("req_params");

erpnext/accounts/doctype/dunning/dunning.js

@@ -10,7 +10,7 @@ frappe.ui.form.on("Dunning", {
 					company: frm.doc.company,
 					customer: frm.doc.customer,
 					outstanding_amount: [">", 0],
-					status: "Overdue"
+					status: "Overdue",
 				},
 			};
 		});
@@ -19,16 +19,16 @@ frappe.ui.form.on("Dunning", {
 				filters: {
 					company: frm.doc.company,
 					root_type: "Income",
-					is_group: 0
+					is_group: 0,
-				}
+				},
 			};
 		});
 		frm.set_query("cost_center", () => {
 			return {
 				filters: {
 					company: frm.doc.company,
-					is_group: 0
+					is_group: 0,
-				}
+				},
 			};
 		});
 
@@ -51,7 +51,8 @@ frappe.ui.form.on("Dunning", {
 				__("Payment"),
 				function () {
 					frm.events.make_payment_entry(frm);
-				}, __("Create")
+				},
+				__("Create")
 			);
 			frm.page.set_inner_btn_group_as_primary(__("Create"));
 		}
@@ -69,7 +70,7 @@ frappe.ui.form.on("Dunning", {
 					get_query_filters: {
 						docstatus: 1,
 						status: "Overdue",
-						company: frm.doc.company
+						company: frm.doc.company,
 					},
 					allow_child_item_selection: true,
 					child_fieldname: "payment_schedule",
@@ -78,9 +79,12 @@ frappe.ui.form.on("Dunning", {
 			});
 		}
 
-		frappe.dynamic_link = { doc: frm.doc, fieldname: 'customer', doctype: 'Customer' };
+		frappe.dynamic_link = { doc: frm.doc, fieldname: "customer", doctype: "Customer" };
 
-		frm.toggle_display("customer_name", (frm.doc.customer_name && frm.doc.customer_name !== frm.doc.customer));
+		frm.toggle_display(
+			"customer_name",
+			frm.doc.customer_name && frm.doc.customer_name !== frm.doc.customer
+		);
 	},
 	// When multiple companies are set up. in case company name is changed set default company address
 	company: function (frm) {
@@ -90,8 +94,8 @@ frappe.ui.form.on("Dunning", {
 				args: { name: frm.doc.company, existing_address: frm.doc.company_address || "" },
 				debounce: 2000,
 				callback: function (r) {
-					frm.set_value("company_address", r && r.message || "");
+					frm.set_value("company_address", (r && r.message) || "");
-				}
+				},
 			});
 
 			if (frm.fields_dict.currency) {
@@ -125,7 +129,7 @@ frappe.ui.form.on("Dunning", {
 					transaction_date: frm.doc.posting_date,
 					from_currency: frm.doc.currency,
 					to_currency: company_currency,
-					args: "for_selling"
+					args: "for_selling",
 				},
 				freeze: true,
 				freeze_message: __("Fetching exchange rates ..."),
@@ -134,7 +138,7 @@ frappe.ui.form.on("Dunning", {
 					if (exchange_rate != frm.doc.conversion_rate) {
 						frm.set_value("conversion_rate", exchange_rate);
 					}
-				}
+				},
 			});
 		} else {
 			frm.trigger("conversion_rate");
@@ -166,8 +170,7 @@ frappe.ui.form.on("Dunning", {
 	get_dunning_letter_text: function (frm) {
 		if (frm.doc.dunning_type) {
 			frappe.call({
-				method:
+				method: "erpnext.accounts.doctype.dunning.dunning.get_dunning_letter_text",
-					"erpnext.accounts.doctype.dunning.dunning.get_dunning_letter_text",
 				args: {
 					dunning_type: frm.doc.dunning_type,
 					language: frm.doc.language,
@@ -204,10 +207,7 @@ frappe.ui.form.on("Dunning", {
 	calculate_overdue_days: function (frm) {
 		frm.doc.overdue_payments.forEach((row) => {
 			if (frm.doc.posting_date && row.due_date) {
-				const overdue_days = moment(frm.doc.posting_date).diff(
+				const overdue_days = moment(frm.doc.posting_date).diff(row.due_date, "days");
-					row.due_date,
-					"days"
-				);
 				frappe.model.set_value(row.doctype, row.name, "overdue_days", overdue_days);
 			}
 		});
@@ -215,15 +215,16 @@ frappe.ui.form.on("Dunning", {
 	calculate_interest: function (frm) {
 		frm.doc.overdue_payments.forEach((row) => {
 			const interest_per_day = frm.doc.rate_of_interest / 100 / 365;
-			const interest = flt((interest_per_day * row.overdue_days * row.outstanding), precision("interest", row));
+			const interest = flt(
+				interest_per_day * row.overdue_days * row.outstanding,
+				precision("interest", row)
+			);
 			frappe.model.set_value(row.doctype, row.name, "interest", interest);
 		});
 	},
 	calculate_totals: function (frm) {
-		const total_interest = frm.doc.overdue_payments
+		const total_interest = frm.doc.overdue_payments.reduce((prev, cur) => prev + cur.interest, 0);
-			.reduce((prev, cur) => prev + cur.interest, 0);
+		const total_outstanding = frm.doc.overdue_payments.reduce((prev, cur) => prev + cur.outstanding, 0);
-		const total_outstanding = frm.doc.overdue_payments
-			.reduce((prev, cur) => prev + cur.outstanding, 0);
 		const dunning_amount = total_interest + frm.doc.dunning_fee;
 		const base_dunning_amount = dunning_amount * frm.doc.conversion_rate;
 		const grand_total = total_outstanding + dunning_amount;
@@ -240,8 +241,7 @@ frappe.ui.form.on("Dunning", {
 	},
 	make_payment_entry: function (frm) {
 		return frappe.call({
-			method:
+			method: "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry",
-				"erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry",
 			args: {
 				dt: frm.doc.doctype,
 				dn: frm.doc.name,
@@ -257,5 +257,5 @@ frappe.ui.form.on("Dunning", {
 frappe.ui.form.on("Overdue Payment", {
 	interest: function (frm) {
 		frm.trigger("calculate_totals");
-	}
+	},
 });

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js

@@ -1,20 +1,20 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Exchange Rate Revaluation', {
+frappe.ui.form.on("Exchange Rate Revaluation", {
 	setup: function (frm) {
 		frm.set_query("party_type", "accounts", function () {
 			return {
-				"filters": {
+				filters: {
-					"name": ["in", Object.keys(frappe.boot.party_account_types)],
+					name: ["in", Object.keys(frappe.boot.party_account_types)],
-				}
+				},
 			};
 		});
 		frm.set_query("account", "accounts", function (doc) {
 			return {
-				"filters": {
+				filters: {
-					"company": doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 	},
@@ -22,15 +22,19 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 	refresh: function (frm) {
 		if (frm.doc.docstatus == 1) {
 			frappe.call({
-				method: 'check_journal_entry_condition',
+				method: "check_journal_entry_condition",
 				doc: frm.doc,
 				callback: function (r) {
 					if (r.message) {
-						frm.add_custom_button(__('Journal Entries'), function() {
+						frm.add_custom_button(
+							__("Journal Entries"),
+							function () {
 								return frm.events.make_jv(frm);
-						}, __('Create'));
+							},
-					}
+							__("Create")
+						);
 					}
+				},
 			});
 		}
 	},
@@ -64,7 +68,7 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 					frm.events.get_total_gain_loss(frm);
 					refresh_field("accounts");
 				}
-			}
+			},
 		});
 	},
 
@@ -91,20 +95,22 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
 			callback: function (r) {
 				if (r.message) {
 					let response = r.message;
-					if(response['revaluation_jv'] || response['zero_balance_jv']) {
+					if (response["revaluation_jv"] || response["zero_balance_jv"]) {
 						frappe.msgprint(__("Journals have been created"));
 					}
 				}
-			}
+			},
 		});
-	}
+	},
 });
 
 frappe.ui.form.on("Exchange Rate Revaluation Account", {
 	new_exchange_rate: function (frm, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
-		row.new_balance_in_base_currency = flt(row.new_exchange_rate * flt(row.balance_in_account_currency),
+		row.new_balance_in_base_currency = flt(
-			precision("new_balance_in_base_currency", row));
+			row.new_exchange_rate * flt(row.balance_in_account_currency),
+			precision("new_balance_in_base_currency", row)
+		);
 		row.gain_loss = row.new_balance_in_base_currency - flt(row.balance_in_base_currency);
 		refresh_field("accounts");
 		frm.events.get_total_gain_loss(frm);
@@ -126,7 +132,7 @@ frappe.ui.form.on("Exchange Rate Revaluation Account", {
 
 	accounts_remove: function (frm) {
 		frm.events.get_total_gain_loss(frm);
-	}
+	},
 });
 
 var get_account_details = function (frm, cdt, cdn) {
@@ -142,12 +148,12 @@ var get_account_details = function(frm, cdt, cdn) {
 			posting_date: frm.doc.posting_date,
 			party_type: row.party_type,
 			party: row.party,
-			rounding_loss_allowance: frm.doc.rounding_loss_allowance
+			rounding_loss_allowance: frm.doc.rounding_loss_allowance,
 		},
 		callback: function (r) {
 			$.extend(row, r.message);
 			refresh_field("accounts");
 			frm.events.get_total_gain_loss(frm);
-		}
+		},
 	});
 };

erpnext/accounts/doctype/finance_book/finance_book.js

@@ -1,8 +1,6 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Finance Book', {
+frappe.ui.form.on("Finance Book", {
-	refresh: function(frm) {
+	refresh: function (frm) {},
-
-	}
 });

erpnext/accounts/doctype/fiscal_year/fiscal_year.js

@@ -1,17 +1,21 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on('Fiscal Year', {
+frappe.ui.form.on("Fiscal Year", {
 	onload: function (frm) {
 		if (frm.doc.__islocal) {
-			frm.set_value("year_start_date",
+			frm.set_value(
-				frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1));
+				"year_start_date",
+				frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)
+			);
 		}
 	},
 	year_start_date: function (frm) {
 		if (!frm.doc.is_short_year) {
-			let year_end_date =
+			let year_end_date = frappe.datetime.add_days(
-				frappe.datetime.add_days(frappe.datetime.add_months(frm.doc.year_start_date, 12), -1);
+				frappe.datetime.add_months(frm.doc.year_start_date, 12),
+				-1
+			);
 			frm.set_value("year_end_date", year_end_date);
 		}
 	},

erpnext/accounts/doctype/gl_entry/gl_entry.js

@@ -1,8 +1,8 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('GL Entry', {
+frappe.ui.form.on("GL Entry", {
 	refresh: function (frm) {
-		frm.page.btn_secondary.hide()
+		frm.page.btn_secondary.hide();
-	}
+	},
 });

erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js

@@ -1,38 +1,40 @@
 // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Invoice Discounting', {
+frappe.ui.form.on("Invoice Discounting", {
 	setup: (frm) => {
 		frm.set_query("sales_invoice", "invoices", (doc) => {
 			return {
-				"filters": {
+				filters: {
-					"docstatus": 1,
+					docstatus: 1,
-					"company": doc.company,
+					company: doc.company,
-					"outstanding_amount": [">", 0]
+					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_discounted", frm, [["account_type", "=", "Receivable"]]);
+		frm.events.filter_accounts("accounts_receivable_discounted", frm, [
+			["account_type", "=", "Receivable"],
+		]);
 		frm.events.filter_accounts("accounts_receivable_credit", 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]
+			["is_group", "=", 0],
 		];
 		if (addl_filters) {
 			filters = $.merge(filters, addl_filters);
 		}
 
-		frm.set_query(fieldname, () => { return { "filters": filters }; });
+		frm.set_query(fieldname, () => {
+			return { filters: filters };
+		});
 	},
 
 	refresh_filters: (frm) => {
@@ -41,7 +43,7 @@ frappe.ui.form.on('Invoice Discounting', {
 		});
 		let filters = [
 			["account_type", "=", "Receivable"],
-			["name", "not in", invoice_accounts]
+			["name", "not in", invoice_accounts],
 		];
 		frm.events.filter_accounts("accounts_receivable_credit", frm, filters);
 		frm.events.filter_accounts("accounts_receivable_discounted", frm, filters);
@@ -52,19 +54,19 @@ frappe.ui.form.on('Invoice Discounting', {
 		frm.events.show_general_ledger(frm);
 
 		if (frm.doc.docstatus === 0) {
-			frm.add_custom_button(__('Get Invoices'), function() {
+			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.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.add_custom_button(__("Close Loan"), function () {
 					frm.events.close_loan(frm);
 				}).addClass("btn-primary");
 			}
@@ -92,45 +94,45 @@ frappe.ui.form.on('Invoice Discounting', {
 
 	calculate_total_amount: (frm) => {
 		let total_amount = 0.0;
-		for (let row of (frm.doc.invoices || [])) {
+		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'),
+			title: __("Get Invoices based on Filters"),
 			fields: [
 				{
-					"label": "Customer",
+					label: "Customer",
-					"fieldname": "customer",
+					fieldname: "customer",
-					"fieldtype": "Link",
+					fieldtype: "Link",
-					"options": "Customer"
+					options: "Customer",
 				},
 				{
-					"label": "From Date",
+					label: "From Date",
-					"fieldname": "from_date",
+					fieldname: "from_date",
-					"fieldtype": "Date"
+					fieldtype: "Date",
 				},
 				{
-					"label": "To Date",
+					label: "To Date",
-					"fieldname": "to_date",
+					fieldname: "to_date",
-					"fieldtype": "Date"
+					fieldtype: "Date",
 				},
 				{
-					"fieldname": "col_break",
+					fieldname: "col_break",
-					"fieldtype": "Column Break",
+					fieldtype: "Column Break",
 				},
 				{
-					"label": "Min Amount",
+					label: "Min Amount",
-					"fieldname": "min_amount",
+					fieldname: "min_amount",
-					"fieldtype": "Currency"
+					fieldtype: "Currency",
 				},
 				{
-					"label": "Max Amount",
+					label: "Max Amount",
-					"fieldname": "max_amount",
+					fieldname: "max_amount",
-					"fieldtype": "Currency"
+					fieldtype: "Currency",
-				}
+				},
 			],
 			primary_action: function () {
 				var data = d.get_values();
@@ -138,23 +140,23 @@ frappe.ui.form.on('Invoice Discounting', {
 				frappe.call({
 					method: "erpnext.accounts.doctype.invoice_discounting.invoice_discounting.get_invoices",
 					args: {
-						filters: data
+						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);
+								frm.doc.invoices = frm.doc.invoices.filter((row) => row.sales_invoice);
 								let row = frm.add_child("invoices");
 								$.extend(row, v);
 								frm.events.refresh_filters(frm);
 							});
 							refresh_field("invoices");
 						}
-					}
+					},
 				});
 			},
-			primary_action_label: __('Get Invocies')
+			primary_action_label: __("Get Invocies"),
 		});
 		d.show();
 	},
@@ -168,9 +170,8 @@ frappe.ui.form.on('Invoice Discounting', {
 					var doclist = frappe.model.sync(r.message);
 					frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
 				}
-			}
+			},
 		});
-
 	},
 
 	close_loan: (frm) => {
@@ -182,29 +183,32 @@ frappe.ui.form.on('Invoice Discounting', {
 					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 > 0) {
-			cur_frm.add_custom_button(__('Accounting Ledger'), function() {
+			cur_frm.add_custom_button(
+				__("Accounting Ledger"),
+				function () {
 					frappe.route_options = {
 						voucher_no: frm.doc.name,
 						from_date: frm.doc.posting_date,
-					to_date: moment(frm.doc.modified).format('YYYY-MM-DD'),
+						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
 						company: frm.doc.company,
 						group_by: "Group by Voucher (Consolidated)",
-					show_cancelled_entries: frm.doc.docstatus === 2
+						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");
-			}, __("View"));
+				},
-		}
+				__("View")
+			);
 		}
+	},
 });
 
-frappe.ui.form.on('Discounted Invoice', {
+frappe.ui.form.on("Discounted Invoice", {
 	sales_invoice: (frm) => {
 		frm.events.calculate_total_amount(frm);
 		frm.events.refresh_filters(frm);
@@ -212,5 +216,5 @@ frappe.ui.form.on('Discounted Invoice', {
 	invoices_remove: (frm) => {
 		frm.events.calculate_total_amount(frm);
 		frm.events.refresh_filters(frm);
-	}
+	},
 });

erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js

@@ -1,21 +1,16 @@
-frappe.listview_settings['Invoice Discounting'] = {
+frappe.listview_settings["Invoice Discounting"] = {
 	add_fields: ["status"],
-	get_indicator: function(doc)
+	get_indicator: function (doc) {
-	{
 		if (doc.status == "Draft") {
 			return [__("Draft"), "red", "status,=,Draft"];
-		}
+		} else if (doc.status == "Sanctioned") {
-		else if(doc.status == "Sanctioned") {
 			return [__("Sanctioned"), "green", "status,=,Sanctioned"];
-		}
+		} else if (doc.status == "Disbursed") {
-		else if(doc.status == "Disbursed") {
 			return [__("Disbursed"), "blue", "status,=,Disbursed"];
-		}
+		} else if (doc.status == "Settled") {
-		else if(doc.status == "Settled") {
 			return [__("Settled"), "orange", "status,=,Settled"];
-		}
+		} else if (doc.status == "Canceled") {
-		else if(doc.status == "Canceled") {
 			return [__("Canceled"), "red", "status,=,Canceled"];
 		}
-	}
+	},
 };

erpnext/accounts/doctype/item_tax_template/item_tax_template.js

@@ -1,27 +1,49 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Item Tax Template', {
+frappe.ui.form.on("Item Tax Template", {
 	setup: function (frm) {
 		frm.set_query("tax_type", "taxes", function (doc) {
 			return {
 				filters: [
-					['Account', 'company', '=', frm.doc.company],
+					["Account", "company", "=", frm.doc.company],
-					['Account', 'is_group', '=', 0],
+					["Account", "is_group", "=", 0],
-					['Account', 'account_type', 'in', ['Tax', 'Chargeable', 'Income Account', 'Expense Account', 'Expenses Included In Valuation']]
+					[
-				]
+						"Account",
-			}
+						"account_type",
+						"in",
+						[
+							"Tax",
+							"Chargeable",
+							"Income Account",
+							"Expense Account",
+							"Expenses Included In Valuation",
+						],
+					],
+				],
+			};
 		});
 	},
 	company: function (frm) {
 		frm.set_query("tax_type", "taxes", function (doc) {
 			return {
 				filters: [
-					['Account', 'company', '=', frm.doc.company],
+					["Account", "company", "=", frm.doc.company],
-					['Account', 'is_group', '=', 0],
+					["Account", "is_group", "=", 0],
-					['Account', 'account_type', 'in', ['Tax', 'Chargeable', 'Income Account', 'Expense Account', 'Expenses Included In Valuation']]
+					[
-				]
+						"Account",
-			}
+						"account_type",
+						"in",
+						[
+							"Tax",
+							"Chargeable",
+							"Income Account",
+							"Expense Account",
+							"Expenses Included In Valuation",
+						],
+					],
+				],
+			};
 		});
-	}
+	},
 });

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -4,58 +4,82 @@
 frappe.provide("erpnext.accounts");
 frappe.provide("erpnext.journal_entry");
 
-
 frappe.ui.form.on("Journal Entry", {
 	setup: function (frm) {
 		frm.add_fetch("bank_account", "account", "account");
-		frm.ignore_doctypes_on_cancel_all = ['Sales Invoice', 'Purchase Invoice', 'Journal Entry', "Repost Payment Ledger", 'Asset', 'Asset Movement', 'Asset Depreciation Schedule', "Repost Accounting Ledger", "Unreconcile Payment", "Unreconcile Payment Entries", "Bank Transaction"];
+		frm.ignore_doctypes_on_cancel_all = [
+			"Sales Invoice",
+			"Purchase Invoice",
+			"Journal Entry",
+			"Repost Payment Ledger",
+			"Asset",
+			"Asset Movement",
+			"Asset Depreciation Schedule",
+			"Repost Accounting Ledger",
+			"Unreconcile Payment",
+			"Unreconcile Payment Entries",
+			"Bank Transaction",
+		];
 	},
 
 	refresh: function (frm) {
 		erpnext.toggle_naming_series();
 
 		if (frm.doc.repost_required && frm.doc.docstatus === 1) {
-			frm.set_intro(__("Accounting entries for this Journal Entry need to be reposted. Please click on 'Repost' button to update."));
+			frm.set_intro(
-			frm.add_custom_button(__('Repost Accounting Entries'),
+				__(
-				() => {
+					"Accounting entries for this Journal Entry need to be reposted. Please click on 'Repost' button to update."
+				)
+			);
+			frm.add_custom_button(__("Repost Accounting Entries"), () => {
 				frm.call({
 					doc: frm.doc,
-						method: 'repost_accounting_entries',
+					method: "repost_accounting_entries",
 					freeze: true,
-						freeze_message: __('Reposting...'),
+					freeze_message: __("Reposting..."),
 					callback: (r) => {
 						if (!r.exc) {
-								frappe.msgprint(__('Accounting Entries are reposted.'));
+							frappe.msgprint(__("Accounting Entries are reposted."));
 							frm.refresh();
 						}
-						}
+					},
 				});
-				}).removeClass('btn-default').addClass('btn-warning');
+			})
+				.removeClass("btn-default")
+				.addClass("btn-warning");
 		}
 
 		if (frm.doc.docstatus > 0) {
-			frm.add_custom_button(__('Ledger'), function() {
+			frm.add_custom_button(
+				__("Ledger"),
+				function () {
 					frappe.route_options = {
-					"voucher_no": frm.doc.name,
+						voucher_no: frm.doc.name,
-					"from_date": frm.doc.posting_date,
+						from_date: frm.doc.posting_date,
-					"to_date": moment(frm.doc.modified).format('YYYY-MM-DD'),
+						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
-					"company": frm.doc.company,
+						company: frm.doc.company,
-					"finance_book": frm.doc.finance_book,
+						finance_book: frm.doc.finance_book,
-					"group_by": '',
+						group_by: "",
-					"show_cancelled_entries": frm.doc.docstatus === 2
+						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");
-			}, __('View'));
+				},
+				__("View")
+			);
 		}
 
 		if (frm.doc.docstatus == 1) {
-			frm.add_custom_button(__('Reverse Journal Entry'), function() {
+			frm.add_custom_button(
+				__("Reverse Journal Entry"),
+				function () {
 					return erpnext.journal_entry.reverse_journal_entry(frm);
-			}, __('Actions'));
+				},
+				__("Actions")
+			);
 		}
 
 		if (frm.doc.__islocal) {
-			frm.add_custom_button(__('Quick Entry'), function() {
+			frm.add_custom_button(__("Quick Entry"), function () {
 				return erpnext.journal_entry.quick_entry(frm);
 			});
 		}
@@ -63,21 +87,34 @@ frappe.ui.form.on("Journal Entry", {
 		// hide /unhide fields based on currency
 		erpnext.journal_entry.toggle_fields_based_on_currency(frm);
 
-		if ((frm.doc.voucher_type == "Inter Company Journal Entry") && (frm.doc.docstatus == 1) && (!frm.doc.inter_company_journal_entry_reference)) {
+		if (
-			frm.add_custom_button(__("Create Inter Company Journal Entry"),
+			frm.doc.voucher_type == "Inter Company Journal Entry" &&
+			frm.doc.docstatus == 1 &&
+			!frm.doc.inter_company_journal_entry_reference
+		) {
+			frm.add_custom_button(
+				__("Create Inter Company Journal Entry"),
 				function () {
 					frm.trigger("make_inter_company_journal_entry");
-				}, __('Make'));
+				},
+				__("Make")
+			);
 		}
 
 		erpnext.accounts.unreconcile_payment.add_unreconcile_btn(frm);
 	},
 	before_save: function (frm) {
-		if ((frm.doc.docstatus == 0) && (!frm.doc.is_system_generated)) {
+		if (frm.doc.docstatus == 0 && !frm.doc.is_system_generated) {
-			let payment_entry_references = frm.doc.accounts.filter(elem => (elem.reference_type == "Payment Entry"));
+			let payment_entry_references = frm.doc.accounts.filter(
+				(elem) => elem.reference_type == "Payment Entry"
+			);
 			if (payment_entry_references.length > 0) {
-				let rows = payment_entry_references.map(x => "#"+x.idx);
+				let rows = payment_entry_references.map((x) => "#" + x.idx);
-				frappe.throw(__("Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually.", [frappe.utils.comma_and(rows)]));
+				frappe.throw(
+					__("Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually.", [
+						frappe.utils.comma_and(rows),
+					])
+				);
 			}
 		}
 	},
@@ -86,29 +123,27 @@ frappe.ui.form.on("Journal Entry", {
 			title: __("Select Company"),
 			fields: [
 				{
-					'fieldname': 'company',
+					fieldname: "company",
-					'fieldtype': 'Link',
+					fieldtype: "Link",
-					'label': __('Company'),
+					label: __("Company"),
-					'options': 'Company',
+					options: "Company",
-					"get_query": function () {
+					get_query: function () {
 						return {
-							filters: [
+							filters: [["Company", "name", "!=", frm.doc.company]],
-								["Company", "name", "!=", frm.doc.company]
-							]
 						};
 					},
-					'reqd': 1
+					reqd: 1,
-				}
+				},
 			],
 		});
-		d.set_primary_action(__('Create'), function() {
+		d.set_primary_action(__("Create"), function () {
 			d.hide();
 			var args = d.get_values();
 			frappe.call({
 				args: {
-					"name": frm.doc.name,
+					name: frm.doc.name,
-					"voucher_type": frm.doc.voucher_type,
+					voucher_type: frm.doc.voucher_type,
-					"company": args.company
+					company: args.company,
 				},
 				method: "erpnext.accounts.doctype.journal_entry.journal_entry.make_inter_company_journal_entry",
 				callback: function (r) {
@@ -116,7 +151,7 @@ frappe.ui.form.on("Journal Entry", {
 						var doc = frappe.model.sync(r.message)[0];
 						frappe.set_route("Form", doc.doctype, doc.name);
 					}
-				}
+				},
 			});
 		});
 		d.show();
@@ -131,7 +166,7 @@ frappe.ui.form.on("Journal Entry", {
 
 		$.each(frm.doc.accounts || [], function (i, row) {
 			erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name);
-		})
+		});
 	},
 
 	company: function (frm) {
@@ -139,8 +174,8 @@ frappe.ui.form.on("Journal Entry", {
 			method: "frappe.client.get_value",
 			args: {
 				doctype: "Company",
-				filters: {"name": frm.doc.company},
+				filters: { name: frm.doc.company },
-				fieldname: "cost_center"
+				fieldname: "cost_center",
 			},
 			callback: function (r) {
 				if (r.message) {
@@ -148,25 +183,31 @@ frappe.ui.form.on("Journal Entry", {
 						frappe.model.set_value(jvd.doctype, jvd.name, "cost_center", r.message.cost_center);
 					});
 				}
-			}
+			},
 		});
 
 		erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
 	},
 
 	voucher_type: function (frm) {
-
 		if (!frm.doc.company) return null;
 
-		if((!(frm.doc.accounts || []).length) || ((frm.doc.accounts || []).length === 1 && !frm.doc.accounts[0].account)) {
+		if (
+			!(frm.doc.accounts || []).length ||
+			((frm.doc.accounts || []).length === 1 && !frm.doc.accounts[0].account)
+		) {
 			if (in_list(["Bank Entry", "Cash Entry"], frm.doc.voucher_type)) {
 				return frappe.call({
 					type: "GET",
 					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
 					args: {
-						"account_type": (frm.doc.voucher_type=="Bank Entry" ?
+						account_type:
-							"Bank" : (frm.doc.voucher_type=="Cash Entry" ? "Cash" : null)),
+							frm.doc.voucher_type == "Bank Entry"
-						"company": frm.doc.company
+								? "Bank"
+								: frm.doc.voucher_type == "Cash Entry"
+								? "Cash"
+								: null,
+						company: frm.doc.company,
 					},
 					callback: function (r) {
 						if (r.message) {
@@ -175,7 +216,7 @@ frappe.ui.form.on("Journal Entry", {
 								update_jv_details(frm.doc, [r.message]);
 							}
 						}
-					}
+					},
 				});
 			}
 		}
@@ -183,29 +224,28 @@ frappe.ui.form.on("Journal Entry", {
 
 	from_template: function (frm) {
 		if (frm.doc.from_template) {
-			frappe.db.get_doc("Journal Entry Template", frm.doc.from_template)
+			frappe.db.get_doc("Journal Entry Template", frm.doc.from_template).then((doc) => {
-				.then((doc) => {
 				frappe.model.clear_table(frm.doc, "accounts");
 				frm.set_value({
-						"company": doc.company,
+					company: doc.company,
-						"voucher_type": doc.voucher_type,
+					voucher_type: doc.voucher_type,
-						"naming_series": doc.naming_series,
+					naming_series: doc.naming_series,
-						"is_opening": doc.is_opening,
+					is_opening: doc.is_opening,
-						"multi_currency": doc.multi_currency
+					multi_currency: doc.multi_currency,
-					})
+				});
 				update_jv_details(frm.doc, doc.accounts);
 			});
 		}
-	}
+	},
 });
 
 var update_jv_details = function (doc, r) {
 	$.each(r, function (i, d) {
 		var row = frappe.model.add_child(doc, "Journal Entry Account", "accounts");
-		frappe.model.set_value(row.doctype, row.name, "account", d.account)
+		frappe.model.set_value(row.doctype, row.name, "account", d.account);
 	});
 	refresh_field("accounts");
-}
+};
 
 erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Controller {
 	onload() {
@@ -226,7 +266,8 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 				frappe.model.set_default_values(jvd);
 			});
 			var posting_date = this.frm.doc.posting_date;
-			if(!this.frm.doc.amended_from) this.frm.set_value('posting_date', posting_date || frappe.datetime.get_today());
+			if (!this.frm.doc.amended_from)
+				this.frm.set_value("posting_date", posting_date || frappe.datetime.get_today());
 		}
 	}
 
@@ -243,9 +284,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 			return {
 				query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
 				filters: {
-					'account': row.account
+					account: row.account,
-				}
+				},
-			}
+			};
 		});
 
 		me.frm.set_query("reference_name", "accounts", function (doc, cdt, cdn) {
@@ -258,15 +299,13 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 					query: "erpnext.accounts.doctype.journal_entry.journal_entry.get_against_jv",
 					filters: {
 						account: jvd.account,
-						party: jvd.party
+						party: jvd.party,
-					}
+					},
 				};
 			}
 
 			var out = {
-				filters: [
+				filters: [[jvd.reference_type, "docstatus", "=", 1]],
-					[jvd.reference_type, "docstatus", "=", 1]
-				]
 			};
 
 			if (in_list(["Sales Invoice", "Purchase Invoice"], jvd.reference_type)) {
@@ -279,7 +318,6 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 				frappe.model.validate_missing(jvd, "account");
 				var party_account_field = jvd.reference_type === "Sales Invoice" ? "debit_to" : "credit_to";
 				out.filters.push([jvd.reference_type, party_account_field, "=", jvd.account]);
-
 			}
 
 			if (in_list(["Sales Order", "Purchase Order"], jvd.reference_type)) {
@@ -305,8 +343,6 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 
 			return out;
 		});
-
-
 	}
 
 	reference_name(doc, cdt, cdn) {
@@ -314,24 +350,24 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 
 		if (d.reference_name) {
 			if (d.reference_type === "Purchase Invoice" && !flt(d.debit)) {
-				this.get_outstanding('Purchase Invoice', d.reference_name, doc.company, d);
+				this.get_outstanding("Purchase Invoice", d.reference_name, doc.company, d);
 			} else if (d.reference_type === "Sales Invoice" && !flt(d.credit)) {
-				this.get_outstanding('Sales Invoice', d.reference_name, doc.company, d);
+				this.get_outstanding("Sales Invoice", d.reference_name, doc.company, d);
 			} else if (d.reference_type === "Journal Entry" && !flt(d.credit) && !flt(d.debit)) {
-				this.get_outstanding('Journal Entry', d.reference_name, doc.company, d);
+				this.get_outstanding("Journal Entry", d.reference_name, doc.company, d);
 			}
 		}
 	}
 
 	get_outstanding(doctype, docname, company, child) {
 		var args = {
-			"doctype": doctype,
+			doctype: doctype,
-			"docname": docname,
+			docname: docname,
-			"party": child.party,
+			party: child.party,
-			"account": child.account,
+			account: child.account,
-			"account_currency": child.account_currency,
+			account_currency: child.account_currency,
-			"company": company
+			company: company,
-		}
+		};
 
 		return frappe.call({
 			method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_outstanding",
@@ -340,9 +376,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 				if (r.message) {
 					$.each(r.message, function (field, value) {
 						frappe.model.set_value(child.doctype, child.name, field, value);
-					})
+					});
-				}
 				}
+			},
 		});
 	}
 
@@ -368,15 +404,15 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 		}
 		cur_frm.cscript.update_totals(doc);
 
-		erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, 'accounts');
+		erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, "accounts");
 	}
-
 };
 
 cur_frm.script_manager.make(erpnext.accounts.JournalEntry);
 
 cur_frm.cscript.update_totals = function (doc) {
-	var td=0.0; var tc =0.0;
+	var td = 0.0;
+	var tc = 0.0;
 	var accounts = doc.accounts || [];
 	for (var i in accounts) {
 		td += flt(accounts[i].debit, precision("debit", accounts[i]));
@@ -385,18 +421,20 @@ cur_frm.cscript.update_totals = function(doc) {
 	doc = locals[doc.doctype][doc.name];
 	doc.total_debit = td;
 	doc.total_credit = tc;
-	doc.difference = flt((td - tc), precision("difference"));
+	doc.difference = flt(td - tc, precision("difference"));
-	refresh_many(['total_debit','total_credit','difference']);
+	refresh_many(["total_debit", "total_credit", "difference"]);
-}
+};
 
 cur_frm.cscript.get_balance = function (doc, dt, dn) {
 	cur_frm.cscript.update_totals(doc);
-	cur_frm.call('get_balance', null, () => { cur_frm.refresh(); });
+	cur_frm.call("get_balance", null, () => {
-}
+		cur_frm.refresh();
+	});
+};
 
 cur_frm.cscript.validate = function (doc, cdt, cdn) {
 	cur_frm.cscript.update_totals(doc);
-}
+};
 
 frappe.ui.form.on("Journal Entry Account", {
 	party: function (frm, cdt, cdn) {
@@ -410,7 +448,7 @@ frappe.ui.form.on("Journal Entry Account", {
 					company: frm.doc.company,
 					party_type: d.party_type,
 					party: d.party,
-				}
+				},
 			});
 		}
 	},
@@ -447,8 +485,8 @@ frappe.ui.form.on("Journal Entry Account", {
 		}
 
 		erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
-	}
+	},
-})
+});
 
 frappe.ui.form.on("Journal Entry Account", "accounts_remove", function (frm) {
 	cur_frm.cscript.update_totals(frm.doc);
@@ -463,27 +501,35 @@ $.extend(erpnext.journal_entry, {
 
 		// dynamic label
 		var field_label_map = {
-			"debit_in_account_currency": "Debit",
+			debit_in_account_currency: "Debit",
-			"credit_in_account_currency": "Credit"
+			credit_in_account_currency: "Credit",
 		};
 
 		$.each(field_label_map, function (fieldname, label) {
 			frm.fields_dict.accounts.grid.update_docfield_property(
 				fieldname,
-				'label',
+				"label",
-				frm.doc.multi_currency ? (label + " in Account Currency") : label
+				frm.doc.multi_currency ? label + " in Account Currency" : label
 			);
-		})
+		});
 	},
 
 	set_debit_credit_in_company_currency: function (frm, cdt, cdn) {
 		var row = locals[cdt][cdn];
 
-		frappe.model.set_value(cdt, cdn, "debit",
+		frappe.model.set_value(
-			flt(flt(row.debit_in_account_currency)*row.exchange_rate, precision("debit", row)));
+			cdt,
+			cdn,
+			"debit",
+			flt(flt(row.debit_in_account_currency) * row.exchange_rate, precision("debit", row))
+		);
 
-		frappe.model.set_value(cdt, cdn, "credit",
+		frappe.model.set_value(
-			flt(flt(row.credit_in_account_currency)*row.exchange_rate, precision("credit", row)));
+			cdt,
+			cdn,
+			"credit",
+			flt(flt(row.credit_in_account_currency) * row.exchange_rate, precision("credit", row))
+		);
 
 		cur_frm.cscript.update_totals(frm.doc);
 	},
@@ -507,15 +553,15 @@ $.extend(erpnext.journal_entry, {
 					reference_name: cstr(row.reference_name),
 					debit: flt(row.debit_in_account_currency),
 					credit: flt(row.credit_in_account_currency),
-					exchange_rate: row.exchange_rate
+					exchange_rate: row.exchange_rate,
 				},
 				callback: function (r) {
 					if (r.message) {
 						row.exchange_rate = r.message;
 						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 					}
-				}
+				},
-			})
+			});
 		} else {
 			erpnext.journal_entry.set_debit_credit_in_company_currency(frm, cdt, cdn);
 		}
@@ -524,30 +570,50 @@ $.extend(erpnext.journal_entry, {
 
 	quick_entry: function (frm) {
 		var naming_series_options = frm.fields_dict.naming_series.df.options;
-		var naming_series_default = frm.fields_dict.naming_series.df.default || naming_series_options.split("\n")[0];
+		var naming_series_default =
+			frm.fields_dict.naming_series.df.default || naming_series_options.split("\n")[0];
 
 		var dialog = new frappe.ui.Dialog({
 			title: __("Quick Journal Entry"),
 			fields: [
 				{ fieldtype: "Currency", fieldname: "debit", label: __("Amount"), reqd: 1 },
-				{fieldtype: "Link", fieldname: "debit_account", label: __("Debit Account"), reqd: 1,
+				{
+					fieldtype: "Link",
+					fieldname: "debit_account",
+					label: __("Debit Account"),
+					reqd: 1,
 					options: "Account",
 					get_query: function () {
 						return erpnext.journal_entry.account_query(frm);
-					}
 					},
-				{fieldtype: "Link", fieldname: "credit_account", label: __("Credit Account"), reqd: 1,
+				},
+				{
+					fieldtype: "Link",
+					fieldname: "credit_account",
+					label: __("Credit Account"),
+					reqd: 1,
 					options: "Account",
 					get_query: function () {
 						return erpnext.journal_entry.account_query(frm);
-					}
 					},
-				{fieldtype: "Date", fieldname: "posting_date", label: __("Date"), reqd: 1,
+				},
-					default: frm.doc.posting_date},
+				{
+					fieldtype: "Date",
+					fieldname: "posting_date",
+					label: __("Date"),
+					reqd: 1,
+					default: frm.doc.posting_date,
+				},
 				{ fieldtype: "Small Text", fieldname: "user_remark", label: __("User Remark") },
-				{fieldtype: "Select", fieldname: "naming_series", label: __("Series"), reqd: 1,
+				{
-					options: naming_series_options, default: naming_series_default},
+					fieldtype: "Select",
-			]
+					fieldname: "naming_series",
+					label: __("Series"),
+					reqd: 1,
+					options: naming_series_options,
+					default: naming_series_default,
+				},
+			],
 		});
 
 		dialog.set_primary_action(__("Save"), function () {
@@ -567,11 +633,21 @@ $.extend(erpnext.journal_entry, {
 
 			var debit_row = frm.fields_dict.accounts.grid.add_new_row();
 			frappe.model.set_value(debit_row.doctype, debit_row.name, "account", values.debit_account);
-			frappe.model.set_value(debit_row.doctype, debit_row.name, "debit_in_account_currency", values.debit);
+			frappe.model.set_value(
+				debit_row.doctype,
+				debit_row.name,
+				"debit_in_account_currency",
+				values.debit
+			);
 
 			var credit_row = frm.fields_dict.accounts.grid.add_new_row();
 			frappe.model.set_value(credit_row.doctype, credit_row.name, "account", values.credit_account);
-			frappe.model.set_value(credit_row.doctype, credit_row.name, "credit_in_account_currency", values.debit);
+			frappe.model.set_value(
+				credit_row.doctype,
+				credit_row.name,
+				"credit_in_account_currency",
+				values.debit
+			);
 
 			frm.save();
 
@@ -584,11 +660,14 @@ $.extend(erpnext.journal_entry, {
 	account_query: function (frm) {
 		var filters = {
 			company: frm.doc.company,
-			is_group: 0
+			is_group: 0,
 		};
 		if (!frm.doc.multi_currency) {
 			$.extend(filters, {
-				account_currency: ['in', [frappe.get_doc(":Company", frm.doc.company).default_currency, null]]
+				account_currency: [
+					"in",
+					[frappe.get_doc(":Company", frm.doc.company).default_currency, null],
+				],
 			});
 		}
 		return { filters: filters };
@@ -597,8 +676,8 @@ $.extend(erpnext.journal_entry, {
 	reverse_journal_entry: function () {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.journal_entry.journal_entry.make_reverse_journal_entry",
-			frm: cur_frm
+			frm: cur_frm,
-		})
+		});
 	},
 });
 
@@ -623,9 +702,9 @@ $.extend(erpnext.journal_entry, {
 					if (r.message) {
 						$.extend(d, r.message);
 						erpnext.journal_entry.set_debit_credit_in_company_currency(frm, dt, dn);
-						refresh_field('accounts');
+						refresh_field("accounts");
-					}
 					}
+				},
 			});
 		}
 	},

erpnext/accounts/doctype/journal_entry/journal_entry_list.js

@@ -1,12 +1,12 @@
-frappe.listview_settings['Journal Entry'] = {
+frappe.listview_settings["Journal Entry"] = {
 	add_fields: ["voucher_type", "posting_date", "total_debit", "company", "user_remark"],
 	get_indicator: function (doc) {
 		if (doc.docstatus == 0) {
-			return [__("Draft", "red", "docstatus,=,0")]
+			return [__("Draft", "red", "docstatus,=,0")];
 		} else if (doc.docstatus == 2) {
-			return [__("Cancelled", "grey", "docstatus,=,2")]
+			return [__("Cancelled", "grey", "docstatus,=,2")];
 		} else {
-			return [__(doc.voucher_type), "blue", "voucher_type,=," + doc.voucher_type]
+			return [__(doc.voucher_type), "blue", "voucher_type,=," + doc.voucher_type];
-		}
 		}
+	},
 };

erpnext/accounts/doctype/journal_entry_template/journal_entry_template.js

@@ -13,7 +13,7 @@ frappe.ui.form.on("Journal Entry Template", {
 						frm.set_value("naming_series", r.message.split("\n")[0]);
 						frm.refresh_field("naming_series");
 					}
-				}
+				},
 			});
 		}
 	},
@@ -23,12 +23,15 @@ frappe.ui.form.on("Journal Entry Template", {
 		frm.set_query("account", "accounts", function () {
 			var filters = {
 				company: frm.doc.company,
-				is_group: 0
+				is_group: 0,
 			};
 
 			if (!frm.doc.multi_currency) {
 				$.extend(filters, {
-					account_currency: ['in', [frappe.get_doc(":Company", frm.doc.company).default_currency, null]]
+					account_currency: [
+						"in",
+						[frappe.get_doc(":Company", frm.doc.company).default_currency, null],
+					],
 				});
 			}
 
@@ -54,9 +57,13 @@ frappe.ui.form.on("Journal Entry Template", {
 					type: "GET",
 					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_default_bank_cash_account",
 					args: {
-						"account_type": (frm.doc.voucher_type=="Bank Entry" ?
+						account_type:
-							"Bank" : (frm.doc.voucher_type=="Cash Entry" ? "Cash" : null)),
+							frm.doc.voucher_type == "Bank Entry"
-						"company": frm.doc.company
+								? "Bank"
+								: frm.doc.voucher_type == "Cash Entry"
+								? "Cash"
+								: null,
+						company: frm.doc.company,
 					},
 					callback: function (r) {
 						if (r.message) {
@@ -65,7 +72,7 @@ frappe.ui.form.on("Journal Entry Template", {
 								add_accounts(frm.doc, [r.message]);
 							}
 						}
-					}
+					},
 				});
 				break;
 			default:
@@ -75,5 +82,5 @@ frappe.ui.form.on("Journal Entry Template", {
 	clear_child: function (frm) {
 		frappe.model.clear_table(frm.doc, "accounts");
 		frm.refresh_field("accounts");
-	}
+	},
 });

erpnext/accounts/doctype/ledger_merge/ledger_merge.js

@@ -1,9 +1,9 @@
 // Copyright (c) 2021, Wahni Green Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Ledger Merge', {
+frappe.ui.form.on("Ledger Merge", {
 	setup: function (frm) {
-		frappe.realtime.on('ledger_merge_refresh', ({ ledger_merge }) => {
+		frappe.realtime.on("ledger_merge_refresh", ({ ledger_merge }) => {
 			if (ledger_merge !== frm.doc.name) return;
 			frappe.model.clear_doc(frm.doc.doctype, frm.doc.name);
 			frappe.model.with_doc(frm.doc.doctype, frm.doc.name).then(() => {
@@ -11,29 +11,29 @@ frappe.ui.form.on('Ledger Merge', {
 			});
 		});
 
-		frappe.realtime.on('ledger_merge_progress', data => {
+		frappe.realtime.on("ledger_merge_progress", (data) => {
 			if (data.ledger_merge !== frm.doc.name) return;
-			let message = __('Merging {0} of {1}', [data.current, data.total]);
+			let message = __("Merging {0} of {1}", [data.current, data.total]);
 			let percent = Math.floor((data.current * 100) / data.total);
-			frm.dashboard.show_progress(__('Merge Progress'), percent, message);
+			frm.dashboard.show_progress(__("Merge Progress"), percent, message);
-			frm.page.set_indicator(__('In Progress'), 'orange');
+			frm.page.set_indicator(__("In Progress"), "orange");
 		});
 
 		frm.set_query("account", function (doc) {
-			if (!doc.company) frappe.throw(__('Please set Company'));
+			if (!doc.company) frappe.throw(__("Please set Company"));
-			if (!doc.root_type) frappe.throw(__('Please set Root Type'));
+			if (!doc.root_type) frappe.throw(__("Please set Root Type"));
 			return {
 				filters: {
 					root_type: doc.root_type,
-					company: doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 
-		frm.set_query('account', 'merge_accounts', function(doc) {
+		frm.set_query("account", "merge_accounts", function (doc) {
-			if (!doc.company) frappe.throw(__('Please set Company'));
+			if (!doc.company) frappe.throw(__("Please set Company"));
-			if (!doc.root_type) frappe.throw(__('Please set Root Type'));
+			if (!doc.root_type) frappe.throw(__("Please set Root Type"));
-			if (!doc.account) frappe.throw(__('Please set Account'));
+			if (!doc.account) frappe.throw(__("Please set Account"));
 			let acc = [doc.account];
 			frm.doc.merge_accounts.forEach((row) => {
 				acc.push(row.account);
@@ -43,21 +43,21 @@ frappe.ui.form.on('Ledger Merge', {
 					is_group: doc.is_group,
 					root_type: doc.root_type,
 					name: ["not in", acc],
-					company: doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 	},
 
 	refresh: function (frm) {
 		frm.page.hide_icon_group();
-		frm.trigger('set_merge_status');
+		frm.trigger("set_merge_status");
-		frm.trigger('update_primary_action');
+		frm.trigger("update_primary_action");
 	},
 
 	after_save: function (frm) {
 		setTimeout(() => {
-			frm.trigger('update_primary_action');
+			frm.trigger("update_primary_action");
 		}, 500);
 	},
 
@@ -67,22 +67,22 @@ frappe.ui.form.on('Ledger Merge', {
 			return;
 		}
 		frm.disable_save();
-		if (frm.doc.status !== 'Success') {
+		if (frm.doc.status !== "Success") {
 			if (!frm.is_new()) {
-				let label = frm.doc.status === 'Pending' ? __('Start Merge') : __('Retry');
+				let label = frm.doc.status === "Pending" ? __("Start Merge") : __("Retry");
 				frm.page.set_primary_action(label, () => frm.events.start_merge(frm));
 			} else {
-				frm.page.set_primary_action(__('Save'), () => frm.save());
+				frm.page.set_primary_action(__("Save"), () => frm.save());
 			}
 		}
 	},
 
 	start_merge: function (frm) {
 		frm.call({
-			method: 'form_start_merge',
+			method: "form_start_merge",
 			args: { docname: frm.doc.name },
-			btn: frm.page.btn_primary
+			btn: frm.page.btn_primary,
-		}).then(r => {
+		}).then((r) => {
 			if (r.message === true) {
 				frm.disable_save();
 			}
@@ -96,33 +96,33 @@ frappe.ui.form.on('Ledger Merge', {
 			if (row.merged) successful_records += 1;
 		});
 		let message_args = [successful_records, frm.doc.merge_accounts.length];
-		frm.dashboard.set_headline(__('Successfully merged {0} out of {1}.', message_args));
+		frm.dashboard.set_headline(__("Successfully merged {0} out of {1}.", message_args));
 	},
 
 	root_type: function (frm) {
-		frm.set_value('account', '');
+		frm.set_value("account", "");
-		frm.set_value('merge_accounts', []);
+		frm.set_value("merge_accounts", []);
 	},
 
 	company: function (frm) {
-		frm.set_value('account', '');
+		frm.set_value("account", "");
-		frm.set_value('merge_accounts', []);
+		frm.set_value("merge_accounts", []);
-	}
+	},
 });
 
-frappe.ui.form.on('Ledger Merge Accounts', {
+frappe.ui.form.on("Ledger Merge Accounts", {
 	merge_accounts_add: function (frm) {
-		frm.trigger('update_primary_action');
+		frm.trigger("update_primary_action");
 	},
 
 	merge_accounts_remove: function (frm) {
-		frm.trigger('update_primary_action');
+		frm.trigger("update_primary_action");
 	},
 
 	account: function (frm, cdt, cdn) {
 		let row = frappe.get_doc(cdt, cdn);
 		row.account_name = row.account;
-		frm.refresh_field('merge_accounts');
+		frm.refresh_field("merge_accounts");
-		frm.trigger('update_primary_action');
+		frm.trigger("update_primary_action");
-	}
+	},
 });

erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.js

@@ -1,8 +1,6 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Loyalty Point Entry', {
+frappe.ui.form.on("Loyalty Point Entry", {
-	refresh: function(frm) {
+	refresh: function (frm) {},
-
-	}
 });

erpnext/accounts/doctype/loyalty_program/loyalty_program.js

@@ -3,30 +3,37 @@
 
 frappe.provide("erpnext.accounts.dimensions");
 
-frappe.ui.form.on('Loyalty Program', {
+frappe.ui.form.on("Loyalty Program", {
 	setup: function (frm) {
-		var help_content =
+		var help_content = `<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
-			`<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
 				<tr><td>
 					<h4>
 						<i class="fa fa-hand-right"></i>
-						${__('Notes')}
+						${__("Notes")}
 					</h4>
 					<ul>
 						<li>
-							${__("Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.")}
+							${__(
+								"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
+							)}
 						</li>
 						<li>
-							${__("There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier.")}
+							${__(
+								"There can be multiple tiered collection factor based on the total spent. But the conversion factor for redemption will always be same for all the tier."
+							)}
 						</li>
 						<li>
-							${__("In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent")}
+							${__(
+								"In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
+							)}
 						</li>
 						<li>
 							${__("If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0.")}
 						</li>
 						<li>
-							${__("If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)")}
+							${__(
+								"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)"
+							)}
 						</li>
 						<li>
 							${__("One customer can be part of only single Loyalty Program.")}
@@ -41,10 +48,10 @@ frappe.ui.form.on('Loyalty Program', {
 		frm.set_query("expense_account", function (doc) {
 			return {
 				filters: {
-					"root_type": "Expense",
+					root_type: "Expense",
-					'is_group': 0,
+					is_group: 0,
-					'company': doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 
@@ -54,11 +61,13 @@ frappe.ui.form.on('Loyalty Program', {
 
 	refresh: function (frm) {
 		if (frm.doc.loyalty_program_type === "Single Tier Program" && frm.doc.collection_rules.length > 1) {
-			frappe.throw(__("Please select the Multiple Tier Program type for more than one collection rules."));
+			frappe.throw(
+				__("Please select the Multiple Tier Program type for more than one collection rules.")
+			);
 		}
 	},
 
 	company: function (frm) {
 		erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
-	}
+	},
 });

erpnext/accounts/doctype/mode_of_payment/mode_of_payment.js

@@ -1,16 +1,16 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on('Mode of Payment', {
+frappe.ui.form.on("Mode of Payment", {
 	setup: function (frm) {
 		frm.set_query("default_account", "accounts", function (doc, cdt, cdn) {
 			let d = locals[cdt][cdn];
 			return {
 				filters: [
-					['Account', 'account_type', 'in', 'Bank, Cash, Receivable'],
+					["Account", "account_type", "in", "Bank, Cash, Receivable"],
-					['Account', 'is_group', '=', 0],
+					["Account", "is_group", "=", 0],
-					['Account', 'company', '=', d.company]
+					["Account", "company", "=", d.company],
-				]
+				],
 			};
 		});
 	},

erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js

@@ -1,16 +1,16 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on('Monthly Distribution', {
+frappe.ui.form.on("Monthly Distribution", {
 	onload(frm) {
 		if (frm.doc.__islocal) {
-			return frm.call('get_months').then(() => {
+			return frm.call("get_months").then(() => {
-				frm.refresh_field('percentages');
+				frm.refresh_field("percentages");
 			});
 		}
 	},
 
 	refresh(frm) {
-		frm.toggle_display('distribution_id', frm.doc.__islocal);
+		frm.toggle_display("distribution_id", frm.doc.__islocal);
-	}
+	},
 });

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js

@@ -1,39 +1,43 @@
 // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Opening Invoice Creation Tool', {
+frappe.ui.form.on("Opening Invoice Creation Tool", {
 	setup: function (frm) {
-		frm.set_query('party_type', 'invoices', function(doc, cdt, cdn) {
+		frm.set_query("party_type", "invoices", function (doc, cdt, cdn) {
 			return {
 				filters: {
-					'name': ['in', 'Customer, Supplier']
+					name: ["in", "Customer, Supplier"],
-				}
+				},
 			};
 		});
 
 		if (frm.doc.company) {
-			frm.trigger('setup_company_filters');
+			frm.trigger("setup_company_filters");
 		}
 
-		frappe.realtime.on('opening_invoice_creation_progress', data => {
+		frappe.realtime.on("opening_invoice_creation_progress", (data) => {
 			if (!frm.doc.import_in_progress) {
 				frm.dashboard.reset();
 				frm.doc.import_in_progress = true;
 			}
 			if (data.count == data.total) {
-				setTimeout(() => {
+				setTimeout(
+					() => {
 						frm.doc.import_in_progress = false;
 						frm.clear_table("invoices");
 						frm.refresh_fields();
 						frm.page.clear_indicator();
 						frm.dashboard.hide_progress();
 						frappe.msgprint(__("Opening {0} Invoices created", [frm.doc.invoice_type]));
-				}, 1500, data.title);
+					},
+					1500,
+					data.title
+				);
 				return;
 			}
 
 			frm.dashboard.show_progress(data.title, (data.count / data.total) * 100, data.message);
-			frm.page.set_indicator(__('In Progress'), 'orange');
+			frm.page.set_indicator(__("In Progress"), "orange");
 		});
 
 		erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);
@@ -42,7 +46,7 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 	refresh: function (frm) {
 		frm.disable_save();
 		!frm.doc.import_in_progress && frm.trigger("make_dashboard");
-		frm.page.set_primary_action(__('Create Invoices'), () => {
+		frm.page.set_primary_action(__("Create Invoices"), () => {
 			let btn_primary = frm.page.btn_primary.get(0);
 			return frm.call({
 				doc: frm.doc,
@@ -59,48 +63,47 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 	},
 
 	setup_company_filters: function (frm) {
-		frm.set_query('cost_center', 'invoices', function(doc, cdt, cdn) {
+		frm.set_query("cost_center", "invoices", function (doc, cdt, cdn) {
 			return {
 				filters: {
-					'company': doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 
-		frm.set_query('cost_center', function(doc) {
+		frm.set_query("cost_center", function (doc) {
 			return {
 				filters: {
-					'company': doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 
-		frm.set_query('temporary_opening_account', 'invoices', function(doc, cdt, cdn) {
+		frm.set_query("temporary_opening_account", "invoices", function (doc, cdt, cdn) {
 			return {
 				filters: {
-					'company': doc.company
+					company: doc.company,
-				}
+				},
-			}
+			};
 		});
 	},
 
 	company: function (frm) {
 		if (frm.doc.company) {
-
+			frm.trigger("setup_company_filters");
-			frm.trigger('setup_company_filters');
 
 			frappe.call({
-				method: 'erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool.get_temporary_opening_account',
+				method: "erpnext.accounts.doctype.opening_invoice_creation_tool.opening_invoice_creation_tool.get_temporary_opening_account",
 				args: {
-					company: frm.doc.company
+					company: frm.doc.company,
 				},
 				callback: (r) => {
 					if (r.message) {
 						frm.doc.__onload.temporary_opening_account = r.message;
-						frm.trigger('update_invoice_table');
+						frm.trigger("update_invoice_table");
 					}
-				}
+				},
-			})
+			});
 		}
 		erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
 	},
@@ -118,18 +121,17 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 		let opening_invoices_summary = frm.doc.__onload.opening_invoices_summary;
 		if (!$.isEmptyObject(opening_invoices_summary)) {
 			let section = frm.dashboard.add_section(
-				frappe.render_template('opening_invoice_creation_tool_dashboard', {
+				frappe.render_template("opening_invoice_creation_tool_dashboard", {
 					data: opening_invoices_summary,
-					max_count: max_count
+					max_count: max_count,
 				}),
 				__("Opening Invoices Summary")
 			);
 
-			section.on('click', '.invoice-link', function() {
+			section.on("click", ".invoice-link", function () {
-				let doctype = $(this).attr('data-type');
+				let doctype = $(this).attr("data-type");
-				let company = $(this).attr('data-company');
+				let company = $(this).attr("data-company");
-				frappe.set_route('List', doctype,
+				frappe.set_route("List", doctype, { is_opening: "Yes", company: company, docstatus: 1 });
-					{'is_opening': 'Yes', 'company': company, 'docstatus': 1});
 			});
 			frm.dashboard.show();
 		}
@@ -147,11 +149,11 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 
 			row.party_type = frm.doc.invoice_type == "Sales" ? "Customer" : "Supplier";
 		});
-	}
+	},
 });
 
-frappe.ui.form.on('Opening Invoice Creation Tool Item', {
+frappe.ui.form.on("Opening Invoice Creation Tool Item", {
 	invoices_add: (frm) => {
-		frm.trigger('update_invoice_table');
+		frm.trigger("update_invoice_table");
-	}
+	},
 });

erpnext/accounts/doctype/party_link/party_link.js

@@ -1,33 +1,34 @@
 // Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Party Link', {
+frappe.ui.form.on("Party Link", {
 	refresh: function (frm) {
-		frm.set_query('primary_role', () => {
+		frm.set_query("primary_role", () => {
 			return {
 				filters: {
-					name: ['in', ['Customer', 'Supplier']]
+					name: ["in", ["Customer", "Supplier"]],
-				}
+				},
 			};
 		});
 
-		frm.set_query('secondary_role', () => {
+		frm.set_query("secondary_role", () => {
-			let party_types = Object.keys(frappe.boot.party_account_types)
+			let party_types = Object.keys(frappe.boot.party_account_types).filter(
-				.filter(p => p != frm.doc.primary_role);
+				(p) => p != frm.doc.primary_role
+			);
 			return {
 				filters: {
-					name: ['in', party_types]
+					name: ["in", party_types],
-				}
+				},
 			};
 		});
 	},
 
 	primary_role(frm) {
-		frm.set_value('primary_party', '');
+		frm.set_value("primary_party", "");
-		frm.set_value('secondary_role', '');
+		frm.set_value("secondary_role", "");
 	},
 
 	secondary_role(frm) {
-		frm.set_value('secondary_party', '');
+		frm.set_value("secondary_party", "");
-	}
+	},
 });

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -1185,7 +1185,13 @@ class PaymentEntry(AccountsController):
 				references = [x for x in self.get("references") if x.name == entry.name]
 
 			for ref in references:
-				if ref.reference_doctype in ("Sales Invoice", "Purchase Invoice", "Journal Entry"):
+				if ref.reference_doctype in (
+					"Sales Invoice",
+					"Purchase Invoice",
+					"Journal Entry",
+					"Sales Order",
+					"Purchase Order",
+				):
 					self.add_advance_gl_for_reference(gl_entries, ref)
 
 	def add_advance_gl_for_reference(self, gl_entries, invoice):
@@ -1199,14 +1205,15 @@ class PaymentEntry(AccountsController):
 			"voucher_detail_no": invoice.name,
 		}
 
-		posting_date = frappe.db.get_value(
+		date_field = "posting_date"
-			invoice.reference_doctype, invoice.reference_name, "posting_date"
+		if invoice.reference_doctype in ["Sales Order", "Purchase Order"]:
-		)
+			date_field = "transaction_date"
+		posting_date = frappe.db.get_value(invoice.reference_doctype, invoice.reference_name, date_field)
 
 		if getdate(posting_date) < getdate(self.posting_date):
 			posting_date = self.posting_date
 
-		dr_or_cr = "credit" if invoice.reference_doctype == "Sales Invoice" else "debit"
+		dr_or_cr = "credit" if invoice.reference_doctype in ["Sales Invoice", "Sales Order"] else "debit"
 		args_dict["account"] = invoice.account
 		args_dict[dr_or_cr] = invoice.allocated_amount
 		args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount
@@ -2108,6 +2115,11 @@ def get_reference_details(reference_doctype, reference_name, party_account_curre
 		else:
 			outstanding_amount = flt(total_amount) - flt(ref_doc.get("advance_paid"))
 
+		if reference_doctype in ["Sales Order", "Purchase Order"]:
+			party_type = "Customer" if reference_doctype == "Sales Order" else "Supplier"
+			party_field = "customer" if reference_doctype == "Sales Order" else "supplier"
+			party = ref_doc.get(party_field)
+			account = get_party_account(party_type, party, ref_doc.company)
 	else:
 		# Get the exchange rate based on the posting date of the ref doc.
 		exchange_rate = get_exchange_rate(party_account_currency, company_currency, ref_doc.posting_date)

erpnext/accounts/doctype/payment_entry/payment_entry_list.js

@@ -1,14 +1,13 @@
-frappe.listview_settings['Payment Entry'] = {
+frappe.listview_settings["Payment Entry"] = {
-
 	onload: function (listview) {
 		if (listview.page.fields_dict.party_type) {
 			listview.page.fields_dict.party_type.get_query = function () {
 				return {
-					"filters": {
+					filters: {
-						"name": ["in", Object.keys(frappe.boot.party_account_types)],
+						name: ["in", Object.keys(frappe.boot.party_account_types)],
-					}
+					},
 				};
 			};
 		}
-	}
+	},
 };

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

@@ -1070,6 +1070,8 @@ class TestPaymentEntry(FrappeTestCase):
 		self.assertRaises(frappe.ValidationError, pe_draft.submit)
 
 	def test_details_update_on_reference_table(self):
+		from erpnext.accounts.party import get_party_account
+
 		so = make_sales_order(
 			customer="_Test Customer USD", currency="USD", qty=1, rate=100, do_not_submit=True
 		)
@@ -1084,6 +1086,7 @@ class TestPaymentEntry(FrappeTestCase):
 
 		ref_details = get_reference_details(so.doctype, so.name, pe.paid_from_account_currency)
 		expected_response = {
+			"account": get_party_account("Customer", so.customer, so.company),
 			"total_amount": 5000.0,
 			"outstanding_amount": 5000.0,
 			"exchange_rate": 1.0,

erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.js

@@ -1,11 +1,11 @@
 // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on('Payment Gateway Account', {
+frappe.ui.form.on("Payment Gateway Account", {
 	refresh(frm) {
 		erpnext.utils.check_payments_app();
 		if (!frm.doc.__islocal) {
-			frm.set_df_property('payment_gateway', 'read_only', 1);
+			frm.set_df_property("payment_gateway", "read_only", 1);
-		}
 		}
+	},
 });

erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.js

@@ -1,8 +1,7 @@
 // Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Ledger Entry', {
+frappe.ui.form.on("Payment Ledger Entry", {
 	// refresh: function(frm) {
-
 	// }
 });

erpnext/accounts/doctype/payment_order/payment_order.js

@@ -1,34 +1,42 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Order', {
+frappe.ui.form.on("Payment Order", {
 	setup: function (frm) {
 		frm.set_query("company_bank_account", function () {
 			return {
 				filters: {
-					"is_company_account":1
+					is_company_account: 1,
-				}
+				},
-			}
+			};
 		});
 
-		frm.set_df_property('references', 'cannot_add_rows', true);
+		frm.set_df_property("references", "cannot_add_rows", true);
 	},
 	refresh: function (frm) {
 		if (frm.doc.docstatus == 0) {
-			frm.add_custom_button(__('Payment Request'), function() {
+			frm.add_custom_button(
+				__("Payment Request"),
+				function () {
 					frm.trigger("get_from_payment_request");
-			}, __("Get Payments from"));
+				},
+				__("Get Payments from")
+			);
 
-			frm.add_custom_button(__('Payment Entry'), function() {
+			frm.add_custom_button(
+				__("Payment Entry"),
+				function () {
 					frm.trigger("get_from_payment_entry");
-			}, __("Get Payments from"));
+				},
+				__("Get Payments from")
+			);
 
-			frm.trigger('remove_button');
+			frm.trigger("remove_button");
 		}
 
 		// payment Entry
-		if (frm.doc.docstatus===1 && frm.doc.payment_order_type==='Payment Request') {
+		if (frm.doc.docstatus === 1 && frm.doc.payment_order_type === "Payment Request") {
-			frm.add_custom_button(__('Create Payment Entries'), function() {
+			frm.add_custom_button(__("Create Payment Entries"), function () {
 				frm.trigger("make_payment_records");
 			});
 		}
@@ -47,7 +55,7 @@ frappe.ui.form.on('Payment Order', {
 		let label = ["Payment Request", "Payment Entry"];
 
 		if (frm.doc.references.length > 0 && frm.doc.payment_order_type) {
-			label = label.reduce(x => {
+			label = label.reduce((x) => {
 				x != frm.doc.payment_order_type;
 				return x;
 			});
@@ -63,7 +71,7 @@ frappe.ui.form.on('Payment Order', {
 			target: frm,
 			date_field: "posting_date",
 			setters: {
-				party: frm.doc.supplier || ""
+				party: frm.doc.supplier || "",
 			},
 			get_query_filters: {
 				bank: frm.doc.bank,
@@ -71,8 +79,8 @@ frappe.ui.form.on('Payment Order', {
 				payment_type: ["!=", "Receive"],
 				bank_account: frm.doc.company_bank_account,
 				paid_from: frm.doc.account,
-				payment_order_status: ["=", "Initiated"]
+				payment_order_status: ["=", "Initiated"],
-			}
+			},
 		});
 	},
 
@@ -83,13 +91,13 @@ frappe.ui.form.on('Payment Order', {
 			source_doctype: "Payment Request",
 			target: frm,
 			setters: {
-				party: frm.doc.supplier || ""
+				party: frm.doc.supplier || "",
 			},
 			get_query_filters: {
 				bank: frm.doc.bank,
 				docstatus: 1,
 				status: ["=", "Initiated"],
-			}
+			},
 		});
 	},
 
@@ -97,24 +105,33 @@ frappe.ui.form.on('Payment Order', {
 		var dialog = new frappe.ui.Dialog({
 			title: __("For Supplier"),
 			fields: [
-				{"fieldtype": "Link", "label": __("Supplier"), "fieldname": "supplier", "options":"Supplier",
+				{
-					"get_query": function () {
+					fieldtype: "Link",
+					label: __("Supplier"),
+					fieldname: "supplier",
+					options: "Supplier",
+					get_query: function () {
 						return {
 							query: "erpnext.accounts.doctype.payment_order.payment_order.get_supplier_query",
-							filters: {'parent': frm.doc.name}
+							filters: { parent: frm.doc.name },
-						}
+						};
-					}, "reqd": 1
+					},
+					reqd: 1,
 				},
 
-				{"fieldtype": "Link", "label": __("Mode of Payment"), "fieldname": "mode_of_payment", "options":"Mode of Payment",
+				{
-					"get_query": function () {
+					fieldtype: "Link",
+					label: __("Mode of Payment"),
+					fieldname: "mode_of_payment",
+					options: "Mode of Payment",
+					get_query: function () {
 						return {
 							query: "erpnext.accounts.doctype.payment_order.payment_order.get_mop_query",
-							filters: {'parent': frm.doc.name}
+							filters: { parent: frm.doc.name },
-						}
+						};
-					}
+					},
-				}
+				},
-			]
+			],
 		});
 
 		dialog.set_primary_action(__("Submit"), function () {
@@ -124,17 +141,17 @@ frappe.ui.form.on('Payment Order', {
 			return frappe.call({
 				method: "erpnext.accounts.doctype.payment_order.payment_order.make_payment_records",
 				args: {
-					"name": frm.doc.name,
+					name: frm.doc.name,
-					"supplier": args.supplier,
+					supplier: args.supplier,
-					"mode_of_payment": args.mode_of_payment
+					mode_of_payment: args.mode_of_payment,
 				},
 				freeze: true,
 				callback: function (r) {
 					dialog.hide();
 					frm.refresh();
-				}
+				},
-			})
+			});
-		})
+		});
 
 		dialog.show();
 	},

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -2,97 +2,94 @@
 // For license information, please see license.txt
 
 frappe.provide("erpnext.accounts");
-erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationController extends frappe.ui.form.Controller {
+erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationController extends (
+	frappe.ui.form.Controller
+) {
 	onload() {
-		const default_company = frappe.defaults.get_default('company');
+		const default_company = frappe.defaults.get_default("company");
-		this.frm.set_value('company', default_company);
+		this.frm.set_value("company", default_company);
 
-		this.frm.set_value('party_type', '');
+		this.frm.set_value("party_type", "");
-		this.frm.set_value('party', '');
+		this.frm.set_value("party", "");
-		this.frm.set_value('receivable_payable_account', '');
+		this.frm.set_value("receivable_payable_account", "");
 
 		this.frm.set_query("party_type", () => {
-			return {
-				"filters": {
-					"name": ["in", Object.keys(frappe.boot.party_account_types)],
-				}
-			}
-		});
-
-		this.frm.set_query('receivable_payable_account', () => {
 			return {
 				filters: {
-					"company": this.frm.doc.company,
+					name: ["in", Object.keys(frappe.boot.party_account_types)],
-					"is_group": 0,
+				},
-					"account_type": frappe.boot.party_account_types[this.frm.doc.party_type],
-					"root_type": this.frm.doc.party_type == 'Customer' ? "Asset" : "Liability"
-				}
 			};
 		});
 
-		this.frm.set_query('default_advance_account', () => {
+		this.frm.set_query("receivable_payable_account", () => {
 			return {
 				filters: {
-					"company": this.frm.doc.company,
+					company: this.frm.doc.company,
-					"is_group": 0,
+					is_group: 0,
-					"account_type": this.frm.doc.party_type == 'Customer' ? "Receivable": "Payable",
+					account_type: frappe.boot.party_account_types[this.frm.doc.party_type],
-					"root_type": this.frm.doc.party_type == 'Customer' ? "Liability": "Asset"
+					root_type: this.frm.doc.party_type == "Customer" ? "Asset" : "Liability",
-				}
+				},
 			};
 		});
 
-		this.frm.set_query('bank_cash_account', () => {
+		this.frm.set_query("default_advance_account", () => {
+			return {
+				filters: {
+					company: this.frm.doc.company,
+					is_group: 0,
+					account_type: this.frm.doc.party_type == "Customer" ? "Receivable" : "Payable",
+					root_type: this.frm.doc.party_type == "Customer" ? "Liability" : "Asset",
+				},
+			};
+		});
+
+		this.frm.set_query("bank_cash_account", () => {
 			return {
 				filters: [
-					['Account', 'company', '=', this.frm.doc.company],
+					["Account", "company", "=", this.frm.doc.company],
-					['Account', 'is_group', '=', 0],
+					["Account", "is_group", "=", 0],
-					['Account', 'account_type', 'in', ['Bank', 'Cash']]
+					["Account", "account_type", "in", ["Bank", "Cash"]],
-				]
+				],
 			};
 		});
 
 		this.frm.set_query("cost_center", () => {
 			return {
-				"filters": {
+				filters: {
-					"company": this.frm.doc.company,
+					company: this.frm.doc.company,
-					"is_group": 0
+					is_group: 0,
-				}
+				},
-			}
+			};
 		});
 	}
 
 	refresh() {
 		this.frm.disable_save();
 
-		this.frm.set_df_property('invoices', 'cannot_delete_rows', true);
+		this.frm.set_df_property("invoices", "cannot_delete_rows", true);
-		this.frm.set_df_property('payments', 'cannot_delete_rows', true);
+		this.frm.set_df_property("payments", "cannot_delete_rows", true);
-		this.frm.set_df_property('allocation', 'cannot_delete_rows', true);
+		this.frm.set_df_property("allocation", "cannot_delete_rows", true);
-
-		this.frm.set_df_property('invoices', 'cannot_add_rows', true);
-		this.frm.set_df_property('payments', 'cannot_add_rows', true);
-		this.frm.set_df_property('allocation', 'cannot_add_rows', true);
 
+		this.frm.set_df_property("invoices", "cannot_add_rows", true);
+		this.frm.set_df_property("payments", "cannot_add_rows", true);
+		this.frm.set_df_property("allocation", "cannot_add_rows", true);
 
 		if (this.frm.doc.receivable_payable_account) {
-			this.frm.add_custom_button(__('Get Unreconciled Entries'), () =>
+			this.frm.add_custom_button(__("Get Unreconciled Entries"), () =>
 				this.frm.trigger("get_unreconciled_entries")
 			);
-			this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'primary');
+			this.frm.change_custom_button_type(__("Get Unreconciled Entries"), null, "primary");
 		}
 		if (this.frm.doc.invoices.length && this.frm.doc.payments.length) {
-			this.frm.add_custom_button(__('Allocate'), () =>
+			this.frm.add_custom_button(__("Allocate"), () => this.frm.trigger("allocate"));
-				this.frm.trigger("allocate")
+			this.frm.change_custom_button_type(__("Allocate"), null, "primary");
-			);
+			this.frm.change_custom_button_type(__("Get Unreconciled Entries"), null, "default");
-			this.frm.change_custom_button_type(__('Allocate'), null, 'primary');
-			this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'default');
 		}
 		if (this.frm.doc.allocation.length) {
-			this.frm.add_custom_button(__('Reconcile'), () =>
+			this.frm.add_custom_button(__("Reconcile"), () => this.frm.trigger("reconcile"));
-				this.frm.trigger("reconcile")
+			this.frm.change_custom_button_type(__("Reconcile"), null, "primary");
-			);
+			this.frm.change_custom_button_type(__("Get Unreconciled Entries"), null, "default");
-			this.frm.change_custom_button_type(__('Reconcile'), null, 'primary');
+			this.frm.change_custom_button_type(__("Allocate"), null, "default");
-			this.frm.change_custom_button_type(__('Get Unreconciled Entries'), null, 'default');
-			this.frm.change_custom_button_type(__('Allocate'), null, 'default');
 		}
 
 		this.frm.trigger("set_query_for_dimension_filters");
@@ -101,31 +98,39 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 		if (this.frm.doc.receivable_payable_account) {
 			this.frm.call({
 				doc: this.frm.doc,
-				method: 'is_auto_process_enabled',
+				method: "is_auto_process_enabled",
 				callback: (r) => {
 					if (r.message) {
-						this.frm.call({
+						this.frm
-							'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.is_any_doc_running",
+							.call({
-							"args": {
+								method: "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.is_any_doc_running",
+								args: {
 									for_filter: {
 										company: this.frm.doc.company,
 										party_type: this.frm.doc.party_type,
 										party: this.frm.doc.party,
-									receivable_payable_account: this.frm.doc.receivable_payable_account
+										receivable_payable_account: this.frm.doc.receivable_payable_account,
-								}
+									},
-							}
+								},
-						}).then(r => {
+							})
+							.then((r) => {
 								if (r.message) {
-								let doc_link = frappe.utils.get_form_link("Process Payment Reconciliation", r.message, true);
+									let doc_link = frappe.utils.get_form_link(
-								let msg = __("Payment Reconciliation Job: {0} is running for this party. Can't reconcile now.", [doc_link]);
+										"Process Payment Reconciliation",
+										r.message,
+										true
+									);
+									let msg = __(
+										"Payment Reconciliation Job: {0} is running for this party. Can't reconcile now.",
+										[doc_link]
+									);
 									this.frm.dashboard.add_comment(msg, "yellow");
 								}
 							});
 					}
-				}
+				},
 			});
 		}
-
 	}
 	set_query_for_dimension_filters() {
 		frappe.call({
@@ -135,29 +140,29 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			},
 			callback: (r) => {
 				if (!r.exc && r.message) {
-					r.message.forEach(x => {
+					r.message.forEach((x) => {
 						this.frm.set_query(x.fieldname, () => {
 							return {
-								'filters': x.filters
+								filters: x.filters,
 							};
 						});
 					});
 				}
-			}
+			},
 		});
 	}
 
 	company() {
-		this.frm.set_value('party', '');
+		this.frm.set_value("party", "");
-		this.frm.set_value('receivable_payable_account', '');
+		this.frm.set_value("receivable_payable_account", "");
 	}
 
 	party_type() {
-		this.frm.set_value('party', '');
+		this.frm.set_value("party", "");
 	}
 
 	party() {
-		this.frm.set_value('receivable_payable_account', '');
+		this.frm.set_value("receivable_payable_account", "");
 		this.frm.trigger("clear_child_tables");
 
 		if (!this.frm.doc.receivable_payable_account && this.frm.doc.party_type && this.frm.doc.party) {
@@ -167,7 +172,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 					company: this.frm.doc.company,
 					party_type: this.frm.doc.party_type,
 					party: this.frm.doc.party,
-					include_advance: 1
+					include_advance: 1,
 				},
 				callback: (r) => {
 					if (!r.exc && r.message) {
@@ -175,7 +180,7 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 						this.frm.set_value("default_advance_account", r.message[1]);
 					}
 					this.frm.refresh();
-				}
+				},
 			});
 		}
 	}
@@ -193,7 +198,6 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 		this.frm.trigger("get_unreconciled_entries");
 	}
 
-
 	clear_child_tables() {
 		this.frm.clear_table("invoices");
 		this.frm.clear_table("payments");
@@ -205,48 +209,48 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 		this.frm.clear_table("allocation");
 		return this.frm.call({
 			doc: this.frm.doc,
-			method: 'get_unreconciled_entries',
+			method: "get_unreconciled_entries",
 			callback: () => {
 				if (!(this.frm.doc.payments.length || this.frm.doc.invoices.length)) {
-					frappe.throw({message: __("No Unreconciled Invoices and Payments found for this party and account")});
+					frappe.throw({
-				} else if (!(this.frm.doc.invoices.length)) {
+						message: __("No Unreconciled Invoices and Payments found for this party and account"),
+					});
+				} else if (!this.frm.doc.invoices.length) {
 					frappe.throw({ message: __("No Outstanding Invoices found for this party") });
-				} else if (!(this.frm.doc.payments.length)) {
+				} else if (!this.frm.doc.payments.length) {
 					frappe.throw({ message: __("No Unreconciled Payments found for this party") });
 				}
 				this.frm.refresh();
-			}
+			},
 		});
-
 	}
 
 	allocate() {
 		let payments = this.frm.fields_dict.payments.grid.get_selected_children();
-		if (!(payments.length)) {
+		if (!payments.length) {
 			payments = this.frm.doc.payments;
 		}
 		let invoices = this.frm.fields_dict.invoices.grid.get_selected_children();
-		if (!(invoices.length)) {
+		if (!invoices.length) {
 			invoices = this.frm.doc.invoices;
 		}
 		return this.frm.call({
 			doc: this.frm.doc,
-			method: 'allocate_entries',
+			method: "allocate_entries",
 			args: {
 				payments: payments,
-				invoices: invoices
+				invoices: invoices,
 			},
 			callback: () => {
 				this.frm.refresh();
-			}
+			},
 		});
 	}
 
 	reconcile() {
-		var show_dialog = this.frm.doc.allocation.filter(d => d.difference_amount);
+		var show_dialog = this.frm.doc.allocation.filter((d) => d.difference_amount);
 
 		if (show_dialog && show_dialog.length) {
-
 			this.data = [];
 			const dialog = new frappe.ui.Dialog({
 				title: __("Select Difference Account"),
@@ -261,66 +265,75 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 						get_data: () => {
 							return this.data;
 						},
-						fields: [{
+						fields: [
-							fieldtype:'Data',
+							{
+								fieldtype: "Data",
 								fieldname: "docname",
 								in_list_view: 1,
-							hidden: 1
+								hidden: 1,
-						}, {
+							},
-							fieldtype:'Data',
+							{
+								fieldtype: "Data",
 								fieldname: "reference_name",
 								label: __("Voucher No"),
 								in_list_view: 1,
-							read_only: 1
+								read_only: 1,
-						}, {
+							},
-							fieldtype:'Link',
+							{
-							options: 'Account',
+								fieldtype: "Link",
+								options: "Account",
 								in_list_view: 1,
 								label: __("Difference Account"),
-							fieldname: 'difference_account',
+								fieldname: "difference_account",
 								reqd: 1,
 								get_query: () => {
 									return {
 										filters: {
 											company: this.frm.doc.company,
-										is_group: 0
+											is_group: 0,
-									}
+										},
-								}
+									};
-							}
+								},
-						}, {
-							fieldtype:'Currency',
-							in_list_view: 1,
-							label: __("Difference Amount"),
-							fieldname: 'difference_amount',
-							read_only: 1
-						}]
 							},
 							{
-						fieldtype: 'HTML',
+								fieldtype: "Currency",
-						options: "<b> New Journal Entry will be posted for the difference amount </b>"
+								in_list_view: 1,
-					}
+								label: __("Difference Amount"),
+								fieldname: "difference_amount",
+								read_only: 1,
+							},
+						],
+					},
+					{
+						fieldtype: "HTML",
+						options: "<b> New Journal Entry will be posted for the difference amount </b>",
+					},
 				],
 				primary_action: () => {
 					const args = dialog.get_values()["allocation"];
 
-					args.forEach(d => {
+					args.forEach((d) => {
-						frappe.model.set_value("Payment Reconciliation Allocation", d.docname,
+						frappe.model.set_value(
-							"difference_account", d.difference_account);
+							"Payment Reconciliation Allocation",
+							d.docname,
+							"difference_account",
+							d.difference_account
+						);
 					});
 
 					this.reconcile_payment_entries();
 					dialog.hide();
 				},
-				primary_action_label: __('Reconcile Entries')
+				primary_action_label: __("Reconcile Entries"),
 			});
 
-			this.frm.doc.allocation.forEach(d => {
+			this.frm.doc.allocation.forEach((d) => {
 				if (d.difference_amount) {
 					dialog.fields_dict.allocation.df.data.push({
-						'docname': d.name,
+						docname: d.name,
-						'reference_name': d.reference_name,
+						reference_name: d.reference_name,
-						'difference_amount': d.difference_amount,
+						difference_amount: d.difference_amount,
-						'difference_account': d.difference_account,
+						difference_account: d.difference_account,
 					});
 				}
 			});
@@ -336,41 +349,39 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 	reconcile_payment_entries() {
 		return this.frm.call({
 			doc: this.frm.doc,
-			method: 'reconcile',
+			method: "reconcile",
 			callback: () => {
 				this.frm.clear_table("allocation");
 				this.frm.refresh();
-			}
+			},
 		});
 	}
 };
 
-frappe.ui.form.on('Payment Reconciliation Allocation', {
+frappe.ui.form.on("Payment Reconciliation Allocation", {
 	allocated_amount: function (frm, cdt, cdn) {
 		let row = locals[cdt][cdn];
 		// filter invoice
-		let invoice = frm.doc.invoices.filter((x) => (x.invoice_number == row.invoice_number));
+		let invoice = frm.doc.invoices.filter((x) => x.invoice_number == row.invoice_number);
 		// filter payment
-		let payment = frm.doc.payments.filter((x) => (x.reference_name == row.reference_name));
+		let payment = frm.doc.payments.filter((x) => x.reference_name == row.reference_name);
 
 		frm.call({
 			doc: frm.doc,
-			method: 'calculate_difference_on_allocation_change',
+			method: "calculate_difference_on_allocation_change",
 			args: {
 				payment_entry: payment,
 				invoice: invoice,
-				allocated_amount: row.allocated_amount
+				allocated_amount: row.allocated_amount,
 			},
 			callback: (r) => {
 				if (r.message) {
 					row.difference_amount = r.message;
 					frm.refresh();
 				}
-			}
+			},
 		});
-	}
+	},
 });
 
-
-
 extend_cscript(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({ frm: cur_frm }));

erpnext/accounts/doctype/payment_request/payment_request.js

@@ -1,6 +1,6 @@
-cur_frm.add_fetch("payment_gateway_account", "payment_account", "payment_account")
+cur_frm.add_fetch("payment_gateway_account", "payment_account", "payment_account");
-cur_frm.add_fetch("payment_gateway_account", "payment_gateway", "payment_gateway")
+cur_frm.add_fetch("payment_gateway_account", "payment_gateway", "payment_gateway");
-cur_frm.add_fetch("payment_gateway_account", "message", "message")
+cur_frm.add_fetch("payment_gateway_account", "message", "message");
 
 frappe.ui.form.on("Payment Request", {
 	setup: function (frm) {
@@ -9,51 +9,59 @@ frappe.ui.form.on("Payment Request", {
 				query: "erpnext.setup.doctype.party_type.party_type.get_party_type",
 			};
 		});
-	}
+	},
-})
+});
 
 frappe.ui.form.on("Payment Request", "onload", function (frm, dt, dn) {
 	if (frm.doc.reference_doctype) {
 		frappe.call({
 			method: "erpnext.accounts.doctype.payment_request.payment_request.get_print_format_list",
-			args: {"ref_doctype": frm.doc.reference_doctype},
+			args: { ref_doctype: frm.doc.reference_doctype },
 			callback: function (r) {
-				set_field_options("print_format", r.message["print_format"])
+				set_field_options("print_format", r.message["print_format"]);
+			},
+		});
 	}
-		})
+});
-	}
-})
 
 frappe.ui.form.on("Payment Request", "refresh", function (frm) {
-	if(frm.doc.payment_request_type == 'Inward' && frm.doc.payment_channel !== "Phone" &&
+	if (
-		!in_list(["Initiated", "Paid"], frm.doc.status) && !frm.doc.__islocal && frm.doc.docstatus==1){
+		frm.doc.payment_request_type == "Inward" &&
-		frm.add_custom_button(__('Resend Payment Email'), function(){
+		frm.doc.payment_channel !== "Phone" &&
+		!in_list(["Initiated", "Paid"], frm.doc.status) &&
+		!frm.doc.__islocal &&
+		frm.doc.docstatus == 1
+	) {
+		frm.add_custom_button(__("Resend Payment Email"), function () {
 			frappe.call({
 				method: "erpnext.accounts.doctype.payment_request.payment_request.resend_payment_email",
-				args: {"docname": frm.doc.name},
+				args: { docname: frm.doc.name },
 				freeze: true,
 				freeze_message: __("Sending"),
 				callback: function (r) {
 					if (!r.exc) {
 						frappe.msgprint(__("Message Sent"));
 					}
-				}
+				},
 			});
 		});
 	}
 
-	if((!frm.doc.payment_gateway_account || frm.doc.payment_request_type == "Outward") && frm.doc.status == "Initiated") {
+	if (
-		frm.add_custom_button(__('Create Payment Entry'), function(){
+		(!frm.doc.payment_gateway_account || frm.doc.payment_request_type == "Outward") &&
+		frm.doc.status == "Initiated"
+	) {
+		frm.add_custom_button(__("Create Payment Entry"), function () {
 			frappe.call({
 				method: "erpnext.accounts.doctype.payment_request.payment_request.make_payment_entry",
-				args: {"docname": frm.doc.name},
+				args: { docname: frm.doc.name },
 				freeze: true,
 				callback: function (r) {
 					if (!r.exc) {
 						var doc = frappe.model.sync(r.message);
 						frappe.set_route("Form", r.message.doctype, r.message.name);
 					}
-				}
+				},
 			});
 		}).addClass("btn-primary");
 	}
@@ -66,18 +74,22 @@ frappe.ui.form.on("Payment Request", "is_a_subscription", function(frm) {
 	if (frm.doc.is_a_subscription && frm.doc.reference_doctype && frm.doc.reference_name) {
 		frappe.call({
 			method: "erpnext.accounts.doctype.payment_request.payment_request.get_subscription_details",
-			args: {"reference_doctype": frm.doc.reference_doctype, "reference_name": frm.doc.reference_name},
+			args: { reference_doctype: frm.doc.reference_doctype, reference_name: frm.doc.reference_name },
 			freeze: true,
 			callback: function (data) {
 				if (!data.exc) {
 					$.each(data.message || [], function (i, v) {
-						var d = frappe.model.add_child(frm.doc, "Subscription Plan Detail", "subscription_plans");
+						var d = frappe.model.add_child(
+							frm.doc,
+							"Subscription Plan Detail",
+							"subscription_plans"
+						);
 						d.qty = v.qty;
 						d.plan = v.plan;
 					});
 					frm.refresh_field("subscription_plans");
 				}
-			}
+			},
 		});
 	}
 });

erpnext/accounts/doctype/payment_request/payment_request_list.js

@@ -1,4 +1,4 @@
-frappe.listview_settings['Payment Request'] = {
+frappe.listview_settings["Payment Request"] = {
 	add_fields: ["status"],
 	get_indicator: function (doc) {
 		if (doc.status == "Draft") {
@@ -6,18 +6,14 @@ frappe.listview_settings['Payment Request'] = {
 		}
 		if (doc.status == "Requested") {
 			return [__("Requested"), "green", "status,=,Requested"];
-		}
+		} else if (doc.status == "Initiated") {
-		else if(doc.status == "Initiated") {
 			return [__("Initiated"), "green", "status,=,Initiated"];
-		}
+		} else if (doc.status == "Partially Paid") {
-		else if(doc.status == "Partially Paid") {
 			return [__("Partially Paid"), "orange", "status,=,Partially Paid"];
-		}
+		} else if (doc.status == "Paid") {
-		else if(doc.status == "Paid") {
 			return [__("Paid"), "blue", "status,=,Paid"];
-		}
+		} else if (doc.status == "Cancelled") {
-		else if(doc.status == "Cancelled") {
 			return [__("Cancelled"), "red", "status,=,Cancelled"];
 		}
-	}
+	},
-}
+};

erpnext/accounts/doctype/payment_term/payment_term.js

@@ -1,22 +1,24 @@
 // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
-frappe.ui.form.on('Payment Term', {
+frappe.ui.form.on("Payment Term", {
 	onload(frm) {
-		frm.trigger('set_dynamic_description');
+		frm.trigger("set_dynamic_description");
 	},
 	discount(frm) {
-		frm.trigger('set_dynamic_description');
+		frm.trigger("set_dynamic_description");
 	},
 	discount_type(frm) {
-		frm.trigger('set_dynamic_description');
+		frm.trigger("set_dynamic_description");
 	},
 	set_dynamic_description(frm) {
 		if (frm.doc.discount) {
-			let description = __("{0}% of total invoice value will be given as discount.", [frm.doc.discount]);
+			let description = __("{0}% of total invoice value will be given as discount.", [
-			if (frm.doc.discount_type == 'Amount') {
+				frm.doc.discount,
+			]);
+			if (frm.doc.discount_type == "Amount") {
 				description = __("{0} will be given as discount.", [frm.doc.discount]);
 			}
 			frm.set_df_property("discount", "description", description);
 		}
-	}
+	},
 });

erpnext/accounts/doctype/payment_terms_template/payment_terms_template.js

@@ -1,12 +1,18 @@
 // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Terms Template', {
+frappe.ui.form.on("Payment Terms Template", {
 	refresh: function (frm) {
-		frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
+		frm.fields_dict.terms.grid.toggle_reqd(
+			"payment_term",
+			frm.doc.allocate_payment_based_on_payment_terms
+		);
 	},
 
 	allocate_payment_based_on_payment_terms: function (frm) {
-		frm.fields_dict.terms.grid.toggle_reqd("payment_term", frm.doc.allocate_payment_based_on_payment_terms);
+		frm.fields_dict.terms.grid.toggle_reqd(
-	}
+			"payment_term",
+			frm.doc.allocate_payment_based_on_payment_terms
+		);
+	},
 });

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on('Period Closing Voucher', {
+frappe.ui.form.on("Period Closing Voucher", {
 	onload: function (frm) {
 		if (!frm.doc.transaction_date) frm.doc.transaction_date = frappe.datetime.obj_to_str(new Date());
 	},
@@ -10,29 +10,32 @@ frappe.ui.form.on('Period Closing Voucher', {
 		frm.set_query("closing_account_head", function () {
 			return {
 				filters: [
-					['Account', 'company', '=', frm.doc.company],
+					["Account", "company", "=", frm.doc.company],
-					['Account', 'is_group', '=', '0'],
+					["Account", "is_group", "=", "0"],
-					['Account', 'freeze_account', '=', 'No'],
+					["Account", "freeze_account", "=", "No"],
-					['Account', 'root_type', 'in', 'Liability, Equity']
+					["Account", "root_type", "in", "Liability, Equity"],
-				]
+				],
-			}
+			};
 		});
 	},
 
 	refresh: function (frm) {
 		if (frm.doc.docstatus > 0) {
-			frm.add_custom_button(__('Ledger'), function() {
+			frm.add_custom_button(
+				__("Ledger"),
+				function () {
 					frappe.route_options = {
-					"voucher_no": frm.doc.name,
+						voucher_no: frm.doc.name,
-					"from_date": frm.doc.posting_date,
+						from_date: frm.doc.posting_date,
-					"to_date": moment(frm.doc.modified).format('YYYY-MM-DD'),
+						to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
-					"company": frm.doc.company,
+						company: frm.doc.company,
-					"group_by": "",
+						group_by: "",
-					"show_cancelled_entries": frm.doc.docstatus === 2
+						show_cancelled_entries: frm.doc.docstatus === 2,
 					};
 					frappe.set_route("query-report", "General Ledger");
-			}, "fa fa-table");
+				},
+				"fa fa-table"
+			);
 		}
-	}
+	},
-
+});
-})

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.js

@@ -1,36 +1,37 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('POS Closing Entry', {
+frappe.ui.form.on("POS Closing Entry", {
 	onload: function (frm) {
-		frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log'];
+		frm.ignore_doctypes_on_cancel_all = ["POS Invoice Merge Log"];
 		frm.set_query("pos_profile", function (doc) {
 			return {
-				filters: { 'user': doc.user }
+				filters: { user: doc.user },
 			};
 		});
 
 		frm.set_query("user", function (doc) {
 			return {
 				query: "erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_cashiers",
-				filters: { 'parent': doc.pos_profile }
+				filters: { parent: doc.pos_profile },
 			};
 		});
 
 		frm.set_query("pos_opening_entry", function (doc) {
-			return { filters: { 'status': 'Open', 'docstatus': 1 } };
+			return { filters: { status: "Open", docstatus: 1 } };
 		});
 
-		if (frm.doc.docstatus === 0 && !frm.doc.amended_from) frm.set_value("period_end_date", frappe.datetime.now_datetime());
+		if (frm.doc.docstatus === 0 && !frm.doc.amended_from)
+			frm.set_value("period_end_date", frappe.datetime.now_datetime());
 
-		frappe.realtime.on('closing_process_complete', async function(data) {
+		frappe.realtime.on("closing_process_complete", async function (data) {
 			await frm.reload_doc();
-			if (frm.doc.status == 'Failed' && frm.doc.error_message) {
+			if (frm.doc.status == "Failed" && frm.doc.error_message) {
 				frappe.msgprint({
-					title: __('POS Closing Failed'),
+					title: __("POS Closing Failed"),
 					message: frm.doc.error_message,
-					indicator: 'orange',
+					indicator: "orange",
-					clear: true
+					clear: true,
 				});
 			}
 		});
@@ -48,22 +49,22 @@ frappe.ui.form.on('POS Closing Entry', {
 	},
 
 	refresh: function (frm) {
-		if (frm.doc.docstatus == 1 && frm.doc.status == 'Failed') {
+		if (frm.doc.docstatus == 1 && frm.doc.status == "Failed") {
 			const issue = '<a id="jump_to_error" style="text-decoration: underline;">issue</a>';
 			frm.dashboard.set_headline(
-				__('POS Closing failed while running in a background process. You can resolve the {0} and retry the process again.', [issue]));
+				__(
-
+					"POS Closing failed while running in a background process. You can resolve the {0} and retry the process again.",
-			$('#jump_to_error').on('click', (e) => {
+					[issue]
-				e.preventDefault();
+				)
-				frappe.utils.scroll_to(
-					cur_frm.get_field("error_message").$wrapper,
-					true,
-					30
 			);
+
+			$("#jump_to_error").on("click", (e) => {
+				e.preventDefault();
+				frappe.utils.scroll_to(cur_frm.get_field("error_message").$wrapper, true, 30);
 			});
 
-			frm.add_custom_button(__('Retry'), function () {
+			frm.add_custom_button(__("Retry"), function () {
-				frm.call('retry', {}, () => {
+				frm.call("retry", {}, () => {
 					frm.reload_doc();
 				});
 			});
@@ -71,48 +72,54 @@ frappe.ui.form.on('POS Closing Entry', {
 	},
 
 	pos_opening_entry(frm) {
-		if (frm.doc.pos_opening_entry && frm.doc.period_start_date && frm.doc.period_end_date && frm.doc.user) {
+		if (
+			frm.doc.pos_opening_entry &&
+			frm.doc.period_start_date &&
+			frm.doc.period_end_date &&
+			frm.doc.user
+		) {
 			reset_values(frm);
 			frappe.run_serially([
 				() => frm.trigger("set_opening_amounts"),
-				() => frm.trigger("get_pos_invoices")
+				() => frm.trigger("get_pos_invoices"),
 			]);
 		}
 	},
 
 	set_opening_amounts(frm) {
-		return frappe.db.get_doc("POS Opening Entry", frm.doc.pos_opening_entry)
+		return frappe.db
+			.get_doc("POS Opening Entry", frm.doc.pos_opening_entry)
 			.then(({ balance_details }) => {
-				balance_details.forEach(detail => {
+				balance_details.forEach((detail) => {
 					frm.add_child("payment_reconciliation", {
 						mode_of_payment: detail.mode_of_payment,
 						opening_amount: detail.opening_amount,
-						expected_amount: detail.opening_amount
+						expected_amount: detail.opening_amount,
+					});
 				});
-				})
 			});
 	},
 
 	get_pos_invoices(frm) {
 		return frappe.call({
-			method: 'erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices',
+			method: "erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices",
 			args: {
 				start: frappe.datetime.get_datetime_as_string(frm.doc.period_start_date),
 				end: frappe.datetime.get_datetime_as_string(frm.doc.period_end_date),
 				pos_profile: frm.doc.pos_profile,
-				user: frm.doc.user
+				user: frm.doc.user,
 			},
 			callback: (r) => {
 				let pos_docs = r.message;
 				set_form_data(pos_docs, frm);
 				refresh_fields(frm);
 				set_html_data(frm);
-			}
+			},
 		});
 	},
 
 	before_save: async function (frm) {
-		frappe.dom.freeze(__('Processing Sales! Please Wait...'));
+		frappe.dom.freeze(__("Processing Sales! Please Wait..."));
 
 		frm.set_value("grand_total", 0);
 		frm.set_value("net_total", 0);
@@ -125,12 +132,12 @@ frappe.ui.form.on('POS Closing Entry', {
 
 		await Promise.all([
 			frappe.call({
-				method: 'erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices',
+				method: "erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_pos_invoices",
 				args: {
 					start: frappe.datetime.get_datetime_as_string(frm.doc.period_start_date),
 					end: frappe.datetime.get_datetime_as_string(frm.doc.period_end_date),
 					pos_profile: frm.doc.pos_profile,
-					user: frm.doc.user
+					user: frm.doc.user,
 				},
 				callback: (r) => {
 					let pos_invoices = r.message;
@@ -143,22 +150,22 @@ frappe.ui.form.on('POS Closing Entry', {
 						refresh_fields(frm);
 						set_html_data(frm);
 					}
-				}
+				},
-			})
+			}),
-		])
+		]);
 		frappe.dom.unfreeze();
-	}
+	},
 });
 
-frappe.ui.form.on('POS Closing Entry Detail', {
+frappe.ui.form.on("POS Closing Entry Detail", {
 	closing_amount: (frm, cdt, cdn) => {
 		const row = locals[cdt][cdn];
 		frappe.model.set_value(cdt, cdn, "difference", flt(row.closing_amount - row.expected_amount));
-	}
+	},
-})
+});
 
 function set_form_data(data, frm) {
-	data.forEach(d => {
+	data.forEach((d) => {
 		add_to_pos_transaction(d, frm);
 		frm.doc.grand_total += flt(d.grand_total);
 		frm.doc.net_total += flt(d.net_total);
@@ -173,13 +180,15 @@ function add_to_pos_transaction(d, frm) {
 		pos_invoice: d.name,
 		posting_date: d.posting_date,
 		grand_total: d.grand_total,
-		customer: d.customer
+		customer: d.customer,
-	})
+	});
 }
 
 function refresh_payments(d, frm) {
-	d.payments.forEach(p => {
+	d.payments.forEach((p) => {
-		const payment = frm.doc.payment_reconciliation.find(pay => pay.mode_of_payment === p.mode_of_payment);
+		const payment = frm.doc.payment_reconciliation.find(
+			(pay) => pay.mode_of_payment === p.mode_of_payment
+		);
 		if (p.account == d.account_for_change_amount) {
 			p.amount -= flt(d.change_amount);
 		}
@@ -192,25 +201,25 @@ function refresh_payments(d, frm) {
 				mode_of_payment: p.mode_of_payment,
 				opening_amount: 0,
 				expected_amount: p.amount,
-				closing_amount: 0
+				closing_amount: 0,
-			})
+			});
 		}
-	})
+	});
 }
 
 function refresh_taxes(d, frm) {
-	d.taxes.forEach(t => {
+	d.taxes.forEach((t) => {
-		const tax = frm.doc.taxes.find(tx => tx.account_head === t.account_head && tx.rate === t.rate);
+		const tax = frm.doc.taxes.find((tx) => tx.account_head === t.account_head && tx.rate === t.rate);
 		if (tax) {
 			tax.amount += flt(t.tax_amount);
 		} else {
 			frm.add_child("taxes", {
 				account_head: t.account_head,
 				rate: t.rate,
-				amount: t.tax_amount
+				amount: t.tax_amount,
-			})
+			});
 		}
-	})
+	});
 }
 
 function reset_values(frm) {
@@ -232,13 +241,13 @@ function refresh_fields(frm) {
 }
 
 function set_html_data(frm) {
-	if (frm.doc.docstatus === 1 && frm.doc.status == 'Submitted') {
+	if (frm.doc.docstatus === 1 && frm.doc.status == "Submitted") {
 		frappe.call({
 			method: "get_payment_reconciliation_details",
 			doc: frm.doc,
 			callback: (r) => {
 				frm.get_field("payment_reconciliation_details").$wrapper.html(r.message);
-			}
+			},
 		});
 	}
 }

erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry_list.js

@@ -2,16 +2,15 @@
 // License: GNU General Public License v3. See license.txt
 
 // render
-frappe.listview_settings['POS Closing Entry'] = {
+frappe.listview_settings["POS Closing Entry"] = {
 	get_indicator: function (doc) {
 		var status_color = {
-			"Draft": "red",
+			Draft: "red",
-			"Submitted": "blue",
+			Submitted: "blue",
-			"Queued": "orange",
+			Queued: "orange",
-			"Failed": "red",
+			Failed: "red",
-			"Cancelled": "red"
+			Cancelled: "red",
-
 		};
 		return [__(doc.status), status_color[doc.status], "status,=," + doc.status];
-	}
+	},
 };

erpnext/accounts/doctype/pos_invoice/pos_invoice.js

@@ -21,9 +21,13 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 
 	onload(doc) {
 		super.onload();
-		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log', 'POS Closing Entry', 'Serial and Batch Bundle'];
+		this.frm.ignore_doctypes_on_cancel_all = [
+			"POS Invoice Merge Log",
+			"POS Closing Entry",
+			"Serial and Batch Bundle",
+		];
 
-		if(doc.__islocal && doc.is_pos && frappe.get_route_str() !== 'point-of-sale') {
+		if (doc.__islocal && doc.is_pos && frappe.get_route_str() !== "point-of-sale") {
 			this.frm.script_manager.trigger("is_pos");
 			this.frm.refresh_fields();
 		}
@@ -31,9 +35,9 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 		this.frm.set_query("set_warehouse", function (doc) {
 			return {
 				filters: {
-					company: doc.company ? doc.company : '',
+					company: doc.company ? doc.company : "",
-				}
+				},
-			}
+			};
 		});
 
 		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
@@ -47,16 +51,18 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 		super.refresh();
 
 		if (doc.docstatus == 1 && !doc.is_return) {
-			this.frm.add_custom_button(__('Return'), this.make_sales_return, __('Create'));
+			this.frm.add_custom_button(__("Return"), this.make_sales_return, __("Create"));
-			this.frm.page.set_inner_btn_group_as_primary(__('Create'));
+			this.frm.page.set_inner_btn_group_as_primary(__("Create"));
 		}
 
 		if (doc.is_return && doc.__islocal) {
 			this.frm.return_print_format = "Sales Invoice Return";
-			this.frm.set_value('consolidated_invoice', '');
+			this.frm.set_value("consolidated_invoice", "");
 		}
 
-		this.frm.set_query("customer", (function () {
+		this.frm.set_query(
+			"customer",
+			function () {
 				const customer_groups = this.settings?.customer_groups;
 
 				if (!customer_groups?.length) return {};
@@ -64,9 +70,10 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 				return {
 					filters: {
 						customer_group: ["in", customer_groups],
-				}
+					},
-			}
+				};
-		}).bind(this));
+			}.bind(this)
+		);
 	}
 
 	is_pos() {
@@ -83,7 +90,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 				const r = await this.frm.call({
 					doc: this.frm.doc,
 					method: "set_missing_values",
-					freeze: true
+					freeze: true,
 				});
 				if (!r.exc) {
 					if (r.message) {
@@ -103,32 +110,36 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 	}
 
 	customer() {
-		if (!this.frm.doc.customer) return
+		if (!this.frm.doc.customer) return;
 		const pos_profile = this.frm.doc.pos_profile;
 		if (this.frm.updating_party_details) return;
-		erpnext.utils.get_party_details(this.frm,
+		erpnext.utils.get_party_details(
-			"erpnext.accounts.party.get_party_details", {
+			this.frm,
+			"erpnext.accounts.party.get_party_details",
+			{
 				posting_date: this.frm.doc.posting_date,
 				party: this.frm.doc.customer,
 				party_type: "Customer",
 				account: this.frm.doc.debit_to,
 				price_list: this.frm.doc.selling_price_list,
 				pos_profile: pos_profile,
-				company_address: this.frm.doc.company_address
+				company_address: this.frm.doc.company_address,
-			}, () => {
+			},
+			() => {
 				this.apply_pricing_rule();
-			});
+			}
+		);
 	}
 
 	pos_profile(frm) {
-		if (!frm.pos_profile || frm.pos_profile == '') {
+		if (!frm.pos_profile || frm.pos_profile == "") {
 			this.update_customer_groups_settings([]);
 			return;
 		}
 
 		frappe.call({
 			method: "erpnext.selling.page.point_of_sale.point_of_sale.get_pos_profile_data",
-			args: { "pos_profile": frm.pos_profile },
+			args: { pos_profile: frm.pos_profile },
 			callback: ({ message: profile }) => {
 				this.update_customer_groups_settings(profile?.customer_groups);
 				this.frm.set_value("company", profile?.company);
@@ -137,11 +148,11 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 	}
 
 	update_customer_groups_settings(customer_groups) {
-		this.settings.customer_groups = customer_groups?.map((group) => group.name)
+		this.settings.customer_groups = customer_groups?.map((group) => group.name);
 	}
 
 	amount() {
-		this.write_off_outstanding_amount_automatically()
+		this.write_off_outstanding_amount_automatically();
 	}
 
 	change_amount() {
@@ -166,8 +177,12 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 		if (cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
 			frappe.model.round_floats_in(this.frm.doc, ["grand_total", "paid_amount"]);
 			// this will make outstanding amount 0
-			this.frm.set_value("write_off_amount",
+			this.frm.set_value(
-				flt(this.frm.doc.grand_total - this.frm.doc.paid_amount - this.frm.doc.total_advance, precision("write_off_amount"))
+				"write_off_amount",
+				flt(
+					this.frm.doc.grand_total - this.frm.doc.paid_amount - this.frm.doc.total_advance,
+					precision("write_off_amount")
+				)
 			);
 		}
 
@@ -178,14 +193,14 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 	make_sales_return() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.make_sales_return",
-			frm: cur_frm
+			frm: cur_frm,
-		})
+		});
-	}
 	}
+};
 
-extend_cscript(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm }))
+extend_cscript(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm }));
 
-frappe.ui.form.on('POS Invoice', {
+frappe.ui.form.on("POS Invoice", {
 	redeem_loyalty_points: function (frm) {
 		frm.events.get_loyalty_details(frm);
 	},
@@ -197,14 +212,14 @@ frappe.ui.form.on('POS Invoice', {
 			frappe.call({
 				method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_redeemption_factor",
 				args: {
-					"loyalty_program": frm.doc.loyalty_program
+					loyalty_program: frm.doc.loyalty_program,
 				},
 				callback: function (r) {
 					if (r) {
 						frm.redemption_conversion_factor = r.message;
 						frm.events.set_loyalty_points(frm);
 					}
-				}
+				},
 			});
 		}
 	},
@@ -214,10 +229,10 @@ frappe.ui.form.on('POS Invoice', {
 			frappe.call({
 				method: "erpnext.accounts.doctype.loyalty_program.loyalty_program.get_loyalty_program_details",
 				args: {
-					"customer": frm.doc.customer,
+					customer: frm.doc.customer,
-					"loyalty_program": frm.doc.loyalty_program,
+					loyalty_program: frm.doc.loyalty_program,
-					"expiry_date": frm.doc.posting_date,
+					expiry_date: frm.doc.posting_date,
-					"company": frm.doc.company
+					company: frm.doc.company,
 				},
 				callback: function (r) {
 					if (r) {
@@ -225,16 +240,20 @@ frappe.ui.form.on('POS Invoice', {
 						frm.set_value("loyalty_redemption_cost_center", r.message.cost_center);
 						frm.redemption_conversion_factor = r.message.conversion_factor;
 					}
-				}
+				},
 			});
 		}
 	},
 
 	set_loyalty_points: function (frm) {
 		if (frm.redemption_conversion_factor) {
-			let loyalty_amount = flt(frm.redemption_conversion_factor*flt(frm.doc.loyalty_points), precision("loyalty_amount"));
+			let loyalty_amount = flt(
-			var remaining_amount = flt(frm.doc.grand_total) - flt(frm.doc.total_advance) - flt(frm.doc.write_off_amount);
+				frm.redemption_conversion_factor * flt(frm.doc.loyalty_points),
-			if (frm.doc.grand_total && (remaining_amount < loyalty_amount)) {
+				precision("loyalty_amount")
+			);
+			var remaining_amount =
+				flt(frm.doc.grand_total) - flt(frm.doc.total_advance) - flt(frm.doc.write_off_amount);
+			if (frm.doc.grand_total && remaining_amount < loyalty_amount) {
 				let redeemable_points = parseInt(remaining_amount / frm.redemption_conversion_factor);
 				frappe.throw(__("You can only redeem max {0} points in this order.", [redeemable_points]));
 			}
@@ -244,29 +263,33 @@ frappe.ui.form.on('POS Invoice', {
 
 	request_for_payment: function (frm) {
 		if (!frm.doc.contact_mobile) {
-			frappe.throw(__('Please enter mobile number first.'));
+			frappe.throw(__("Please enter mobile number first."));
 		}
 		frm.dirty();
 		frm.save().then(() => {
-			frappe.dom.freeze(__('Waiting for payment...'));
+			frappe.dom.freeze(__("Waiting for payment..."));
 			frappe
 				.call({
-					method: 'create_payment_request',
+					method: "create_payment_request",
-					doc: frm.doc
+					doc: frm.doc,
 				})
 				.fail(() => {
 					frappe.dom.unfreeze();
-					frappe.msgprint(__('Payment request failed'));
+					frappe.msgprint(__("Payment request failed"));
 				})
 				.then(({ message }) => {
 					const payment_request_name = message.name;
 					setTimeout(() => {
-						frappe.db.get_value('Payment Request', payment_request_name, ['status', 'grand_total']).then(({ message }) => {
+						frappe.db
-							if (message.status != 'Paid') {
+							.get_value("Payment Request", payment_request_name, ["status", "grand_total"])
+							.then(({ message }) => {
+								if (message.status != "Paid") {
 									frappe.dom.unfreeze();
 									frappe.msgprint({
-									message: __('Payment Request took too long to respond. Please try requesting for payment again.'),
+										message: __(
-									title: __('Request Timeout')
+											"Payment Request took too long to respond. Please try requesting for payment again."
+										),
+										title: __("Request Timeout"),
 									});
 								} else if (frappe.dom.freeze_count != 0) {
 									frappe.dom.unfreeze();
@@ -274,13 +297,15 @@ frappe.ui.form.on('POS Invoice', {
 									cur_pos.payment.events.submit_invoice();
 
 									frappe.show_alert({
-									message: __("Payment of {0} received successfully.", [format_currency(message.grand_total, frm.doc.currency, 0)]),
+										message: __("Payment of {0} received successfully.", [
-									indicator: 'green'
+											format_currency(message.grand_total, frm.doc.currency, 0),
+										]),
+										indicator: "green",
 									});
 								}
 							});
 					}, 60000);
 				});
 		});
-	}
+	},
 });

erpnext/accounts/doctype/pos_invoice/pos_invoice_list.js

@@ -2,40 +2,47 @@
 // License: GNU General Public License v3. See license.txt
 
 // render
-frappe.listview_settings['POS Invoice'] = {
+frappe.listview_settings["POS Invoice"] = {
-	add_fields: ["customer", "customer_name", "base_grand_total", "outstanding_amount", "due_date", "company",
+	add_fields: [
-		"currency", "is_return"],
+		"customer",
+		"customer_name",
+		"base_grand_total",
+		"outstanding_amount",
+		"due_date",
+		"company",
+		"currency",
+		"is_return",
+	],
 	get_indicator: function (doc) {
 		var status_color = {
-			"Draft": "red",
+			Draft: "red",
-			"Unpaid": "orange",
+			Unpaid: "orange",
-			"Paid": "green",
+			Paid: "green",
-			"Submitted": "blue",
+			Submitted: "blue",
-			"Consolidated": "green",
+			Consolidated: "green",
-			"Return": "darkgrey",
+			Return: "darkgrey",
 			"Unpaid and Discounted": "orange",
 			"Overdue and Discounted": "red",
-			"Overdue": "red"
+			Overdue: "red",
-
 		};
 		return [__(doc.status), status_color[doc.status], "status,=," + doc.status];
 	},
 	right_column: "grand_total",
 	onload: function (me) {
-		me.page.add_action_item('Make Merge Log', function() {
+		me.page.add_action_item("Make Merge Log", function () {
 			const invoices = me.get_checked_items();
 			frappe.call({
 				method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.make_merge_log",
 				freeze: true,
 				args: {
-					"invoices": invoices
+					invoices: invoices,
 				},
 				callback: function (r) {
 					if (r.message) {
 						var doc = frappe.model.sync(r.message)[0];
 						frappe.set_route("Form", doc.doctype, doc.name);
 					}
-				}
+				},
 			});
 		});
 	},

erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.js

@@ -1,21 +1,21 @@
 // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('POS Invoice Merge Log', {
+frappe.ui.form.on("POS Invoice Merge Log", {
 	setup: function (frm) {
-		frm.set_query("pos_invoice", "pos_invoices", doc => {
+		frm.set_query("pos_invoice", "pos_invoices", (doc) => {
 			return {
 				filters: {
-					'docstatus': 1,
+					docstatus: 1,
-					'customer': doc.customer,
+					customer: doc.customer,
-					'consolidated_invoice': ''
+					consolidated_invoice: "",
-				}
+				},
-			}
+			};
 		});
 	},
 
 	merge_invoices_based_on: function (frm) {
-		frm.set_value('customer', '');
+		frm.set_value("customer", "");
-		frm.set_value('customer_group', '');
+		frm.set_value("customer_group", "");
-	}
+	},
 });

erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.js

@@ -1,18 +1,18 @@
 // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('POS Opening Entry', {
+frappe.ui.form.on("POS Opening Entry", {
 	setup(frm) {
 		if (frm.doc.docstatus == 0) {
-			frm.trigger('set_posting_date_read_only');
+			frm.trigger("set_posting_date_read_only");
-			frm.set_value('period_start_date', frappe.datetime.now_datetime());
+			frm.set_value("period_start_date", frappe.datetime.now_datetime());
-			frm.set_value('user', frappe.session.user);
+			frm.set_value("user", frappe.session.user);
 		}
 
 		frm.set_query("user", function (doc) {
 			return {
 				query: "erpnext.accounts.doctype.pos_closing_entry.pos_closing_entry.get_cashiers",
-				filters: { 'parent': doc.pos_profile }
+				filters: { parent: doc.pos_profile },
 			};
 		});
 	},
@@ -21,36 +21,35 @@ frappe.ui.form.on('POS Opening Entry', {
 		// set default posting date / time
 		if (frm.doc.docstatus == 0) {
 			if (!frm.doc.posting_date) {
-				frm.set_value('posting_date', frappe.datetime.nowdate());
+				frm.set_value("posting_date", frappe.datetime.nowdate());
 			}
-			frm.trigger('set_posting_date_read_only');
+			frm.trigger("set_posting_date_read_only");
 		}
 	},
 
 	set_posting_date_read_only(frm) {
 		if (frm.doc.docstatus == 0 && frm.doc.set_posting_date) {
-			frm.set_df_property('posting_date', 'read_only', 0);
+			frm.set_df_property("posting_date", "read_only", 0);
 		} else {
-			frm.set_df_property('posting_date', 'read_only', 1);
+			frm.set_df_property("posting_date", "read_only", 1);
 		}
 	},
 
 	set_posting_date(frm) {
-		frm.trigger('set_posting_date_read_only');
+		frm.trigger("set_posting_date_read_only");
 	},
 
 	pos_profile: (frm) => {
 		if (frm.doc.pos_profile) {
-			frappe.db.get_doc("POS Profile", frm.doc.pos_profile)
+			frappe.db.get_doc("POS Profile", frm.doc.pos_profile).then(({ payments }) => {
-				.then(({ payments }) => {
 				if (payments.length) {
 					frm.doc.balance_details = [];
 					payments.forEach(({ mode_of_payment }) => {
 						frm.add_child("balance_details", { mode_of_payment });
-						})
+					});
 					frm.refresh_field("balance_details");
 				}
 			});
 		}
-	}
+	},
 });

erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry_list.js

@@ -2,15 +2,14 @@
 // License: GNU General Public License v3. See license.txt
 
 // render
-frappe.listview_settings['POS Opening Entry'] = {
+frappe.listview_settings["POS Opening Entry"] = {
 	get_indicator: function (doc) {
 		var status_color = {
-			"Draft": "red",
+			Draft: "red",
-			"Open": "orange",
+			Open: "orange",
-			"Closed": "green",
+			Closed: "green",
-			"Cancelled": "red"
+			Cancelled: "red",
-
 		};
 		return [__(doc.status), status_color[doc.status], "status,=," + doc.status];
-	}
+	},
 };

erpnext/accounts/doctype/pos_profile/pos_profile.js

@@ -1,6 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
-frappe.ui.form.on('POS Profile', {
+frappe.ui.form.on("POS Profile", {
 	setup: function (frm) {
 		frm.set_query("selling_price_list", function () {
 			return { filters: { selling: 1 } };
@@ -16,114 +16,110 @@ frappe.ui.form.on('POS Profile', {
 
 		frm.set_query("print_format", function () {
 			return {
-				filters: [
+				filters: [["Print Format", "doc_type", "=", "POS Invoice"]],
-					['Print Format', 'doc_type', '=', 'POS Invoice']
-				]
 			};
 		});
 
 		frm.set_query("account_for_change_amount", function (doc) {
 			if (!doc.company) {
-				frappe.throw(__('Please set Company'));
+				frappe.throw(__("Please set Company"));
 			}
 
 			return {
 				filters: {
-					account_type: ['in', ["Cash", "Bank"]],
+					account_type: ["in", ["Cash", "Bank"]],
 					is_group: 0,
-					company: doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 
 		frm.set_query("taxes_and_charges", function () {
 			return {
 				filters: [
-					['Sales Taxes and Charges Template', 'company', '=', frm.doc.company],
+					["Sales Taxes and Charges Template", "company", "=", frm.doc.company],
-					['Sales Taxes and Charges Template', 'docstatus', '!=', 2]
+					["Sales Taxes and Charges Template", "docstatus", "!=", 2],
-				]
+				],
 			};
 		});
 
-		frm.set_query('company_address', function(doc) {
+		frm.set_query("company_address", function (doc) {
 			if (!doc.company) {
-				frappe.throw(__('Please set Company'));
+				frappe.throw(__("Please set Company"));
 			}
 
 			return {
-				query: 'frappe.contacts.doctype.address.address.address_query',
+				query: "frappe.contacts.doctype.address.address.address_query",
 				filters: {
-					link_doctype: 'Company',
+					link_doctype: "Company",
-					link_name: doc.company
+					link_name: doc.company,
-				}
+				},
 			};
 		});
 
-		frm.set_query('income_account', function(doc) {
+		frm.set_query("income_account", function (doc) {
 			if (!doc.company) {
-				frappe.throw(__('Please set Company'));
+				frappe.throw(__("Please set Company"));
 			}
 
 			return {
 				filters: {
-					'is_group': 0,
+					is_group: 0,
-					'company': doc.company,
+					company: doc.company,
-					'account_type': "Income Account"
+					account_type: "Income Account",
-				}
+				},
 			};
 		});
 
-		frm.set_query('cost_center', function(doc) {
+		frm.set_query("cost_center", function (doc) {
 			if (!doc.company) {
-				frappe.throw(__('Please set Company'));
+				frappe.throw(__("Please set Company"));
 			}
 
 			return {
 				filters: {
-					'company': doc.company,
+					company: doc.company,
-					'is_group': 0
+					is_group: 0,
-				}
+				},
 			};
 		});
 
-		frm.set_query('expense_account', function(doc) {
+		frm.set_query("expense_account", function (doc) {
 			if (!doc.company) {
-				frappe.throw(__('Please set Company'));
+				frappe.throw(__("Please set Company"));
 			}
 
 			return {
 				filters: {
-					"report_type": "Profit and Loss",
+					report_type: "Profit and Loss",
-					"company": doc.company,
+					company: doc.company,
-					"is_group": 0
+					is_group: 0,
-				}
+				},
 			};
 		});
 
 		frm.set_query("select_print_heading", function () {
 			return {
-				filters: [
+				filters: [["Print Heading", "docstatus", "!=", 2]],
-					['Print Heading', 'docstatus', '!=', 2]
-				]
 			};
 		});
 
 		frm.set_query("write_off_account", function (doc) {
 			return {
 				filters: {
-					'report_type': 'Profit and Loss',
+					report_type: "Profit and Loss",
-					'is_group': 0,
+					is_group: 0,
-					'company': doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 
 		frm.set_query("write_off_cost_center", function (doc) {
 			return {
 				filters: {
-					'is_group': 0,
+					is_group: 0,
-					'company': doc.company
+					company: doc.company,
-				}
+				},
 			};
 		});
 
@@ -139,11 +135,9 @@ frappe.ui.form.on('POS Profile', {
 	company: function (frm) {
 		frm.trigger("toggle_display_account_head");
 		erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
-
 	},
 
 	toggle_display_account_head: function (frm) {
-		frm.toggle_display('expense_account',
+		frm.toggle_display("expense_account", erpnext.is_perpetual_inventory_enabled(frm.doc.company));
-			erpnext.is_perpetual_inventory_enabled(frm.doc.company));
+	},
-	}
 });

erpnext/accounts/doctype/pos_profile_user/pos_profile_user.js

@@ -1,6 +1,4 @@
 // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('POS Profile User', {
+frappe.ui.form.on("POS Profile User", {});
-
-});

erpnext/accounts/doctype/pos_settings/pos_settings.js

@@ -1,14 +1,42 @@
 // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-let search_fields_datatypes = ['Data', 'Link', 'Dynamic Link', 'Long Text', 'Select', 'Small Text', 'Text', 'Text Editor'];
+let search_fields_datatypes = [
-let do_not_include_fields = ["naming_series", "item_code", "item_name", "stock_uom", "asset_naming_series",
+	"Data",
-	"default_material_request_type", "valuation_method", "warranty_period", "weight_uom", "batch_number_series",
+	"Link",
-	"serial_no_series", "purchase_uom", "customs_tariff_number", "sales_uom", "deferred_revenue_account",
+	"Dynamic Link",
-	"deferred_expense_account", "quality_inspection_template", "route", "slideshow", "website_image_alt", "thumbnail",
+	"Long Text",
-	"web_long_description"]
+	"Select",
+	"Small Text",
+	"Text",
+	"Text Editor",
+];
+let do_not_include_fields = [
+	"naming_series",
+	"item_code",
+	"item_name",
+	"stock_uom",
+	"asset_naming_series",
+	"default_material_request_type",
+	"valuation_method",
+	"warranty_period",
+	"weight_uom",
+	"batch_number_series",
+	"serial_no_series",
+	"purchase_uom",
+	"customs_tariff_number",
+	"sales_uom",
+	"deferred_revenue_account",
+	"deferred_expense_account",
+	"quality_inspection_template",
+	"route",
+	"slideshow",
+	"website_image_alt",
+	"thumbnail",
+	"web_long_description",
+];
 
-frappe.ui.form.on('POS Settings', {
+frappe.ui.form.on("POS Settings", {
 	onload: function (frm) {
 		frm.trigger("get_invoice_fields");
 		frm.trigger("add_search_options");
@@ -17,35 +45,41 @@ frappe.ui.form.on('POS Settings', {
 	get_invoice_fields: function (frm) {
 		frappe.model.with_doctype("POS Invoice", () => {
 			var fields = $.map(frappe.get_doc("DocType", "POS Invoice").fields, function (d) {
-				if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1 || ['Button'].includes(d.fieldtype)) {
+				if (
-					return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname };
+					frappe.model.no_value_type.indexOf(d.fieldtype) === -1 ||
+					["Button"].includes(d.fieldtype)
+				) {
+					return { label: d.label + " (" + d.fieldtype + ")", value: d.fieldname };
 				} else {
 					return null;
 				}
 			});
 
 			frm.fields_dict.invoice_fields.grid.update_docfield_property(
-				'fieldname', 'options', [""].concat(fields)
+				"fieldname",
+				"options",
+				[""].concat(fields)
 			);
 		});
-
 	},
 
 	add_search_options: function (frm) {
 		frappe.model.with_doctype("Item", () => {
 			var fields = $.map(frappe.get_doc("DocType", "Item").fields, function (d) {
-				if (search_fields_datatypes.includes(d.fieldtype) && !(do_not_include_fields.includes(d.fieldname))) {
+				if (
+					search_fields_datatypes.includes(d.fieldtype) &&
+					!do_not_include_fields.includes(d.fieldname)
+				) {
 					return [d.label];
 				} else {
 					return null;
 				}
 			});
 
-			fields.unshift('');
+			fields.unshift("");
-			frm.fields_dict.pos_search_fields.grid.update_docfield_property('field', 'options', fields);
+			frm.fields_dict.pos_search_fields.grid.update_docfield_property("field", "options", fields);
 		});
-
+	},
-	}
 });
 
 frappe.ui.form.on("POS Search Fields", {
@@ -61,7 +95,7 @@ frappe.ui.form.on("POS Search Fields", {
 
 		doc.fieldname = df.fieldname;
 		frm.refresh_field("fields");
-	}
+	},
 });
 
 frappe.ui.form.on("POS Field", {
@@ -77,5 +111,5 @@ frappe.ui.form.on("POS Field", {
 		doc.fieldtype = df.fieldtype;
 		doc.default_value = df.default;
 		frm.refresh_field("fields");
-	}
+	},
 });

erpnext/accounts/doctype/pricing_rule/pricing_rule.js

@@ -1,44 +1,43 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on('Pricing Rule', {
+frappe.ui.form.on("Pricing Rule", {
 	setup: function (frm) {
 		frm.fields_dict["for_price_list"].get_query = function (doc) {
 			return {
 				filters: {
-					'selling': doc.selling,
+					selling: doc.selling,
-					'buying': doc.buying,
+					buying: doc.buying,
-					'currency': doc.currency
+					currency: doc.currency,
-				}
+				},
 			};
 		};
 
-		['items', 'item_groups', 'brands'].forEach(d => {
+		["items", "item_groups", "brands"].forEach((d) => {
-			frm.fields_dict[d].grid.get_field('uom').get_query = function(doc, cdt, cdn){
+			frm.fields_dict[d].grid.get_field("uom").get_query = function (doc, cdt, cdn) {
 				var row = locals[cdt][cdn];
 				return {
 					query: "erpnext.accounts.doctype.pricing_rule.pricing_rule.get_item_uoms",
-					filters: {'value': row[frappe.scrub(doc.apply_on)], apply_on: doc.apply_on}
+					filters: { value: row[frappe.scrub(doc.apply_on)], apply_on: doc.apply_on },
-				}
 				};
-		})
+			};
+		});
 	},
 
 	onload: function (frm) {
 		if (frm.doc.__islocal && !frm.doc.applicable_for && (frm.doc.customer || frm.doc.supplier)) {
 			if (frm.doc.customer) {
 				frm.doc.applicable_for = "Customer";
-				frm.doc.selling = 1
+				frm.doc.selling = 1;
 			} else {
 				frm.doc.applicable_for = "Supplier";
-				frm.doc.buying = 1
+				frm.doc.buying = 1;
 			}
 		}
 	},
 
 	refresh: function (frm) {
-		var help_content =
+		var help_content = `<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
-			`<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
 				<tr><td>
 					<h4>
 						<i class="fa fa-hand-right"></i>
@@ -97,7 +96,7 @@ frappe.ui.form.on('Pricing Rule', {
 				</td></tr>
 			</table>`;
 
-		frm.set_df_property('pricing_rule_help', 'options', help_content);
+		frm.set_df_property("pricing_rule_help", "options", help_content);
 		frm.events.set_options_for_applicable_for(frm);
 		frm.trigger("toggle_reqd_apply_on");
 	},
@@ -108,20 +107,19 @@ frappe.ui.form.on('Pricing Rule', {
 
 	toggle_reqd_apply_on: function (frm) {
 		const fields = {
-			'Item Code': 'items',
+			"Item Code": "items",
-			'Item Group': 'item_groups',
+			"Item Group": "item_groups",
-			'Brand': 'brands'
+			Brand: "brands",
-		}
+		};
 
 		for (var key in fields) {
-			frm.toggle_reqd(fields[key],
+			frm.toggle_reqd(fields[key], frm.doc.apply_on === key ? 1 : 0);
-				frm.doc.apply_on === key ? 1 : 0);
 		}
 	},
 
 	rate_or_discount: function (frm) {
-		if(frm.doc.rate_or_discount == 'Rate') {
+		if (frm.doc.rate_or_discount == "Rate") {
-			frm.set_value('for_price_list', "");
+			frm.set_value("for_price_list", "");
 		}
 	},
 
@@ -135,7 +133,11 @@ frappe.ui.form.on('Pricing Rule', {
 
 	//Dynamically change the description based on type of margin
 	margin_type: function (frm) {
-		frm.set_df_property('margin_rate_or_amount', 'description', frm.doc.margin_type=='Percentage'?'In Percentage %':'In Amount');
+		frm.set_df_property(
+			"margin_rate_or_amount",
+			"description",
+			frm.doc.margin_type == "Percentage" ? "In Percentage %" : "In Amount"
+		);
 	},
 
 	set_options_for_applicable_for: function (frm) {
@@ -143,7 +145,13 @@ frappe.ui.form.on('Pricing Rule', {
 		var applicable_for = frm.doc.applicable_for;
 
 		if (frm.doc.selling) {
-			options = $.merge(options, ["Customer", "Customer Group", "Territory", "Sales Partner", "Campaign"]);
+			options = $.merge(options, [
+				"Customer",
+				"Customer Group",
+				"Territory",
+				"Sales Partner",
+				"Campaign",
+			]);
 		}
 		if (frm.doc.buying) {
 			$.merge(options, ["Supplier", "Supplier Group"]);
@@ -153,5 +161,5 @@ frappe.ui.form.on('Pricing Rule', {
 
 		if (!in_list(options, applicable_for)) applicable_for = null;
 		frm.set_value("applicable_for", applicable_for);
-	}
+	},
 });

erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.js

@@ -1,13 +1,13 @@
 // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Process Deferred Accounting', {
+frappe.ui.form.on("Process Deferred Accounting", {
 	setup: function (frm) {
 		frm.set_query("document_type", function () {
 			return {
 				filters: {
-					'name': ['in', ['Sales Invoice', 'Purchase Invoice']]
+					name: ["in", ["Sales Invoice", "Purchase Invoice"]],
-				}
+				},
 			};
 		});
 	},
@@ -17,10 +17,10 @@ frappe.ui.form.on('Process Deferred Accounting', {
 			frm.set_query("account", function () {
 				return {
 					filters: {
-						'company': frm.doc.company,
+						company: frm.doc.company,
-						'root_type': frm.doc.type === 'Income' ? 'Liability' : 'Asset',
+						root_type: frm.doc.type === "Income" ? "Liability" : "Asset",
-						'is_group': 0
+						is_group: 0,
-					}
+					},
 				};
 			});
 		}
@@ -28,10 +28,15 @@ frappe.ui.form.on('Process Deferred Accounting', {
 
 	validate: function () {
 		return new Promise((resolve) => {
-			return frappe.db.get_single_value('Accounts Settings', 'automatically_process_deferred_accounting_entry')
+			return frappe.db
-				.then(value => {
+				.get_single_value("Accounts Settings", "automatically_process_deferred_accounting_entry")
+				.then((value) => {
 					if (value) {
-						frappe.throw(__('Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again'));
+						frappe.throw(
+							__(
+								"Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again"
+							)
+						);
 					}
 					resolve(value);
 				});
@@ -46,8 +51,8 @@ frappe.ui.form.on('Process Deferred Accounting', {
 
 	onload: function (frm) {
 		if (frm.doc.posting_date && frm.doc.docstatus === 0) {
-			frm.set_value('start_date', frappe.datetime.add_months(frm.doc.posting_date, -1));
+			frm.set_value("start_date", frappe.datetime.add_months(frm.doc.posting_date, -1));
-			frm.set_value('end_date', frm.doc.posting_date);
+			frm.set_value("end_date", frm.doc.posting_date);
-		}
 		}
+	},
 });

erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js

@@ -5,51 +5,50 @@ frappe.ui.form.on("Process Payment Reconciliation", {
 	onload: function (frm) {
 		// set queries
 		frm.set_query("party_type", function () {
-			return {
-				"filters": {
-					"name": ["in", Object.keys(frappe.boot.party_account_types)],
-				}
-			}
-		});
-		frm.set_query('receivable_payable_account',  function(doc) {
 			return {
 				filters: {
-					"company": doc.company,
+					name: ["in", Object.keys(frappe.boot.party_account_types)],
-					"is_group": 0,
+				},
-					"account_type": frappe.boot.party_account_types[doc.party_type]
-				}
 			};
 		});
-		frm.set_query('cost_center', function(doc) {
+		frm.set_query("receivable_payable_account", function (doc) {
 			return {
 				filters: {
-					"company": doc.company,
+					company: doc.company,
-					"is_group": 0,
+					is_group: 0,
-				}
+					account_type: frappe.boot.party_account_types[doc.party_type],
+				},
 			};
 		});
-		frm.set_query('bank_cash_account', function(doc) {
+		frm.set_query("cost_center", function (doc) {
+			return {
+				filters: {
+					company: doc.company,
+					is_group: 0,
+				},
+			};
+		});
+		frm.set_query("bank_cash_account", function (doc) {
 			return {
 				filters: [
-					['Account', 'company', '=', doc.company],
+					["Account", "company", "=", doc.company],
-					['Account', 'is_group', '=', 0],
+					["Account", "is_group", "=", 0],
-					['Account', 'account_type', 'in', ['Bank', 'Cash']]
+					["Account", "account_type", "in", ["Bank", "Cash"]],
-				]
+				],
 			};
 		});
-
 	},
 	refresh: function (frm) {
-		if (frm.doc.docstatus==1 && ['Queued', 'Paused'].find(x => x == frm.doc.status)) {
+		if (frm.doc.docstatus == 1 && ["Queued", "Paused"].find((x) => x == frm.doc.status)) {
-			let execute_btn = __("Start / Resume")
+			let execute_btn = __("Start / Resume");
 
 			frm.add_custom_button(execute_btn, () => {
 				frm.call({
-					method: 'erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.trigger_job_for_doc',
+					method: "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.trigger_job_for_doc",
 					args: {
-						docname: frm.doc.name
+						docname: frm.doc.name,
-					}
+					},
-				}).then(r => {
+				}).then((r) => {
 					if (!r.exc) {
 						frappe.show_alert(__("Job Started"));
 						frm.reload_doc();
@@ -57,13 +56,16 @@ frappe.ui.form.on("Process Payment Reconciliation", {
 				});
 			});
 		}
-		if (frm.doc.docstatus==1 && ['Completed', 'Running', 'Paused', 'Partially Reconciled'].find(x => x == frm.doc.status)) {
+		if (
+			frm.doc.docstatus == 1 &&
+			["Completed", "Running", "Paused", "Partially Reconciled"].find((x) => x == frm.doc.status)
+		) {
 			frm.call({
-				'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.get_reconciled_count",
+				method: "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.get_reconciled_count",
 				args: {
-					"docname": frm.docname,
+					docname: frm.docname,
-				}
+				},
-			}).then(r => {
+			}).then((r) => {
 				if (r.message) {
 					let progress = 0;
 					let description = "";
@@ -75,56 +77,53 @@ frappe.ui.form.on("Process Payment Reconciliation", {
 						progress = 100;
 					}
 
-
+					frm.dashboard.add_progress("Reconciliation Progress", progress, description);
-					frm.dashboard.add_progress('Reconciliation Progress', progress, description);
 				}
-			})
+			});
 		}
-		if (frm.doc.docstatus==1 && frm.doc.status == 'Running') {
+		if (frm.doc.docstatus == 1 && frm.doc.status == "Running") {
-			let execute_btn = __("Pause")
+			let execute_btn = __("Pause");
 
 			frm.add_custom_button(execute_btn, () => {
 				frm.call({
-					'method': "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.pause_job_for_doc",
+					method: "erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation.pause_job_for_doc",
 					args: {
-						"docname": frm.docname,
+						docname: frm.docname,
-					}
+					},
-				}).then(r => {
+				}).then((r) => {
 					if (!r.exc) {
 						frappe.show_alert(__("Job Paused"));
-						frm.reload_doc()
+						frm.reload_doc();
 					}
 				});
-
 			});
 		}
 	},
 	company(frm) {
-		frm.set_value('party', '');
+		frm.set_value("party", "");
-		frm.set_value('receivable_payable_account', '');
+		frm.set_value("receivable_payable_account", "");
 	},
 	party_type(frm) {
-		frm.set_value('party', '');
+		frm.set_value("party", "");
 	},
 
 	party(frm) {
-		frm.set_value('receivable_payable_account', '');
+		frm.set_value("receivable_payable_account", "");
 		if (!frm.doc.receivable_payable_account && frm.doc.party_type && frm.doc.party) {
 			return frappe.call({
 				method: "erpnext.accounts.party.get_party_account",
 				args: {
 					company: frm.doc.company,
 					party_type: frm.doc.party_type,
-					party: frm.doc.party
+					party: frm.doc.party,
 				},
 				callback: (r) => {
 					if (!r.exc && r.message) {
 						frm.set_value("receivable_payable_account", r.message);
 					}
 					frm.refresh();
-
+				},
-				}
 			});
 		}
-	}
+	},
 });

erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation_list.js

@@ -1,15 +1,15 @@
-frappe.listview_settings['Process Payment Reconciliation'] = {
+frappe.listview_settings["Process Payment Reconciliation"] = {
 	add_fields: ["status"],
 	get_indicator: function (doc) {
 		let colors = {
-			'Queued': 'orange',
+			Queued: "orange",
-			'Paused': 'orange',
+			Paused: "orange",
-			'Completed': 'green',
+			Completed: "green",
-			'Partially Reconciled': 'orange',
+			"Partially Reconciled": "orange",
-			'Running': 'blue',
+			Running: "blue",
-			'Failed': 'red',
+			Failed: "red",
 		};
 		let status = doc.status;
-		return [__(status), colors[status], 'status,=,'+status];
+		return [__(status), colors[status], "status,=," + status];
 	},
 };

erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.js

@@ -3,15 +3,14 @@
 
 frappe.ui.form.on("Process Payment Reconciliation Log", {
 	refresh(frm) {
-		if (['Completed', 'Running', 'Paused', 'Partially Reconciled'].find(x => x == frm.doc.status)) {
+		if (["Completed", "Running", "Paused", "Partially Reconciled"].find((x) => x == frm.doc.status)) {
 			let progress = 0;
 			if (frm.doc.reconciled_entries != 0) {
-				progress = frm.doc.reconciled_entries / frm.doc.total_allocations * 100;
+				progress = (frm.doc.reconciled_entries / frm.doc.total_allocations) * 100;
 			} else if (frm.doc.total_allocations == 0 && frm.doc.status == "Completed") {
 				progress = 100;
 			}
-			frm.dashboard.add_progress(__('Reconciliation Progress'), progress);
+			frm.dashboard.add_progress(__("Reconciliation Progress"), progress);
 		}
-
 	},
 });

erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log_list.js

@@ -1,13 +1,13 @@
-frappe.listview_settings['Process Payment Reconciliation Log'] = {
+frappe.listview_settings["Process Payment Reconciliation Log"] = {
 	add_fields: ["status"],
 	get_indicator: function (doc) {
 		var colors = {
-			'Partially Reconciled': 'orange',
+			"Partially Reconciled": "orange",
-			'Paused': 'orange',
+			Paused: "orange",
-			'Reconciled': 'green',
+			Reconciled: "green",
-			'Failed': 'red',
+			Failed: "red",
-			'Cancelled': 'red',
+			Cancelled: "red",
-			'Running': 'blue',
+			Running: "blue",
 		};
 		let status = doc.status;
 		return [__(status), colors[status], "status,=," + status];

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js

@@ -1,96 +1,94 @@
 // Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Process Statement Of Accounts', {
+frappe.ui.form.on("Process Statement Of Accounts", {
 	view_properties: function (frm) {
-		frappe.route_options = {doc_type: 'Customer'};
+		frappe.route_options = { doc_type: "Customer" };
 		frappe.set_route("Form", "Customize Form");
 	},
 	refresh: function (frm) {
 		if (!frm.doc.__islocal) {
-			frm.add_custom_button(__('Send Emails'), function(){
+			frm.add_custom_button(__("Send Emails"), function () {
-				if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."))
+				if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."));
 				frappe.call({
 					method: "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_emails",
 					args: {
-						"document_name": frm.doc.name,
+						document_name: frm.doc.name,
 					},
 					callback: function (r) {
 						if (r && r.message) {
-							frappe.show_alert({message: __('Emails Queued'), indicator: 'blue'});
+							frappe.show_alert({ message: __("Emails Queued"), indicator: "blue" });
-						}
+						} else {
-						else{
+							frappe.msgprint(__("No Records for these settings."));
-							frappe.msgprint(__('No Records for these settings.'))
-						}
 						}
+					},
 				});
 			});
-			frm.add_custom_button(__('Download'), function(){
+			frm.add_custom_button(__("Download"), function () {
-				if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."))
+				if (frm.is_dirty()) frappe.throw(__("Please save before proceeding."));
 				let url = frappe.urllib.get_full_url(
-					'/api/method/erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.download_statements?'
+					"/api/method/erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.download_statements?" +
-					+ 'document_name='+encodeURIComponent(frm.doc.name))
+						"document_name=" +
+						encodeURIComponent(frm.doc.name)
+				);
 				$.ajax({
 					url: url,
-					type: 'GET',
+					type: "GET",
 					success: function (result) {
 						if (jQuery.isEmptyObject(result)) {
-							frappe.msgprint(__('No Records for these settings.'));
+							frappe.msgprint(__("No Records for these settings."));
-						}
+						} else {
-						else{
 							window.location = url;
 						}
-					}
+					},
 				});
 			});
 		}
 	},
 	onload: function (frm) {
-		frm.set_query('currency', function(){
+		frm.set_query("currency", function () {
 			return {
 				filters: {
-					'enabled': 1
+					enabled: 1,
-				}
+				},
-			}
+			};
 		});
 		frm.set_query("account", function () {
 			return {
 				filters: {
-					'company': frm.doc.company
+					company: frm.doc.company,
-				}
+				},
 			};
 		});
 		if (frm.doc.__islocal) {
-			frm.set_value('from_date', frappe.datetime.add_months(frappe.datetime.get_today(), -1));
+			frm.set_value("from_date", frappe.datetime.add_months(frappe.datetime.get_today(), -1));
-			frm.set_value('to_date', frappe.datetime.get_today());
+			frm.set_value("to_date", frappe.datetime.get_today());
 		}
 	},
 	report: function (frm) {
 		let filters = {
-			'company': frm.doc.company,
+			company: frm.doc.company,
-		}
+		};
-		if(frm.doc.report == 'Accounts Receivable'){
+		if (frm.doc.report == "Accounts Receivable") {
-			filters['account_type'] = 'Receivable';
+			filters["account_type"] = "Receivable";
 		}
 		frm.set_query("account", function () {
 			return {
-				filters: filters
+				filters: filters,
 			};
 		});
-
 	},
 	customer_collection: function (frm) {
-		frm.set_value('collection_name', '');
+		frm.set_value("collection_name", "");
 		if (frm.doc.customer_collection) {
-			frm.get_field('collection_name').set_label(frm.doc.customer_collection);
+			frm.get_field("collection_name").set_label(frm.doc.customer_collection);
 		}
 	},
 	frequency: function (frm) {
-		if(frm.doc.frequency != ''){
+		if (frm.doc.frequency != "") {
-			frm.set_value('start_date', frappe.datetime.get_today());
+			frm.set_value("start_date", frappe.datetime.get_today());
-		}
+		} else {
-		else{
+			frm.set_value("start_date", "");
-			frm.set_value('start_date', '');
 		}
 	},
 	fetch_customers: function (frm) {
@@ -98,58 +96,55 @@ frappe.ui.form.on('Process Statement Of Accounts', {
 			frappe.call({
 				method: "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.fetch_customers",
 				args: {
-					'customer_collection': frm.doc.customer_collection,
+					customer_collection: frm.doc.customer_collection,
-					'collection_name': frm.doc.collection_name,
+					collection_name: frm.doc.collection_name,
-					'primary_mandatory': frm.doc.primary_mandatory
+					primary_mandatory: frm.doc.primary_mandatory,
 				},
 				callback: function (r) {
 					if (!r.exc) {
 						if (r.message.length) {
-							frm.clear_table('customers');
+							frm.clear_table("customers");
 							for (const customer of r.message) {
-								var row = frm.add_child('customers');
+								var row = frm.add_child("customers");
 								row.customer = customer.name;
 								row.primary_email = customer.primary_email;
 								row.billing_email = customer.billing_email;
 							}
-							frm.refresh_field('customers');
+							frm.refresh_field("customers");
-						}
+						} else {
-						else{
+							frappe.throw(__("No Customers found with selected options."));
-							frappe.throw(__('No Customers found with selected options.'));
-						}
 						}
 					}
+				},
 			});
+		} else {
+			frappe.throw("Enter " + frm.doc.customer_collection + " name.");
 		}
-		else {
+	},
-			frappe.throw('Enter ' + frm.doc.customer_collection + ' name.');
-		}
-	}
 });
 
-frappe.ui.form.on('Process Statement Of Accounts Customer', {
+frappe.ui.form.on("Process Statement Of Accounts Customer", {
 	customer: function (frm, cdt, cdn) {
 		var row = locals[cdt][cdn];
 		if (!row.customer) {
 			return;
 		}
 		frappe.call({
-			method: 'erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.get_customer_emails',
+			method: "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.get_customer_emails",
 			args: {
-				'customer_name': row.customer,
+				customer_name: row.customer,
-				'primary_mandatory': frm.doc.primary_mandatory
+				primary_mandatory: frm.doc.primary_mandatory,
 			},
 			callback: function (r) {
 				if (!r.exe) {
 					if (r.message.length) {
-						frappe.model.set_value(cdt, cdn, "primary_email", r.message[0])
+						frappe.model.set_value(cdt, cdn, "primary_email", r.message[0]);
-						frappe.model.set_value(cdt, cdn, "billing_email", r.message[1])
+						frappe.model.set_value(cdt, cdn, "billing_email", r.message[1]);
-					}
+					} else {
-					else {
+						return;
-						return
 					}
 				}
-			}
+			},
-		})
+		});
-	}
+	},
 });

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py

@@ -455,11 +455,16 @@ def send_emails(document_name, from_scheduler=False, posting_date=None):
 			subject = frappe.render_template(doc.subject, context)
 			message = frappe.render_template(doc.body, context)
 
+			if doc.sender:
+				sender_email = frappe.db.get_value("Email Account", doc.sender, "email_id")
+			else:
+				sender_email = frappe.session.user
+
 			frappe.enqueue(
 				queue="short",
 				method=frappe.sendmail,
 				recipients=recipients,
-				sender=doc.sender or frappe.session.user,
+				sender=sender_email,
 				cc=cc,
 				subject=subject,
 				message=message,

erpnext/accounts/doctype/promotional_scheme/promotional_scheme.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Promotional Scheme', {
+frappe.ui.form.on("Promotional Scheme", {
 	refresh: function (frm) {
 		frm.trigger("set_options_for_applicable_for");
 		frm.trigger("toggle_reqd_apply_on");
@@ -20,7 +20,13 @@ frappe.ui.form.on('Promotional Scheme', {
 		var applicable_for = frm.doc.applicable_for;
 
 		if (frm.doc.selling) {
-			options = $.merge(options, ["Customer", "Customer Group", "Territory", "Sales Partner", "Campaign"]);
+			options = $.merge(options, [
+				"Customer",
+				"Customer Group",
+				"Territory",
+				"Sales Partner",
+				"Campaign",
+			]);
 		}
 		if (frm.doc.buying) {
 			$.merge(options, ["Supplier", "Supplier Group"]);
@@ -38,14 +44,13 @@ frappe.ui.form.on('Promotional Scheme', {
 
 	toggle_reqd_apply_on: function (frm) {
 		const fields = {
-			'Item Code': 'items',
+			"Item Code": "items",
-			'Item Group': 'item_groups',
+			"Item Group": "item_groups",
-			'Brand': 'brands'
+			Brand: "brands",
 		};
 
 		for (var key in fields) {
-			frm.toggle_reqd(fields[key],
+			frm.toggle_reqd(fields[key], frm.doc.apply_on === key ? 1 : 0);
-				frm.doc.apply_on === key ? 1 : 0);
-		}
 		}
+	},
 });

erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py

@@ -60,6 +60,8 @@ product_discount_fields = [
 	"free_item_rate",
 	"same_item",
 	"is_recursive",
+	"recurse_for",
+	"apply_recursion_over",
 	"apply_multiple_pricing_rules",
 ]
 

erpnext/accounts/doctype/promotional_scheme/test_promotional_scheme.py

@@ -107,6 +107,28 @@ class TestPromotionalScheme(unittest.TestCase):
 		price_rules = frappe.get_all("Pricing Rule", filters={"promotional_scheme": ps.name})
 		self.assertEqual(price_rules, [])
 
+	def test_pricing_rule_for_product_discount_slabs(self):
+		ps = make_promotional_scheme()
+		ps.set("price_discount_slabs", [])
+		ps.set(
+			"product_discount_slabs",
+			[
+				{
+					"rule_description": "12+1",
+					"min_qty": 12,
+					"free_item": "_Test Item 2",
+					"free_qty": 1,
+					"is_recursive": 1,
+					"recurse_for": 12,
+				}
+			],
+		)
+		ps.save()
+		pr = frappe.get_doc("Pricing Rule", {"promotional_scheme_id": ps.product_discount_slabs[0].name})
+		self.assertSequenceEqual(
+			[pr.min_qty, pr.free_item, pr.free_qty, pr.recurse_for], [12, "_Test Item 2", 1, 12]
+		)
+
 
 def make_promotional_scheme(**args):
 	args = frappe._dict(args)

erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json

@@ -27,7 +27,9 @@
   "threshold_percentage",
   "column_break_15",
   "priority",
-  "is_recursive"
+  "is_recursive",
+  "recurse_for",
+  "apply_recursion_over"
  ],
  "fields": [
   {
@@ -161,17 +163,36 @@
    "fieldname": "is_recursive",
    "fieldtype": "Check",
    "label": "Is Recursive"
+  },
+  {
+   "default": "0",
+   "depends_on": "is_recursive",
+   "description": "Give free item for every N quantity",
+   "fieldname": "recurse_for",
+   "fieldtype": "Float",
+   "label": "Recurse Every (As Per Transaction UOM)",
+   "mandatory_depends_on": "is_recursive"
+  },
+  {
+   "default": "0",
+   "depends_on": "is_recursive",
+   "description": "Qty for which recursion isn't applicable.",
+   "fieldname": "apply_recursion_over",
+   "fieldtype": "Float",
+   "label": "Apply Recursion Over (As Per Transaction UOM)",
+   "mandatory_depends_on": "is_recursive"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-03-06 21:58:18.162346",
+ "modified": "2024-03-12 12:53:58.199108",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Promotional Scheme Product Discount",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
 }

erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.py

@@ -15,6 +15,7 @@ class PromotionalSchemeProductDiscount(Document):
 		from frappe.types import DF
 
 		apply_multiple_pricing_rules: DF.Check
+		apply_recursion_over: DF.Float
 		disable: DF.Check
 		free_item: DF.Link | None
 		free_item_rate: DF.Currency
@@ -51,6 +52,7 @@ class PromotionalSchemeProductDiscount(Document):
 			"19",
 			"20",
 		]
+		recurse_for: DF.Float
 		rule_description: DF.SmallText
 		same_item: DF.Check
 		threshold_percentage: DF.Percent

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -15,8 +15,8 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 
 		// formatter for purchase invoice item
 		if (this.frm.doc.update_stock) {
-			this.frm.set_indicator_formatter('item_code', function(doc) {
+			this.frm.set_indicator_formatter("item_code", function (doc) {
-				return (doc.qty<=doc.received_qty) ? "green" : "orange";
+				return doc.qty <= doc.received_qty ? "green" : "orange";
 			});
 		}
 
@@ -26,7 +26,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 					company: doc.company,
 					is_group: 0,
 					root_type: "Liability",
-				}
+				},
 			};
 		});
 	}
@@ -57,7 +57,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		// Trigger supplier event on load if supplier is available
 		// The reason for this is PI can be created from PR or PO and supplier is pre populated
 		if (this.frm.doc.supplier && this.frm.doc.__islocal) {
-			this.frm.trigger('supplier');
+			this.frm.trigger("supplier");
 		}
 	}
 
@@ -76,110 +76,131 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		}
 
 		if (this.frm.doc.repost_required && this.frm.doc.docstatus === 1) {
-			this.frm.set_intro(__("Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."));
+			this.frm.set_intro(
-			this.frm.add_custom_button(__('Repost Accounting Entries'),
+				__(
-				() => {
+					"Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."
+				)
+			);
+			this.frm
+				.add_custom_button(__("Repost Accounting Entries"), () => {
 					this.frm.call({
 						doc: this.frm.doc,
-						method: 'repost_accounting_entries',
+						method: "repost_accounting_entries",
 						freeze: true,
-						freeze_message: __('Reposting...'),
+						freeze_message: __("Reposting..."),
 						callback: (r) => {
 							if (!r.exc) {
-								frappe.msgprint(__('Accounting Entries are reposted.'));
+								frappe.msgprint(__("Accounting Entries are reposted."));
 								me.frm.refresh();
 							}
-						}
+						},
 					});
-				}).removeClass('btn-default').addClass('btn-warning');
+				})
+				.removeClass("btn-default")
+				.addClass("btn-warning");
 		}
 
 		if (!doc.is_return && doc.docstatus == 1 && doc.outstanding_amount != 0) {
 			if (doc.on_hold) {
 				this.frm.add_custom_button(
-					__('Change Release Date'),
+					__("Change Release Date"),
-					function() {me.change_release_date()},
+					function () {
-					__('Hold Invoice')
+						me.change_release_date();
+					},
+					__("Hold Invoice")
 				);
 				this.frm.add_custom_button(
-					__('Unblock Invoice'),
+					__("Unblock Invoice"),
-					function() {me.unblock_invoice()},
+					function () {
-					__('Create')
+						me.unblock_invoice();
+					},
+					__("Create")
 				);
 			} else if (!doc.on_hold) {
 				this.frm.add_custom_button(
-					__('Block Invoice'),
+					__("Block Invoice"),
-					function() {me.block_invoice()},
+					function () {
-					__('Create')
+						me.block_invoice();
+					},
+					__("Create")
 				);
 			}
 		}
 
 		if (doc.docstatus == 1 && doc.outstanding_amount != 0 && !doc.on_hold) {
-			this.frm.add_custom_button(
+			this.frm.add_custom_button(__("Payment"), () => this.make_payment_entry(), __("Create"));
-				__('Payment'),
+			cur_frm.page.set_inner_btn_group_as_primary(__("Create"));
-				() => this.make_payment_entry(),
-				__('Create')
-			);
-			cur_frm.page.set_inner_btn_group_as_primary(__('Create'));
 		}
 
 		if (!doc.is_return && doc.docstatus == 1) {
 			if (doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
-				cur_frm.add_custom_button(__('Return / Debit Note'),
+				cur_frm.add_custom_button(__("Return / Debit Note"), this.make_debit_note, __("Create"));
-					this.make_debit_note, __('Create'));
 			}
 		}
 
 		if (doc.outstanding_amount > 0 && !cint(doc.is_return) && !doc.on_hold) {
-			cur_frm.add_custom_button(__('Payment Request'), function() {
+			cur_frm.add_custom_button(
-				me.make_payment_request()
+				__("Payment Request"),
-			}, __('Create'));
+				function () {
+					me.make_payment_request();
+				},
+				__("Create")
+			);
 		}
 
 		if (doc.docstatus === 0) {
-			this.frm.add_custom_button(__('Purchase Order'), function() {
+			this.frm.add_custom_button(
+				__("Purchase Order"),
+				function () {
 					erpnext.utils.map_current_doc({
 						method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
 						source_doctype: "Purchase Order",
 						target: me.frm,
 						setters: {
 							supplier: me.frm.doc.supplier || undefined,
-						schedule_date: undefined
+							schedule_date: undefined,
 						},
 						get_query_filters: {
 							docstatus: 1,
 							status: ["not in", ["Closed", "On Hold"]],
 							per_billed: ["<", 99.99],
-						company: me.frm.doc.company
+							company: me.frm.doc.company,
-					}
+						},
-				})
+					});
-			}, __("Get Items From"));
+				},
+				__("Get Items From")
+			);
 
-			this.frm.add_custom_button(__('Purchase Receipt'), function() {
+			this.frm.add_custom_button(
+				__("Purchase Receipt"),
+				function () {
 					erpnext.utils.map_current_doc({
 						method: "erpnext.stock.doctype.purchase_receipt.purchase_receipt.make_purchase_invoice",
 						source_doctype: "Purchase Receipt",
 						target: me.frm,
 						setters: {
 							supplier: me.frm.doc.supplier || undefined,
-						posting_date: undefined
+							posting_date: undefined,
 						},
 						get_query_filters: {
 							docstatus: 1,
 							status: ["not in", ["Closed", "Completed", "Return Issued"]],
 							company: me.frm.doc.company,
-						is_return: 0
+							is_return: 0,
-					}
+						},
-				})
+					});
-			}, __("Get Items From"));
+				},
+				__("Get Items From")
+			);
 
 			if (!this.frm.doc.is_return) {
 				frappe.db.get_single_value("Buying Settings", "maintain_same_rate").then((value) => {
 					if (value) {
 						this.frm.doc.items.forEach((item) => {
 							this.frm.fields_dict.items.grid.update_docfield_property(
-								"rate", "read_only", (item.purchase_receipt && item.pr_detail)
+								"rate",
+								"read_only",
+								item.purchase_receipt && item.pr_detail
 							);
 						});
 					}
@@ -194,9 +215,13 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 				var internal = supplier.is_internal_supplier;
 				var disabled = supplier.disabled;
 				if (internal == 1 && disabled == 0) {
-					me.frm.add_custom_button("Inter Company Invoice", function() {
+					me.frm.add_custom_button(
+						"Inter Company Invoice",
+						function () {
 							me.make_inter_company_invoice(me.frm);
-					}, __('Create'));
+						},
+						__("Create")
+					);
 				}
 			});
 		}
@@ -208,9 +233,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 	unblock_invoice() {
 		const me = this;
 		frappe.call({
-			'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.unblock_invoice',
+			method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.unblock_invoice",
-			'args': {'name': me.frm.doc.name},
+			args: { name: me.frm.doc.name },
-			'callback': (r) => me.frm.reload_doc()
+			callback: (r) => me.frm.reload_doc(),
 		});
 	}
 
@@ -225,7 +250,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 	can_change_release_date(date) {
 		const diff = frappe.datetime.get_diff(date, frappe.datetime.nowdate());
 		if (diff < 0) {
-			frappe.throw(__('New release date should be in the future'));
+			frappe.throw(__("New release date should be in the future"));
 			return false;
 		} else {
 			return true;
@@ -235,40 +260,40 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 	make_comment_dialog_and_block_invoice() {
 		const me = this;
 
-		const title = __('Block Invoice');
+		const title = __("Block Invoice");
 		const fields = [
 			{
-				fieldname: 'release_date',
+				fieldname: "release_date",
 				read_only: 0,
-				fieldtype:'Date',
+				fieldtype: "Date",
-				label: __('Release Date'),
+				label: __("Release Date"),
 				default: me.frm.doc.release_date,
-				reqd: 1
+				reqd: 1,
 			},
 			{
-				fieldname: 'hold_comment',
+				fieldname: "hold_comment",
 				read_only: 0,
-				fieldtype:'Small Text',
+				fieldtype: "Small Text",
-				label: __('Reason For Putting On Hold'),
+				label: __("Reason For Putting On Hold"),
-				default: ""
+				default: "",
 			},
 		];
 
 		this.dialog = new frappe.ui.Dialog({
 			title: title,
-			fields: fields
+			fields: fields,
 		});
 
-		this.dialog.set_primary_action(__('Save'), function() {
+		this.dialog.set_primary_action(__("Save"), function () {
 			const dialog_data = me.dialog.get_values();
 			frappe.call({
-				'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.block_invoice',
+				method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.block_invoice",
-				'args': {
+				args: {
-					'name': me.frm.doc.name,
+					name: me.frm.doc.name,
-					'hold_comment': dialog_data.hold_comment,
+					hold_comment: dialog_data.hold_comment,
-					'release_date': dialog_data.release_date
+					release_date: dialog_data.release_date,
 				},
-				'callback': (r) => me.frm.reload_doc()
+				callback: (r) => me.frm.reload_doc(),
 			});
 			me.dialog.hide();
 		});
@@ -279,23 +304,23 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 	make_dialog_and_set_release_date() {
 		const me = this;
 
-		const title = __('Set New Release Date');
+		const title = __("Set New Release Date");
 		const fields = [
 			{
-				fieldname: 'release_date',
+				fieldname: "release_date",
 				read_only: 0,
-				fieldtype:'Date',
+				fieldtype: "Date",
-				label: __('Release Date'),
+				label: __("Release Date"),
-				default: me.frm.doc.release_date
+				default: me.frm.doc.release_date,
 			},
 		];
 
 		this.dialog = new frappe.ui.Dialog({
 			title: title,
-			fields: fields
+			fields: fields,
 		});
 
-		this.dialog.set_primary_action(__('Save'), function() {
+		this.dialog.set_primary_action(__("Save"), function () {
 			me.dialog_data = me.dialog.get_values();
 			if (me.can_change_release_date(me.dialog_data.release_date)) {
 				me.dialog_data.name = me.frm.doc.name;
@@ -309,9 +334,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 
 	set_release_date(data) {
 		return frappe.call({
-			'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.change_release_date',
+			method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.change_release_date",
-			'args': data,
+			args: data,
-			'callback': (r) => this.frm.reload_doc()
+			callback: (r) => this.frm.reload_doc(),
 		});
 	}
 
@@ -319,12 +344,13 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		var me = this;
 
 		// Do not update if inter company reference is there as the details will already be updated
-		if(this.frm.updating_party_details || this.frm.doc.inter_company_invoice_reference)
+		if (this.frm.updating_party_details || this.frm.doc.inter_company_invoice_reference) return;
-			return;
 
 		if (this.frm.doc.__onload && this.frm.doc.__onload.load_after_mapping) return;
 
-		erpnext.utils.get_party_details(this.frm, "erpnext.accounts.party.get_party_details",
+		erpnext.utils.get_party_details(
+			this.frm,
+			"erpnext.accounts.party.get_party_details",
 			{
 				posting_date: this.frm.doc.posting_date,
 				bill_date: this.frm.doc.bill_date,
@@ -332,21 +358,23 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 				party_type: "Supplier",
 				account: this.frm.doc.credit_to,
 				price_list: this.frm.doc.buying_price_list,
-				fetch_payment_terms_template: cint(!this.frm.doc.ignore_default_payment_terms_template)
+				fetch_payment_terms_template: cint(!this.frm.doc.ignore_default_payment_terms_template),
-			}, function() {
+			},
+			function () {
 				me.apply_pricing_rule();
 				me.frm.doc.apply_tds = me.frm.supplier_tds ? 1 : 0;
 				me.frm.doc.tax_withholding_category = me.frm.supplier_tds;
 				me.frm.set_df_property("apply_tds", "read_only", me.frm.supplier_tds ? 0 : 1);
 				me.frm.set_df_property("tax_withholding_category", "hidden", me.frm.supplier_tds ? 0 : 1);
-			})
+			}
+		);
 	}
 
 	apply_tds(frm) {
 		var me = this;
 		me.frm.set_value("tax_withheld_vouchers", []);
 		if (!me.frm.doc.apply_tds) {
-			me.frm.set_value("tax_withholding_category", '');
+			me.frm.set_value("tax_withholding_category", "");
 			me.frm.set_df_property("tax_withholding_category", "hidden", 1);
 		} else {
 			me.frm.set_value("tax_withholding_category", me.frm.supplier_tds);
@@ -369,7 +397,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 						me.frm.set_value("party_account_currency", r.message.account_currency);
 						me.set_dynamic_labels();
 					}
-				}
+				},
 			});
 		}
 	}
@@ -377,7 +405,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 	make_inter_company_invoice(frm) {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_inter_company_sales_invoice",
-			frm: frm
+			frm: frm,
 		});
 	}
 
@@ -386,7 +414,7 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		if (cint(this.frm.doc.is_paid)) {
 			this.frm.set_value("allocate_advances_automatically", 0);
 			if (!this.frm.doc.company) {
-				this.frm.set_value("is_paid", 0)
+				this.frm.set_value("is_paid", 0);
 				frappe.msgprint(__("Please specify Company to proceed"));
 			}
 		}
@@ -413,23 +441,27 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 
 	items_add(doc, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
-		this.frm.script_manager.copy_from_first_row("items", row,
+		this.frm.script_manager.copy_from_first_row("items", row, [
-			["expense_account", "discount_account", "cost_center", "project"]);
+			"expense_account",
+			"discount_account",
+			"cost_center",
+			"project",
+		]);
 	}
 
 	on_submit() {
 		super.on_submit();
 
 		$.each(this.frm.doc["items"] || [], function (i, row) {
-			if(row.purchase_receipt) frappe.model.clear_doc("Purchase Receipt", row.purchase_receipt)
+			if (row.purchase_receipt) frappe.model.clear_doc("Purchase Receipt", row.purchase_receipt);
-		})
+		});
 	}
 
 	make_debit_note() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_debit_note",
-			frm: cur_frm
+			frm: cur_frm,
-		})
+		});
 	}
 };
 
@@ -438,7 +470,7 @@ cur_frm.script_manager.make(erpnext.accounts.PurchaseInvoice);
 // Hide Fields
 // ------------
 function hide_fields(doc) {
-	var parent_fields = ['due_date', 'is_opening', 'advances_section', 'from_date', 'to_date'];
+	var parent_fields = ["due_date", "is_opening", "advances_section", "from_date", "to_date"];
 
 	if (cint(doc.is_paid) == 1) {
 		hide_field(parent_fields);
@@ -447,13 +479,14 @@ function hide_fields(doc) {
 			var docfield = frappe.meta.docfield_map[doc.doctype][parent_fields[i]];
 			if (!docfield.hidden) unhide_field(parent_fields[i]);
 		}
-
 	}
 
-	var item_fields_stock = ['warehouse_section', 'received_qty', 'rejected_qty'];
+	var item_fields_stock = ["warehouse_section", "received_qty", "rejected_qty"];
 
-	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
+	cur_frm.fields_dict["items"].grid.set_column_disp(
-		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
+		item_fields_stock,
+		cint(doc.update_stock) == 1 || cint(doc.is_return) == 1 ? true : false
+	);
 
 	cur_frm.refresh_fields();
 }
@@ -464,49 +497,47 @@ cur_frm.fields_dict.cash_bank_account.get_query = function(doc) {
 			["Account", "account_type", "in", ["Cash", "Bank"]],
 			["Account", "is_group", "=", 0],
 			["Account", "company", "=", doc.company],
-			["Account", "report_type", "=", "Balance Sheet"]
+			["Account", "report_type", "=", "Balance Sheet"],
-		]
+		],
-	}
+	};
-}
+};
 
-cur_frm.fields_dict['items'].grid.get_field("item_code").get_query = function(doc, cdt, cdn) {
+cur_frm.fields_dict["items"].grid.get_field("item_code").get_query = function (doc, cdt, cdn) {
 	return {
 		query: "erpnext.controllers.queries.item_query",
-		filters: {'is_purchase_item': 1}
+		filters: { is_purchase_item: 1 },
-	}
+	};
-}
+};
 
-cur_frm.fields_dict['credit_to'].get_query = function(doc) {
+cur_frm.fields_dict["credit_to"].get_query = function (doc) {
 	// filter on Account
 	return {
 		filters: {
-			'account_type': 'Payable',
+			account_type: "Payable",
-			'is_group': 0,
+			is_group: 0,
-			'company': doc.company
+			company: doc.company,
-		}
+		},
-	}
+	};
-}
+};
 
 // Get Print Heading
-cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) {
+cur_frm.fields_dict["select_print_heading"].get_query = function (doc, cdt, cdn) {
 	return {
-		filters:[
+		filters: [["Print Heading", "docstatus", "!=", 2]],
-			['Print Heading', 'docstatus', '!=', 2]
+	};
-		]
+};
-	}
-}
 
 cur_frm.set_query("expense_account", "items", function (doc) {
 	return {
 		query: "erpnext.controllers.queries.get_expense_account",
-		filters: {'company': doc.company }
+		filters: { company: doc.company },
-	}
+	};
 });
 
 cur_frm.set_query("wip_composite_asset", "items", function () {
 	return {
-		filters: {'is_composite_asset': 1, 'docstatus': 0 }
+		filters: { is_composite_asset: 1, docstatus: 0 },
-	}
+	};
 });
 
 cur_frm.cscript.expense_account = function (doc, cdt, cdn) {
@@ -517,18 +548,17 @@ cur_frm.cscript.expense_account = function(doc, cdt, cdn){
 			if (!cl[i].expense_account) cl[i].expense_account = d.expense_account;
 		}
 	}
-	refresh_field('items');
+	refresh_field("items");
-}
+};
 
 cur_frm.fields_dict["items"].grid.get_field("cost_center").get_query = function (doc) {
 	return {
 		filters: {
-			'company': doc.company,
+			company: doc.company,
-			'is_group': 0
+			is_group: 0,
-		}
+		},
-
+	};
-	}
+};
-}
 
 cur_frm.cscript.cost_center = function (doc, cdt, cdn) {
 	var d = locals[cdt][cdn];
@@ -538,24 +568,24 @@ cur_frm.cscript.cost_center = function(doc, cdt, cdn){
 			if (!cl[i].cost_center) cl[i].cost_center = d.cost_center;
 		}
 	}
-	refresh_field('items');
+	refresh_field("items");
-}
+};
 
-cur_frm.fields_dict['items'].grid.get_field('project').get_query = function(doc, cdt, cdn) {
+cur_frm.fields_dict["items"].grid.get_field("project").get_query = function (doc, cdt, cdn) {
 	return {
-		filters:[
+		filters: [["Project", "status", "not in", "Completed, Cancelled"]],
-			['Project', 'status', 'not in', 'Completed, Cancelled']
+	};
-		]
+};
-	}
-}
 
 frappe.ui.form.on("Purchase Invoice", {
 	setup: function (frm) {
 		frm.custom_make_buttons = {
-			'Purchase Invoice': 'Return / Debit Note',
+			"Purchase Invoice": "Return / Debit Note",
-			'Payment Entry': 'Payment',
+			"Payment Entry": "Payment",
-			'Landed Cost Voucher': function () { frm.trigger('create_landed_cost_voucher') },
+			"Landed Cost Voucher": function () {
-		}
+				frm.trigger("create_landed_cost_voucher");
+			},
+		};
 
 		frm.set_query("additional_discount_account", function () {
 			return {
@@ -563,29 +593,29 @@ frappe.ui.form.on("Purchase Invoice", {
 					company: frm.doc.company,
 					is_group: 0,
 					report_type: "Profit and Loss",
-				}
+				},
 			};
 		});
 
-		frm.fields_dict['items'].grid.get_field('deferred_expense_account').get_query = function(doc) {
+		frm.fields_dict["items"].grid.get_field("deferred_expense_account").get_query = function (doc) {
 			return {
 				filters: {
-					'root_type': 'Asset',
+					root_type: "Asset",
-					'company': doc.company,
+					company: doc.company,
-					"is_group": 0
+					is_group: 0,
-				}
+				},
-			}
+			};
-		}
+		};
 
-		frm.fields_dict['items'].grid.get_field('discount_account').get_query = function(doc) {
+		frm.fields_dict["items"].grid.get_field("discount_account").get_query = function (doc) {
 			return {
 				filters: {
-					'report_type': 'Profit and Loss',
+					report_type: "Profit and Loss",
-					'company': doc.company,
+					company: doc.company,
-					"is_group": 0
+					is_group: 0,
-				}
+				},
-			}
+			};
-		}
+		};
 	},
 
 	refresh: function (frm) {
@@ -595,15 +625,15 @@ frappe.ui.form.on("Purchase Invoice", {
 	mode_of_payment: function (frm) {
 		erpnext.accounts.pos.get_payment_mode_account(frm, frm.doc.mode_of_payment, function (account) {
 			frm.set_value("cash_bank_account", account);
-		})
+		});
 	},
 
 	create_landed_cost_voucher: function (frm) {
-		let lcv = frappe.model.get_new_doc('Landed Cost Voucher');
+		let lcv = frappe.model.get_new_doc("Landed Cost Voucher");
 		lcv.company = frm.doc.company;
 
-		let lcv_receipt = frappe.model.get_new_doc('Landed Cost Purchase Invoice');
+		let lcv_receipt = frappe.model.get_new_doc("Landed Cost Purchase Invoice");
-		lcv_receipt.receipt_document_type = 'Purchase Invoice';
+		lcv_receipt.receipt_document_type = "Purchase Invoice";
 		lcv_receipt.receipt_document = frm.doc.name;
 		lcv_receipt.supplier = frm.doc.supplier;
 		lcv_receipt.grand_total = frm.doc.grand_total;
@@ -614,19 +644,27 @@ frappe.ui.form.on("Purchase Invoice", {
 
 	add_custom_buttons: function (frm) {
 		if (frm.doc.docstatus == 1 && frm.doc.per_received < 100) {
-			frm.add_custom_button(__('Purchase Receipt'), () => {
+			frm.add_custom_button(
+				__("Purchase Receipt"),
+				() => {
 					frm.events.make_purchase_receipt(frm);
-			}, __('Create'));
+				},
+				__("Create")
+			);
 		}
 
 		if (frm.doc.docstatus == 1 && frm.doc.per_received > 0) {
-			frm.add_custom_button(__('Purchase Receipt'), () => {
+			frm.add_custom_button(
+				__("Purchase Receipt"),
+				() => {
 					frappe.route_options = {
-					'purchase_invoice': frm.doc.name
+						purchase_invoice: frm.doc.name,
-				}
+					};
 
-				frappe.set_route("List", "Purchase Receipt", "List")
+					frappe.set_route("List", "Purchase Receipt", "List");
-			}, __('View'));
+				},
+				__("View")
+			);
 		}
 	},
 
@@ -666,8 +704,8 @@ frappe.ui.form.on("Purchase Invoice", {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_purchase_receipt",
 			frm: frm,
-			freeze_message: __("Creating Purchase Receipt ...")
+			freeze_message: __("Creating Purchase Receipt ..."),
-		})
+		});
 	},
 
 	company: function (frm) {
@@ -675,12 +713,11 @@ frappe.ui.form.on("Purchase Invoice", {
 
 		if (frm.doc.company) {
 			frappe.call({
-				method:
+				method: "erpnext.accounts.party.get_party_account",
-					"erpnext.accounts.party.get_party_account",
 				args: {
-					party_type: 'Supplier',
+					party_type: "Supplier",
 					party: frm.doc.supplier,
-					company: frm.doc.company
+					company: frm.doc.company,
 				},
 				callback: (response) => {
 					if (response) frm.set_value("credit_to", response.message);
@@ -688,4 +725,4 @@ frappe.ui.form.on("Purchase Invoice", {
 			});
 		}
 	},
-})
+});

erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js

@@ -22,38 +22,25 @@ frappe.listview_settings["Purchase Invoice"] = {
 			return [__(doc.status), "gray", "status,=," + doc.status];
 		}
 
-		if (
+		if (flt(doc.outstanding_amount) > 0 && doc.docstatus == 1 && cint(doc.on_hold)) {
-			flt(doc.outstanding_amount) > 0 &&
-			doc.docstatus == 1 &&
-			cint(doc.on_hold)
-		) {
 			if (!doc.release_date) {
 				return [__("On Hold"), "darkgrey"];
-			} else if (
+			} else if (frappe.datetime.get_diff(doc.release_date, frappe.datetime.nowdate()) > 0) {
-				frappe.datetime.get_diff(
-					doc.release_date,
-					frappe.datetime.nowdate()
-				) > 0
-			) {
 				return [__("Temporarily on Hold"), "darkgrey"];
 			}
 		}
 
 		const status_colors = {
-			"Unpaid": "orange",
+			Unpaid: "orange",
-			"Paid": "green",
+			Paid: "green",
-			"Return": "gray",
+			Return: "gray",
-			"Overdue": "red",
+			Overdue: "red",
 			"Partly Paid": "yellow",
 			"Internal Transfer": "darkgrey",
 		};
 
 		if (status_colors[doc.status]) {
-			return [
+			return [__(doc.status), status_colors[doc.status], "status,=," + doc.status];
-				__(doc.status),
-				status_colors[doc.status],
-				"status,=," + doc.status,
-			];
 		}
 	},
 
@@ -65,5 +52,5 @@ frappe.listview_settings["Purchase Invoice"] = {
 		listview.page.add_action_item(__("Payment"), () => {
 			erpnext.bulk_transaction_processing.create(listview, "Purchase Invoice", "Payment Entry");
 		});
-	}
+	},
 };

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -2098,6 +2098,92 @@ class TestPurchaseInvoice(FrappeTestCase, StockTestMixin):
 		return_pi.submit()
 		self.assertEqual(return_pi.docstatus, 1)
 
+	def test_purchase_invoice_with_use_serial_batch_field_for_rejected_qty(self):
+		from erpnext.stock.doctype.item.test_item import make_item
+		from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+
+		batch_item = make_item(
+			"_Test Purchase Invoice Batch Item For Rejected Qty",
+			properties={"has_batch_no": 1, "create_new_batch": 1, "is_stock_item": 1},
+		).name
+
+		serial_item = make_item(
+			"_Test Purchase Invoice Serial Item for Rejected Qty",
+			properties={"has_serial_no": 1, "is_stock_item": 1},
+		).name
+
+		rej_warehouse = create_warehouse("_Test Purchase INV Warehouse For Rejected Qty")
+
+		batch_no = "BATCH-PI-BNU-TPRBI-0001"
+		serial_nos = ["SNU-PI-TPRSI-0001", "SNU-PI-TPRSI-0002", "SNU-PI-TPRSI-0003"]
+
+		if not frappe.db.exists("Batch", batch_no):
+			frappe.get_doc(
+				{
+					"doctype": "Batch",
+					"batch_id": batch_no,
+					"item": batch_item,
+				}
+			).insert()
+
+		for serial_no in serial_nos:
+			if not frappe.db.exists("Serial No", serial_no):
+				frappe.get_doc(
+					{
+						"doctype": "Serial No",
+						"item_code": serial_item,
+						"serial_no": serial_no,
+					}
+				).insert()
+
+		pi = make_purchase_invoice(
+			item_code=batch_item,
+			received_qty=10,
+			qty=8,
+			rejected_qty=2,
+			update_stock=1,
+			rejected_warehouse=rej_warehouse,
+			use_serial_batch_fields=1,
+			batch_no=batch_no,
+			rate=100,
+			do_not_submit=1,
+		)
+
+		pi.append(
+			"items",
+			{
+				"item_code": serial_item,
+				"qty": 2,
+				"rate": 100,
+				"base_rate": 100,
+				"item_name": serial_item,
+				"uom": "Nos",
+				"stock_uom": "Nos",
+				"conversion_factor": 1,
+				"rejected_qty": 1,
+				"warehouse": pi.items[0].warehouse,
+				"rejected_warehouse": rej_warehouse,
+				"use_serial_batch_fields": 1,
+				"serial_no": "\n".join(serial_nos[:2]),
+				"rejected_serial_no": serial_nos[2],
+			},
+		)
+
+		pi.save()
+		pi.submit()
+
+		pi.reload()
+
+		for row in pi.items:
+			self.assertTrue(row.serial_and_batch_bundle)
+			self.assertTrue(row.rejected_serial_and_batch_bundle)
+
+			if row.item_code == batch_item:
+				self.assertEqual(row.batch_no, batch_no)
+			else:
+				self.assertEqual(row.serial_no, "\n".join(serial_nos[:2]))
+				self.assertEqual(row.rejected_serial_no, serial_nos[2])
+
 
 def set_advance_flag(company, flag, default_account):
 	frappe.db.set_value(
@@ -2205,7 +2291,7 @@ def make_purchase_invoice(**args):
 	pi.cost_center = args.parent_cost_center
 
 	bundle_id = None
-	if args.get("batch_no") or args.get("serial_no"):
+	if not args.use_serial_batch_fields and ((args.get("batch_no") or args.get("serial_no"))):
 		batches = {}
 		qty = args.qty or 5
 		item_code = args.item or args.item_code or "_Test Item"
@@ -2252,6 +2338,9 @@ def make_purchase_invoice(**args):
 			"rejected_warehouse": args.rejected_warehouse or "",
 			"asset_location": args.location or "",
 			"allow_zero_valuation_rate": args.get("allow_zero_valuation_rate") or 0,
+			"use_serial_batch_fields": args.get("use_serial_batch_fields") or 0,
+			"batch_no": args.get("batch_no") if args.get("use_serial_batch_fields") else "",
+			"serial_no": args.get("serial_no") if args.get("use_serial_batch_fields") else "",
 		},
 	)
 

erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js

@@ -10,22 +10,21 @@ frappe.ui.form.on("Purchase Taxes and Charges", {
 
 		if (!d.category && d.add_deduct_tax) {
 			frappe.msgprint(__("Please select Category first"));
-			d.add_deduct_tax = '';
+			d.add_deduct_tax = "";
-		}
+		} else if (d.category != "Total" && d.add_deduct_tax == "Deduct") {
-		else if(d.category != 'Total' && d.add_deduct_tax == 'Deduct') {
 			frappe.msgprint(__("Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"));
-			d.add_deduct_tax = '';
+			d.add_deduct_tax = "";
 		}
-		refresh_field('add_deduct_tax', d.name, 'taxes');
+		refresh_field("add_deduct_tax", d.name, "taxes");
 	},
 
 	category(doc, cdt, cdn) {
 		let d = locals[cdt][cdn];
 
-		if(d.category != 'Total' && d.add_deduct_tax == 'Deduct') {
+		if (d.category != "Total" && d.add_deduct_tax == "Deduct") {
 			frappe.msgprint(__("Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"));
-			d.add_deduct_tax = '';
+			d.add_deduct_tax = "";
-		}
-		refresh_field('add_deduct_tax', d.name, 'taxes');
 		}
+		refresh_field("add_deduct_tax", d.name, "taxes");
+	},
 });

erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.js

@@ -3,31 +3,31 @@
 
 frappe.ui.form.on("Repost Accounting Ledger", {
 	setup: function (frm) {
-		frm.fields_dict['vouchers'].grid.get_field('voucher_type').get_query = function(doc) {
+		frm.fields_dict["vouchers"].grid.get_field("voucher_type").get_query = function (doc) {
 			return {
-				query: "erpnext.accounts.doctype.repost_accounting_ledger.repost_accounting_ledger.get_repost_allowed_types"
+				query: "erpnext.accounts.doctype.repost_accounting_ledger.repost_accounting_ledger.get_repost_allowed_types",
-			}
+			};
-		}
+		};
 
-		frm.fields_dict['vouchers'].grid.get_field('voucher_no').get_query = function(doc) {
+		frm.fields_dict["vouchers"].grid.get_field("voucher_no").get_query = function (doc) {
 			if (doc.company) {
 				return {
 					filters: {
 						company: doc.company,
-						docstatus: 1
+						docstatus: 1,
-					}
+					},
-				}
+				};
-			}
 			}
+		};
 	},
 
 	refresh: function (frm) {
-		frm.add_custom_button(__('Show Preview'), () => {
+		frm.add_custom_button(__("Show Preview"), () => {
 			frm.call({
-				method: 'generate_preview',
+				method: "generate_preview",
 				doc: frm.doc,
 				freeze: true,
-				freeze_message: __('Generating Preview'),
+				freeze_message: __("Generating Preview"),
 				callback: function (r) {
 					if (r && r.message) {
 						let content = r.message;
@@ -38,11 +38,11 @@ frappe.ui.form.on("Repost Accounting Ledger", {
 							print_settings: { orientation: "landscape" },
 							columns: [],
 							data: [],
-						}
+						};
 						frappe.render_grid(opts);
 					}
-				}
+				},
 			});
 		});
-	}
+	},
 });

erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.js

@@ -1,53 +1,53 @@
 // Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Repost Payment Ledger', {
+frappe.ui.form.on("Repost Payment Ledger", {
 	setup: function (frm) {
 		frm.set_query("voucher_type", () => {
 			return {
 				filters: {
-					name: ['in', ['Purchase Invoice', 'Sales Invoice', 'Payment Entry', 'Journal Entry']]
+					name: ["in", ["Purchase Invoice", "Sales Invoice", "Payment Entry", "Journal Entry"]],
-				}
+				},
 			};
 		});
 
-		frm.fields_dict['repost_vouchers'].grid.get_field('voucher_type').get_query = function(doc) {
+		frm.fields_dict["repost_vouchers"].grid.get_field("voucher_type").get_query = function (doc) {
 			return {
 				filters: {
-					name: ['in', ['Purchase Invoice', 'Sales Invoice', 'Payment Entry', 'Journal Entry']]
+					name: ["in", ["Purchase Invoice", "Sales Invoice", "Payment Entry", "Journal Entry"]],
-				}
+				},
-			}
+			};
-		}
+		};
 
-		frm.fields_dict['repost_vouchers'].grid.get_field('voucher_no').get_query = function(doc) {
+		frm.fields_dict["repost_vouchers"].grid.get_field("voucher_no").get_query = function (doc) {
 			if (doc.company) {
 				return {
 					filters: {
 						company: doc.company,
-						docstatus: 1
+						docstatus: 1,
+					},
+				};
 			}
-				}
+		};
-			}
-		}
-
 	},
 	refresh: function (frm) {
-
+		if (frm.doc.docstatus == 1 && ["Queued", "Failed"].find((x) => x == frm.doc.repost_status)) {
-		if (frm.doc.docstatus==1 && ['Queued', 'Failed'].find(x => x == frm.doc.repost_status)) {
+			frm.set_intro(
-			frm.set_intro(__("Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."));
+				__(
-			var btn_label = __("Repost in background")
+					"Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."
+				)
+			);
+			var btn_label = __("Repost in background");
 
 			frm.add_custom_button(btn_label, () => {
 				frappe.call({
-					method: 'erpnext.accounts.doctype.repost_payment_ledger.repost_payment_ledger.execute_repost_payment_ledger',
+					method: "erpnext.accounts.doctype.repost_payment_ledger.repost_payment_ledger.execute_repost_payment_ledger",
 					args: {
 						docname: frm.doc.name,
-					}
+					},
 				});
-				frappe.msgprint(__('Reposting in the background.'));
+				frappe.msgprint(__("Reposting in the background."));
 			});
 		}
-
+	},
-	}
 });
-

erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger_list.js

@@ -2,11 +2,11 @@ frappe.listview_settings["Repost Payment Ledger"] = {
 	add_fields: ["repost_status"],
 	get_indicator: function (doc) {
 		var colors = {
-			'Queued': 'orange',
+			Queued: "orange",
-			'Completed': 'green',
+			Completed: "green",
-			'Failed': 'red',
+			Failed: "red",
 		};
 		let status = doc.repost_status;
-		return [__(status), colors[status], 'status,=,'+status];
+		return [__(status), colors[status], "status,=," + status];
 	},
 };

erpnext/accounts/doctype/sales_invoice/regional/italy.js

@@ -1,23 +1,23 @@
 frappe.ui.form.on("Sales Invoice", {
 	refresh: (frm) => {
 		if (frm.doc.docstatus == 1) {
-            frm.add_custom_button(__('Generate E-Invoice'), () => {
+			frm.add_custom_button(__("Generate E-Invoice"), () => {
 				frm.call({
 					method: "erpnext.regional.italy.utils.generate_single_invoice",
 					args: {
-                        docname: frm.doc.name
+						docname: frm.doc.name,
 					},
 					callback: function (r) {
 						frm.reload_doc();
 						if (r.message) {
 							open_url_post(frappe.request.url, {
-                                cmd: 'frappe.core.doctype.file.file.download_file',
+								cmd: "frappe.core.doctype.file.file.download_file",
-                                file_url: r.message
+								file_url: r.message,
 							});
 						}
-                    }
+					},
 				});
 			});
 		}
-    }
+	},
 });

erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js

@@ -2,22 +2,30 @@
 // License: GNU General Public License v3. See license.txt
 
 // render
-frappe.listview_settings['Sales Invoice'] = {
+frappe.listview_settings["Sales Invoice"] = {
-	add_fields: ["customer", "customer_name", "base_grand_total", "outstanding_amount", "due_date", "company",
+	add_fields: [
-		"currency", "is_return"],
+		"customer",
+		"customer_name",
+		"base_grand_total",
+		"outstanding_amount",
+		"due_date",
+		"company",
+		"currency",
+		"is_return",
+	],
 	get_indicator: function (doc) {
 		const status_colors = {
-			"Draft": "grey",
+			Draft: "grey",
-			"Unpaid": "orange",
+			Unpaid: "orange",
-			"Paid": "green",
+			Paid: "green",
-			"Return": "gray",
+			Return: "gray",
 			"Credit Note Issued": "gray",
 			"Unpaid and Discounted": "orange",
 			"Partly Paid and Discounted": "yellow",
 			"Overdue and Discounted": "red",
-			"Overdue": "red",
+			Overdue: "red",
 			"Partly Paid": "yellow",
-			"Internal Transfer": "darkgrey"
+			"Internal Transfer": "darkgrey",
 		};
 		return [__(doc.status), status_colors[doc.status], "status,=," + doc.status];
 	},
@@ -31,5 +39,5 @@ frappe.listview_settings['Sales Invoice'] = {
 		listview.page.add_action_item(__("Payment"), () => {
 			erpnext.bulk_transaction_processing.create(listview, "Sales Invoice", "Payment Entry");
 		});
-	}
+	},
 };

erpnext/accounts/doctype/share_transfer/share_transfer.js

@@ -3,21 +3,19 @@
 
 frappe.provide("erpnext.share_transfer");
 
-frappe.ui.form.on('Share Transfer', {
+frappe.ui.form.on("Share Transfer", {
 	refresh: function (frm) {
 		// Don't show Parties which are a Company
-		let shareholders = ['from_shareholder', 'to_shareholder'];
+		let shareholders = ["from_shareholder", "to_shareholder"];
 		shareholders.forEach((shareholder) => {
 			frm.fields_dict[shareholder].get_query = function () {
 				return {
-					filters: [
+					filters: [["Shareholder", "is_company", "=", 0]],
-						["Shareholder", "is_company", "=", 0]
-					]
 				};
 			};
 		});
 		if (frm.doc.docstatus == 1 && frm.doc.equity_or_liability_account && frm.doc.asset_account) {
-			frm.add_custom_button(__('Create Journal Entry'), function () {
+			frm.add_custom_button(__("Create Journal Entry"), function () {
 				erpnext.share_transfer.make_jv(frm);
 			});
 		}
@@ -36,25 +34,26 @@ frappe.ui.form.on('Share Transfer', {
 	},
 	company: async function (frm) {
 		if (frm.doc.company) {
-			let currency = (await frappe.db.get_value("Company", frm.doc.company, "default_currency")).message.default_currency;
+			let currency = (await frappe.db.get_value("Company", frm.doc.company, "default_currency")).message
+				.default_currency;
 			frm.set_query("equity_or_liability_account", function () {
 				return {
 					filters: {
-						"is_group":0,
+						is_group: 0,
-						"root_type": ["in",["Equity","Liability"]],
+						root_type: ["in", ["Equity", "Liability"]],
-						"company": frm.doc.company,
+						company: frm.doc.company,
-						"account_currency": currency
+						account_currency: currency,
-					}
+					},
 				};
 			});
 			frm.set_query("asset_account", function () {
 				return {
 					filters: {
-						"is_group":0,
+						is_group: 0,
-						"root_type":"Asset",
+						root_type: "Asset",
-						"company": frm.doc.company,
+						company: frm.doc.company,
-						"account_currency": currency
+						account_currency: currency,
-					}
+					},
 				};
 			});
 		}
@@ -62,7 +61,7 @@ frappe.ui.form.on('Share Transfer', {
 
 	transfer_type: function (frm) {
 		frm.toggle_reqd("asset_account", frm.doc.transfer_type != "Transfer");
-	}
+	},
 });
 
 erpnext.share_transfer.update_amount = function (frm) {
@@ -71,8 +70,12 @@ erpnext.share_transfer.update_amount = function(frm) {
 };
 
 erpnext.share_transfer.make_jv = function (frm) {
-	var account, payment_account, credit_applicant_type, credit_applicant,
+	var account,
-		debit_applicant_type, debit_applicant;
+		payment_account,
+		credit_applicant_type,
+		credit_applicant,
+		debit_applicant_type,
+		debit_applicant;
 
 	if (frm.doc.transfer_type == "Transfer") {
 		account = frm.doc.equity_or_liability_account;
@@ -81,16 +84,14 @@ erpnext.share_transfer.make_jv = function (frm) {
 		credit_applicant = frm.doc.to_shareholder;
 		debit_applicant_type = "Shareholder";
 		debit_applicant = frm.doc.from_shareholder;
-	}
+	} else if (frm.doc.transfer_type == "Issue") {
-	else if (frm.doc.transfer_type == "Issue") {
 		account = frm.doc.asset_account;
 		payment_account = frm.doc.equity_or_liability_account;
 		credit_applicant_type = "Shareholder";
 		credit_applicant = frm.doc.to_shareholder;
 		debit_applicant_type = "";
 		debit_applicant = "";
-	}
+	} else {
-	else {
 		account = frm.doc.equity_or_liability_account;
 		payment_account = frm.doc.asset_account;
 		credit_applicant_type = "";
@@ -100,19 +101,19 @@ erpnext.share_transfer.make_jv = function (frm) {
 	}
 	frappe.call({
 		args: {
-			"company": frm.doc.company,
+			company: frm.doc.company,
-			"account": account,
+			account: account,
-			"amount": frm.doc.amount,
+			amount: frm.doc.amount,
-			"payment_account": payment_account,
+			payment_account: payment_account,
-			"credit_applicant_type": credit_applicant_type,
+			credit_applicant_type: credit_applicant_type,
-			"credit_applicant": credit_applicant,
+			credit_applicant: credit_applicant,
-			"debit_applicant_type": debit_applicant_type,
+			debit_applicant_type: debit_applicant_type,
-			"debit_applicant": debit_applicant
+			debit_applicant: debit_applicant,
 		},
 		method: "erpnext.accounts.doctype.share_transfer.share_transfer.make_jv_entry",
 		callback: function (r) {
 			var doc = frappe.model.sync(r.message)[0];
 			frappe.set_route("Form", doc.doctype, doc.name);
-		}
+		},
 	});
 };