From 503e8e2418e443cf147920872e9b5af415a5287c Mon Sep 17 00:00:00 2001
From: pugazhendhivelu <pugazhendhi720@gmail.com>
Date: Mon, 21 Jul 2025 20:10:08 +0530
Subject: [PATCH] chore: rename function set company filters

(cherry picked from commit 4edbe77f6795a2aa7da21ac0eaca2a99156389d4)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.js
---
 erpnext/manufacturing/doctype/job_card/job_card.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js
index 2799f7267f9..ccda1fdea3f 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card.js
@@ -23,8 +23,8 @@ frappe.ui.form.on("Job Card", {
 			};
 		});
 
-		frm.events.setCompanyFilters(frm, "source_warehouse");
-		frm.events.setCompanyFilters(frm, "wip_warehouse");
+		frm.events.set_company_filters(frm, "source_warehouse");
+		frm.events.set_company_filters(frm, "wip_warehouse");
 		frm.set_query("source_warehouse", "items", () => {
 			return {
 				filters: {
@@ -42,9 +42,13 @@ frappe.ui.form.on("Job Card", {
 		});
 	},
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 	setCompanyFilters(frm, fieldname) {
+=======
+	set_company_filters(frm, fieldname) {
+>>>>>>> 4edbe77f67 (chore: rename function set company filters)
 		frm.set_query(fieldname, () => {
 			return {
 				filters: {