nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-13 03:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove alias for order by field

Browse Source 
(cherry picked from commit 048b87328b)
This commit is contained in:
l0gesh29
2025-07-28 12:57:06 +05:30
committed by Mergify
parent 794fac12a4
commit 193fbcba11
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@@ -310,8 +310,8 @@ def apply_conditions(query, pi, pii, filters):
def get_items(filters, additional_table_columns): def get_items(filters, additional_table_columns):
doctype = "Purchase Invoice" doctype = "Purchase Invoice"
pi = frappe.qb.DocType(doctype).as_("invoice") pi = frappe.qb.DocType("Purchase Invoice")
pii = frappe.qb.DocType(f"{doctype} Item").as_("invoice_item") pii = frappe.qb.DocType("Purchase Invoice Item")
Item = frappe.qb.DocType("Item") Item = frappe.qb.DocType("Item")
query = ( query = (
frappe.qb.from_(pi) frappe.qb.from_(pi)
@@ -375,7 +375,7 @@ def get_items(filters, additional_table_columns):
if match_conditions: if match_conditions:
query += " and " + match_conditions query += " and " + match_conditions
query = apply_order_by_conditions(query, filters) query = apply_order_by_conditions(doctype, query, filters)
return frappe.db.sql(query, params, as_dict=True) return frappe.db.sql(query, params, as_dict=True)

21
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@@ -394,15 +394,18 @@ def apply_conditions(query, si, sii, sip, filters, additional_conditions=None):
return query return query
def apply_order_by_conditions(query, filters): def apply_order_by_conditions(doctype, query, filters):
i = f"`tab{doctype}`"
ii = f"`tab{doctype} Item`"
if not filters.get("group_by"): if not filters.get("group_by"):
query += "order by invoice.posting_date desc, invoice_item.item_group desc" query += f" order by {i}.posting_date desc, {ii}.item_group desc"
elif filters.get("group_by") == "Invoice": elif filters.get("group_by") == "Invoice":
query += "order by invoice_item.parent desc" query += f" order by {ii}.parent desc"
elif filters.get("group_by") == "Item": elif filters.get("group_by") == "Item":
query += "order by invoice_item.item_code" query += f" order by {ii}.item_code"
elif filters.get("group_by") == "Item Group": elif filters.get("group_by") == "Item Group":
query += "order by invoice_item.item_group" query += f" order by {ii}.item_group"
elif filters.get("group_by") in ("Customer", "Customer Group", "Territory", "Supplier"): elif filters.get("group_by") in ("Customer", "Customer Group", "Territory", "Supplier"):
filter_field = frappe.scrub(filters.get("group_by")) filter_field = frappe.scrub(filters.get("group_by"))
query += f" order by {filter_field} desc" query += f" order by {filter_field} desc"
@@ -412,8 +415,8 @@ def apply_order_by_conditions(query, filters):
def get_items(filters, additional_query_columns, additional_conditions=None): def get_items(filters, additional_query_columns, additional_conditions=None):
doctype = "Sales Invoice" doctype = "Sales Invoice"
si = frappe.qb.DocType("Sales Invoice").as_("invoice") si = frappe.qb.DocType("Sales Invoice")
sii = frappe.qb.DocType("Sales Invoice Item").as_("invoice_item") sii = frappe.qb.DocType("Sales Invoice Item")
sip = frappe.qb.DocType("Sales Invoice Payment") sip = frappe.qb.DocType("Sales Invoice Payment")
item = frappe.qb.DocType("Item") item = frappe.qb.DocType("Item")
@@ -487,12 +490,12 @@ def get_items(filters, additional_query_columns, additional_conditions=None):
from frappe.desk.reportview import build_match_conditions from frappe.desk.reportview import build_match_conditions
query, params = query.walk() query, params = query.walk()
match_conditions = build_match_conditions("Sales Invoice") match_conditions = build_match_conditions(doctype)
if match_conditions: if match_conditions:
query += " and " + match_conditions query += " and " + match_conditions
query = apply_order_by_conditions(query, filters) query = apply_order_by_conditions(doctype, query, filters)
return frappe.db.sql(query, params, as_dict=True) return frappe.db.sql(query, params, as_dict=True)