From 8371dafb1a4e11f5f2210d496f92490f65bb6ea9 Mon Sep 17 00:00:00 2001 From: l0gesh29 Date: Thu, 26 Jun 2025 18:32:54 +0530 Subject: [PATCH] fix: add not specified key for None respresented customer_group and territory (cherry picked from commit 24cc711a70607f4699e3ce4230d7a87d7b5d762c) # Conflicts: # erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py --- .../item_wise_sales_register/item_wise_sales_register.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index db93c0ef325..73d8c3f7d14 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -5,13 +5,14 @@ import frappe from frappe import _ from frappe.model.meta import get_field_precision +from frappe.query_builder import functions as fn from frappe.utils import cstr, flt from frappe.utils.nestedset import get_descendants_of from frappe.utils.xlsxutils import handle_html from pypika import Order from erpnext.accounts.report.sales_register.sales_register import get_mode_of_payments -from erpnext.accounts.report.utils import get_query_columns, get_values_for_columns +from erpnext.accounts.report.utils import get_values_for_columns from erpnext.selling.report.item_wise_sales_history.item_wise_sales_history import ( get_customer_details, ) @@ -433,7 +434,7 @@ def get_items(filters, additional_query_columns, additional_conditions=None): si.is_internal_customer, si.customer, si.remarks, - si.territory, + fn.IfNull(si.territory, "Not Specified").as_("territory"), si.company, si.base_net_total, sii.project, @@ -456,7 +457,7 @@ def get_items(filters, additional_query_columns, additional_conditions=None): sii.base_net_rate, sii.base_net_amount, si.customer_name, - si.customer_group, + fn.IfNull(si.customer_group, "Not Specified").as_("customer_group"), sii.so_detail, si.update_stock, sii.uom,