nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-13 17:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(inactive_customers): rename sales alias to sales_doctype

Browse Source
This commit is contained in:
Nabin Hait
2026-06-08 11:52:56 +05:30
parent 8f15dd4d5d
commit 8d7edafc99
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/selling/report/inactive_customers/inactive_customers.py
View File

@@ -35,7 +35,7 @@ def execute(filters=None):
def get_sales_details(doctype): def get_sales_details(doctype):
customer = frappe.qb.DocType("Customer") customer = frappe.qb.DocType("Customer")
sales = frappe.qb.DocType(doctype) sales_doctype = frappe.qb.DocType(doctype)
date_diff = CustomFunction("DATEDIFF", ["d1", "d2"]) date_diff = CustomFunction("DATEDIFF", ["d1", "d2"])
current_date = CustomFunction("CURRENT_DATE", []) current_date = CustomFunction("CURRENT_DATE", [])
@@ -43,46 +43,49 @@ def get_sales_details(doctype):
if doctype == "Sales Order": if doctype == "Sales Order":
total_considered = Sum( total_considered = Sum(
Case() Case()
.when(sales.status == "Stopped", sales.base_net_total * sales.per_delivered / 100) .when(
.else_(sales.base_net_total) sales_doctype.status == "Stopped",
sales_doctype.base_net_total * sales_doctype.per_delivered / 100,
)
.else_(sales_doctype.base_net_total)
) )
date_col = sales.transaction_date date_col = sales_doctype.transaction_date
else: else:
total_considered = Sum(sales.base_net_total) total_considered = Sum(sales_doctype.base_net_total)
date_col = sales.posting_date date_col = sales_doctype.posting_date
last_order_date = Max(date_col) last_order_date = Max(date_col)
days_since_last_order = date_diff(current_date(), last_order_date) days_since_last_order = date_diff(current_date(), last_order_date)
return ( return (
frappe.qb.from_(customer) frappe.qb.from_(customer)
.inner_join(sales) .inner_join(sales_doctype)
.on(customer.name == sales.customer) .on(customer.name == sales_doctype.customer)
.select( .select(
customer.name, customer.name,
customer.customer_name, customer.customer_name,
customer.territory, customer.territory,
customer.customer_group, customer.customer_group,
Count(sales.name).distinct().as_("num_of_order"), Count(sales_doctype.name).distinct().as_("num_of_order"),
Sum(sales.base_net_total).as_("total_order_value"), Sum(sales_doctype.base_net_total).as_("total_order_value"),
total_considered.as_("total_order_considered"), total_considered.as_("total_order_considered"),
last_order_date.as_("last_order_date"), last_order_date.as_("last_order_date"),
days_since_last_order.as_("days_since_last_order"), days_since_last_order.as_("days_since_last_order"),
) )
.where(sales.docstatus == 1) .where(sales_doctype.docstatus == 1)
.groupby(customer.name) .groupby(customer.name)
.orderby(days_since_last_order, order=frappe.qb.desc) .orderby(days_since_last_order, order=frappe.qb.desc)
).run(as_list=True) ).run(as_list=True)
def get_last_sales_amt(customer, doctype): def get_last_sales_amt(customer, doctype):
sales = frappe.qb.DocType(doctype) sales_doctype = frappe.qb.DocType(doctype)
date_col = sales.transaction_date if doctype == "Sales Order" else sales.posting_date date_col = sales_doctype.transaction_date if doctype == "Sales Order" else sales_doctype.posting_date
res = ( res = (
frappe.qb.from_(sales) frappe.qb.from_(sales_doctype)
.select(sales.base_net_total) .select(sales_doctype.base_net_total)
.where((sales.customer == customer) & (sales.docstatus == 1)) .where((sales_doctype.customer == customer) & (sales_doctype.docstatus == 1))
.orderby(date_col, order=frappe.qb.desc) .orderby(date_col, order=frappe.qb.desc)
.limit(1) .limit(1)
).run() ).run()