Skip to content

Commit

Permalink
feat: multi-select customer group in AR Report
Browse files Browse the repository at this point in the history
(cherry picked from commit 8903c1b)
  • Loading branch information
vishdha authored and mergify[bot] committed Nov 9, 2023
1 parent 4eb80ea commit fff294f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,13 @@ frappe.query_reports["Accounts Receivable"] = {
"reqd": 1
},
{
"fieldname": "customer_group",
"fieldname":"customer_group",
"label": __("Customer Group"),
"fieldtype": "Link",
"options": "Customer Group"
"fieldtype": "MultiSelectList",
"options": "Customer Group",
get_data: function(txt) {
return frappe.db.get_link_options('Customer Group', txt);
}
},
{
"fieldname": "payment_terms_template",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,9 @@ def add_customer_filters(
self.customer = qb.DocType("Customer")

if self.filters.get("customer_group"):
self.get_hierarchical_filters("Customer Group", "customer_group")
groups = get_customer_group_with_children(self.filters.customer_group)
customers = qb.from_(self.customer).select(self.customer.name).where(self.customer['customer_group'].isin(groups))
self.qb_selection_filter.append(self.ple.party.isin(customers))

if self.filters.get("territory"):
self.get_hierarchical_filters("Territory", "territory")
Expand Down Expand Up @@ -1132,3 +1134,18 @@ def get_exchange_rate_revaluations(self):
.run()
)
self.err_journals = [x[0] for x in results] if results else []

def get_customer_group_with_children(customer_groups):
if not isinstance(customer_groups, list):
customer_groups = [d.strip() for d in customer_groups.strip().split(",") if d]

all_customer_groups = []
for d in customer_groups:
if frappe.db.exists("Customer Group", d):
lft, rgt = frappe.db.get_value("Customer Group", d, ["lft", "rgt"])
children = frappe.get_all("Customer Group", filters={"lft": [">=", lft], "rgt": ["<=", rgt]})
all_customer_groups += [c.name for c in children]
else:
frappe.throw(_("Customer Group: {0} does not exist").format(d))

return list(set(all_customer_groups))

0 comments on commit fff294f

Please sign in to comment.