From 185b715d431c0e27f59053cf3c67e90f87ee67a4 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 2 Dec 2023 19:50:35 +0530 Subject: [PATCH] feat: add customer group filter in sales register (#38365) feat: add customer group filter in sales register (cherry picked from commit 5a97fa633631a3cb7dd0f4f7305cde293fd80ce2) Co-authored-by: Nandhinidevi123 --- erpnext/accounts/report/sales_register/sales_register.js | 6 ++++++ erpnext/accounts/report/sales_register/sales_register.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/erpnext/accounts/report/sales_register/sales_register.js b/erpnext/accounts/report/sales_register/sales_register.js index 1a41172a97..4578ac3f6e 100644 --- a/erpnext/accounts/report/sales_register/sales_register.js +++ b/erpnext/accounts/report/sales_register/sales_register.js @@ -22,6 +22,12 @@ frappe.query_reports["Sales Register"] = { "fieldtype": "Link", "options": "Customer" }, + { + "fieldname":"customer_group", + "label": __("Customer Group"), + "fieldtype": "Link", + "options": "Customer Group" + }, { "fieldname":"company", "label": __("Company"), diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py index 0ba7186fa6..ec6dd72908 100644 --- a/erpnext/accounts/report/sales_register/sales_register.py +++ b/erpnext/accounts/report/sales_register/sales_register.py @@ -449,6 +449,9 @@ def get_invoices(filters, additional_query_columns): if filters.get("customer"): query = query.where(si.customer == filters.customer) + if filters.get("customer_group"): + query = query.where(si.customer_group == filters.customer_group) + query = get_conditions(filters, query, "Sales Invoice") query = apply_common_conditions( filters, query, doctype="Sales Invoice", child_doctype="Sales Invoice Item"