chore: removing controllers from pre-commit eslint hooks exclude list (#56575)

* chore: removed `controllers` from exclude list on `.pre-commit-config.yaml`

* chore: fix `transactions.js` eslint issues

* chore: fix `taxes_and_totals.js` eslint issue

* chore: fix `accounts.js` eslint issue

(cherry picked from commit 485e9041de)

# Conflicts:
#	erpnext/public/js/controllers/accounts.js
#	erpnext/public/js/controllers/taxes_and_totals.js
#	erpnext/public/js/controllers/transaction.js

.pre-commit-config.yaml

@@ -50,7 +50,6 @@ repos:
                 cypress/.*|
                 .*node_modules.*|
                 .*boilerplate.*|
-                erpnext/public/js/controllers/.*|
                 erpnext/templates/pages/order.js|
                 erpnext/templates/includes/.*
             )$

erpnext/public/js/controllers/accounts.js

@@ -16,6 +16,7 @@ erpnext.accounts.taxes = {
 					}
 				});
 			},
+<<<<<<< HEAD
 			onload: function(frm) {
 				if(frm.get_field("taxes")) {
 					frm.set_query("account_head", "taxes", function(doc) {
@@ -23,6 +24,17 @@ erpnext.accounts.taxes = {
 							var account_type = ["Tax", "Chargeable", "Expense Account"];
 						} else {
 							var account_type = ["Tax", "Chargeable", "Income Account", "Expenses Included In Valuation"];
+=======
+			onload: function (frm) {
+				if (frm.get_field("taxes")) {
+					frm.set_query("account_head", "taxes", function (doc) {
+						let account_type = ["Tax", "Chargeable"];
+
+						if (frm.cscript.tax_table == "Sales Taxes and Charges") {
+							account_type.push("Expense Account");
+						} else {
+							account_type.push("Income Account", "Expenses Included In Valuation");
+>>>>>>> 485e9041de (chore: removing `controllers` from pre-commit eslint hooks exclude list (#56575))
 						}
 
 						return {

erpnext/public/js/controllers/taxes_and_totals.js

@@ -862,7 +862,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
 		if(["Sales Invoice", "POS Invoice", "Purchase Invoice"].includes(this.frm.doc.doctype)) {
 			let grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
 			let base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
+			let total_amount_to_pay;
 
+<<<<<<< HEAD
 			if(this.frm.doc.party_account_currency == this.frm.doc.currency) {
 				var total_amount_to_pay = flt((grand_total - this.frm.doc.total_advance
 					- this.frm.doc.write_off_amount), precision("grand_total"));
@@ -870,6 +872,18 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
 				var total_amount_to_pay = flt(
 					(flt(base_grand_total, precision("base_grand_total"))
 						- this.frm.doc.total_advance - this.frm.doc.base_write_off_amount),
+=======
+			if (this.frm.doc.party_account_currency == this.frm.doc.currency) {
+				total_amount_to_pay = flt(
+					grand_total - this.frm.doc.total_advance - this.frm.doc.write_off_amount,
+					precision("grand_total")
+				);
+			} else {
+				total_amount_to_pay = flt(
+					flt(base_grand_total, precision("base_grand_total")) -
+						this.frm.doc.total_advance -
+						this.frm.doc.base_write_off_amount,
+>>>>>>> 485e9041de (chore: removing `controllers` from pre-commit eslint hooks exclude list (#56575))
 					precision("base_grand_total")
 				);
 			}
@@ -901,13 +915,15 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
 	async set_total_amount_to_default_mop() {
 		let grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
 		let base_grand_total = this.frm.doc.base_rounded_total || this.frm.doc.base_grand_total;
+		let total_amount_to_pay;
 
 		if (this.frm.doc.party_account_currency == this.frm.doc.currency) {
-			var total_amount_to_pay = flt(
+			total_amount_to_pay = flt(
 				grand_total - this.frm.doc.total_advance - this.frm.doc.write_off_amount,
 				precision("grand_total")
 			);
 		} else {
+<<<<<<< HEAD
 			var total_amount_to_pay = flt(
 				(
 					flt(
@@ -916,6 +932,12 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
 					)
 					- this.frm.doc.total_advance - this.frm.doc.base_write_off_amount
 				),
+=======
+			total_amount_to_pay = flt(
+				flt(base_grand_total, precision("base_grand_total")) -
+					this.frm.doc.total_advance -
+					this.frm.doc.base_write_off_amount,
+>>>>>>> 485e9041de (chore: removing `controllers` from pre-commit eslint hooks exclude list (#56575))
 				precision("base_grand_total")
 			);
 		}

erpnext/public/js/controllers/transaction.js

@@ -1007,6 +1007,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 
 		var set_party_account = function(set_pricing) {
 			if (["Sales Invoice", "Purchase Invoice"].includes(me.frm.doc.doctype)) {
+<<<<<<< HEAD
 				if(me.frm.doc.doctype=="Sales Invoice") {
 					var party_type = "Customer";
 					var party_account_field = 'debit_to';
@@ -1014,6 +1015,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 					var party_type = "Supplier";
 					var party_account_field = 'credit_to';
 				}
+=======
+				let party_type = me.frm.doc.doctype == "Sales Invoice" ? "Customer" : "Supplier";
+				let party_account_field = me.frm.doc.doctype == "Sales Invoice" ? "debit_to" : "credit_to";
+>>>>>>> 485e9041de (chore: removing `controllers` from pre-commit eslint hooks exclude list (#56575))
 
 				var party = me.frm.doc[frappe.model.scrub(party_type)];
 				if(party && me.frm.doc.company && (!me.frm.doc.__onload?.load_after_mapping || !me.frm.doc[party_account_field])) {
@@ -1596,16 +1601,23 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		this.toggle_item_grid_columns(company_currency);
 
 		if (this.frm.doc.operations && this.frm.doc.operations.length > 0) {
+<<<<<<< HEAD
 			this.frm.set_currency_labels(["operating_cost", "hour_rate"], this.frm.doc.currency, "operations");
 			this.frm.set_currency_labels(["base_operating_cost", "base_hour_rate"], company_currency, "operations");
 
 			var item_grid = this.frm.fields_dict["operations"].grid;
 			$.each(["base_operating_cost", "base_hour_rate"], function(i, fname) {
 				if(frappe.meta.get_docfield(item_grid.doctype, fname))
+=======
+			let item_grid = this.frm.fields_dict["operations"].grid;
+			$.each(["base_operating_cost", "base_hour_rate"], function (i, fname) {
+				if (frappe.meta.get_docfield(item_grid.doctype, fname))
+>>>>>>> 485e9041de (chore: removing `controllers` from pre-commit eslint hooks exclude list (#56575))
 					item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
 			});
 		}
 
+<<<<<<< HEAD
 		if (this.frm.doc.scrap_items && this.frm.doc.scrap_items.length > 0) {
 			this.frm.set_currency_labels(["rate", "amount"], this.frm.doc.currency, "scrap_items");
 			this.frm.set_currency_labels(["base_rate", "base_amount"], company_currency, "scrap_items");
@@ -1613,6 +1625,12 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 			var item_grid = this.frm.fields_dict["scrap_items"].grid;
 			$.each(["base_rate", "base_amount"], function(i, fname) {
 				if(frappe.meta.get_docfield(item_grid.doctype, fname))
+=======
+		if (this.frm.doc.secondary_items && this.frm.doc.secondary_items.length > 0) {
+			let item_grid = this.frm.fields_dict["secondary_items"].grid;
+			$.each(["base_rate", "base_amount"], function (i, fname) {
+				if (frappe.meta.get_docfield(item_grid.doctype, fname))
+>>>>>>> 485e9041de (chore: removing `controllers` from pre-commit eslint hooks exclude list (#56575))
 					item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
 			});
 		}
@@ -2005,7 +2023,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 				row_to_modify[key] = pr_row[key];
 			}
 
-			if (this.frm.doc.hasOwnProperty("is_pos") && this.frm.doc.is_pos) {
+			if (Object.prototype.hasOwnProperty.call(this.frm.doc, "is_pos") && this.frm.doc.is_pos) {
 				let r = await frappe.db.get_value("POS Profile", this.frm.doc.pos_profile, "cost_center");
 				if (r.message.cost_center) {
 					row_to_modify["cost_center"] = r.message.cost_center;
@@ -2237,8 +2255,17 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 				},
 				callback: function(r) {
 					if (!r.exc) {
+<<<<<<< HEAD
 						$.each(me.frm.doc.items || [], function(i, item) {
 							if (item.name && r.message.hasOwnProperty(item.name) && r.message[item.name].item_tax_template) {
+=======
+						$.each(me.frm.doc.items || [], function (i, item) {
+							if (
+								item.name &&
+								Object.prototype.hasOwnProperty.call(r.message, item.name) &&
+								r.message[item.name].item_tax_template
+							) {
+>>>>>>> 485e9041de (chore: removing `controllers` from pre-commit eslint hooks exclude list (#56575))
 								item.item_tax_template = r.message[item.name].item_tax_template;
 								item.item_tax_rate = r.message[item.name].item_tax_rate;
 								me.add_taxes_from_item_tax_template(item.item_tax_rate);