fix: better syntax for checking empty arrays
diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.js b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.js
index 767d529..ca78be4 100644
--- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.js
+++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.js
@@ -7,8 +7,8 @@
"breadcrumb":"Selling",
"filters": [
{
- fieldname:"expected_closing_date",
- label: __("Expected Closing Date"),
+ fieldname:"transaction_date",
+ label: __("Transaction Date"),
fieldtype: "DateRange",
default: [frappe.datetime.add_months(frappe.datetime.get_today(),-1), frappe.datetime.get_today()],
},
diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
index 842e634..415d078 100644
--- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
+++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
@@ -57,14 +57,26 @@
sales_invoices = get_sales_invoice(sales_orders)
for territory in frappe.get_all("Territory"):
- territory_opportunities = list(filter(lambda x: x.territory == territory.name, opportunities)) if opportunities and opportunities else []
- t_opportunity_names = [t.name for t in territory_opportunities] if territory_opportunities else []
+ territory_opportunities = []
+ if opportunities:
+ territory_opportunities = list(filter(lambda x: x.territory == territory.name, opportunities))
+ t_opportunity_names = []
+ if territory_opportunities:
+ t_opportunity_names = [t.name for t in territory_opportunities]
- territory_quotations = list(filter(lambda x: x.opportunity in t_opportunity_names, quotations)) if t_opportunity_names and quotations else []
- t_quotation_names = [t.name for t in territory_quotations] if territory_quotations else []
+ territory_quotations = []
+ if t_opportunity_names and quotations:
+ territory_quotations = list(filter(lambda x: x.opportunity in t_opportunity_names, quotations))
+ t_quotation_names = []
+ if territory_quotations:
+ t_quotation_names = [t.name for t in territory_quotations]
- territory_orders = list(filter(lambda x: x.quotation in t_quotation_names, sales_orders)) if t_quotation_names and sales_orders else []
- t_order_names = [t.name for t in territory_orders] if territory_orders else []
+ territory_orders = []
+ if t_quotation_names and sales_orders:
+ list(filter(lambda x: x.quotation in t_quotation_names, sales_orders))
+ t_order_names = []
+ if territory_orders:
+ t_order_names = [t.name for t in territory_orders]
territory_invoices = list(filter(lambda x: x.sales_order in t_order_names, sales_invoices)) if t_order_names and sales_invoices else []
@@ -83,7 +95,7 @@
conditions = ""
if filters.from_date and filters.to_date:
- conditions = " WHERE expected_closing between %(from_date)s and %(to_date)s"
+ conditions = " WHERE transaction_date between %(from_date)s and %(to_date)s"
if filters.company:
if conditions: