From 38efd5cb0b2e0a689ea1ee9f63c87705cb255845 Mon Sep 17 00:00:00 2001 From: Rehan Ansari Date: Sun, 12 Oct 2025 19:01:54 +0530 Subject: [PATCH 1/2] fix: filter sales team to show only active individual salespersons (cherry picked from commit 2fcd406b1827fc3d2f4919e23b6f9b942a0f4cf6) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.js --- .../accounts/doctype/sales_invoice/sales_invoice.js | 13 +++++++++++++ erpnext/selling/doctype/sales_order/sales_order.js | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index a19850af8f1..7de51134ac9 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -797,7 +797,20 @@ frappe.ui.form.on("Sales Invoice", { is_group: 0, }, }; +<<<<<<< HEAD }; +======= + }); + + frm.set_query("sales_person", "sales_team", function () { + return { + filters: { + is_group: 0, + enabled: 1, + }, + }; + }); +>>>>>>> 2fcd406b18 (fix: filter sales team to show only active individual salespersons) }, onload: function (frm) { frm.redemption_conversion_factor = null; diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index f29cd253818..4e6f8203f58 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -44,6 +44,15 @@ frappe.ui.form.on("Sales Order", { }; }); + frm.set_query("sales_person", "sales_team", function () { + return { + filters: { + is_group: 0, + enabled: 1, + }, + }; + }); + frm.set_df_property("packed_items", "cannot_add_rows", true); frm.set_df_property("packed_items", "cannot_delete_rows", true); }, From dccc561eec5f952b85ba24331f12630f4de25b8a Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Tue, 14 Oct 2025 17:25:48 +0530 Subject: [PATCH 2/2] fix: resolve conflict --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 7de51134ac9..193014d340d 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -797,10 +797,7 @@ frappe.ui.form.on("Sales Invoice", { is_group: 0, }, }; -<<<<<<< HEAD }; -======= - }); frm.set_query("sales_person", "sales_team", function () { return { @@ -810,7 +807,6 @@ frappe.ui.form.on("Sales Invoice", { }, }; }); ->>>>>>> 2fcd406b18 (fix: filter sales team to show only active individual salespersons) }, onload: function (frm) { frm.redemption_conversion_factor = null;