Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31230 from deepeshgarg007/item_wise_report_perf

Browse Source 
fix: Remove redundant query
This commit is contained in:
Deepesh Garg 2022-06-06 12:23:56 +05:30 committed by GitHub
commit a8c1b01437
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -443,12 +443,6 @@ def get_grand_total(filters, doctype):
] # nosec ] # nosec
def get_deducted_taxes():
return frappe.db.sql_list(
"select name from `tabPurchase Taxes and Charges` where add_deduct_tax = 'Deduct'"
)
def get_tax_accounts( def get_tax_accounts(
item_list, item_list,
columns, columns,
@ -462,6 +456,7 @@ def get_tax_accounts(
tax_columns = [] tax_columns = []
invoice_item_row = {} invoice_item_row = {}
itemised_tax = {} itemised_tax = {}
add_deduct_tax = "charge_type"
tax_amount_precision = ( tax_amount_precision = (
get_field_precision( get_field_precision(
@ -477,13 +472,13 @@ def get_tax_accounts(
conditions = "" conditions = ""
if doctype == "Purchase Invoice": if doctype == "Purchase Invoice":
conditions = " and category in ('Total', 'Valuation and Total') and base_tax_amount_after_discount_amount != 0" conditions = " and category in ('Total', 'Valuation and Total') and base_tax_amount_after_discount_amount != 0"
add_deduct_tax = "add_deduct_tax"
deducted_tax = get_deducted_taxes()
tax_details = frappe.db.sql( tax_details = frappe.db.sql(
""" """
select select
name, parent, description, item_wise_tax_detail, name, parent, description, item_wise_tax_detail,
charge_type, base_tax_amount_after_discount_amount charge_type, {add_deduct_tax}, base_tax_amount_after_discount_amount
from `tab%s` from `tab%s`
where where
parenttype = %s and docstatus = 1 parenttype = %s and docstatus = 1
@ -491,12 +486,22 @@ def get_tax_accounts(
and parent in (%s) and parent in (%s)
%s %s
order by description order by description
""" """.format(
add_deduct_tax=add_deduct_tax
)
% (tax_doctype, "%s", ", ".join(["%s"] * len(invoice_item_row)), conditions), % (tax_doctype, "%s", ", ".join(["%s"] * len(invoice_item_row)), conditions),
tuple([doctype] + list(invoice_item_row)), tuple([doctype] + list(invoice_item_row)),
) )
for name, parent, description, item_wise_tax_detail, charge_type, tax_amount in tax_details: for (
name,
parent,
description,
item_wise_tax_detail,
charge_type,
add_deduct_tax,
tax_amount,
) in tax_details:
description = handle_html(description) description = handle_html(description)
if description not in tax_columns and tax_amount: if description not in tax_columns and tax_amount:
# as description is text editor earlier and markup can break the column convention in reports # as description is text editor earlier and markup can break the column convention in reports
@ -529,7 +534,9 @@ def get_tax_accounts(
if item_tax_amount: if item_tax_amount:
tax_value = flt(item_tax_amount, tax_amount_precision) tax_value = flt(item_tax_amount, tax_amount_precision)
tax_value = ( tax_value = (
tax_value * -1 if (doctype == "Purchase Invoice" and name in deducted_tax) else tax_value tax_value * -1
if (doctype == "Purchase Invoice" and add_deduct_tax == "Deduct")
else tax_value
) )
itemised_tax.setdefault(d.name, {})[description] = frappe._dict( itemised_tax.setdefault(d.name, {})[description] = frappe._dict(