fix: Item Wise report query fix (#20760)
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index 8b6359c..4523f66 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -306,10 +306,6 @@
def get_items(filters, additional_query_columns):
conditions = get_conditions(filters)
- match_conditions = frappe.build_match_conditions("Purchase Invoice")
-
- if match_conditions:
- match_conditions = " and {0} ".format(match_conditions)
if additional_query_columns:
additional_query_columns = ', ' + ', '.join(additional_query_columns)
@@ -327,8 +323,8 @@
`tabPurchase Invoice`.supplier_name, `tabPurchase Invoice`.mode_of_payment {0}
from `tabPurchase Invoice`, `tabPurchase Invoice Item`
where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.`parent` and
- `tabPurchase Invoice`.docstatus = 1 %s %s
- """.format(additional_query_columns) % (conditions, match_conditions), filters, as_dict=1)
+ `tabPurchase Invoice`.docstatus = 1 %s
+ """.format(additional_query_columns) % (conditions), filters, as_dict=1)
def get_aii_accounts():
return dict(frappe.db.sql("select name, stock_received_but_not_billed from tabCompany"))
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 2cc2db6..786e04d 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
@@ -119,7 +119,7 @@
add_sub_total_row(total_row, total_row_map, 'total_row', tax_columns)
data.append(total_row_map.get('total_row'))
skip_total_row = 1
-
+
return columns, data, None, None, None, skip_total_row
def get_columns(additional_table_columns, filters):
@@ -370,10 +370,6 @@
def get_items(filters, additional_query_columns):
conditions = get_conditions(filters)
- match_conditions = frappe.build_match_conditions("Sales Invoice")
-
- if match_conditions:
- match_conditions = " and {0} ".format(match_conditions)
if additional_query_columns:
additional_query_columns = ', ' + ', '.join(additional_query_columns)
@@ -394,8 +390,8 @@
`tabSales Invoice`.update_stock, `tabSales Invoice Item`.uom, `tabSales Invoice Item`.qty {0}
from `tabSales Invoice`, `tabSales Invoice Item`
where `tabSales Invoice`.name = `tabSales Invoice Item`.parent
- and `tabSales Invoice`.docstatus = 1 {1} {2}
- """.format(additional_query_columns or '', conditions, match_conditions), filters, as_dict=1) #nosec
+ and `tabSales Invoice`.docstatus = 1 {1}
+ """.format(additional_query_columns or '', conditions), filters, as_dict=1) #nosec
def get_delivery_notes_against_sales_order(item_list):
so_dn_map = frappe._dict()