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

refactor: use single qb query for PE and PI

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-10 14:37:33 +05:30
parent 4f0aa54c09
commit 44493707e2
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@ -24,7 +24,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
if filters.get("include_payments") and filters.include_payments: if filters.get("include_payments") and filters.include_payments:
invoice_list += get_payments(filters, additional_query_columns) invoice_list += get_payments(filters, additional_query_columns)
columns, expense_accounts, tax_accounts, unrealized_profit_loss_accounts = get_columns( columns, expense_accounts, tax_accounts, unrealized_profit_loss_accounts = get_columns(
invoice_list, additional_table_columns invoice_list, additional_table_columns, filters.get("include_payments")
) )
if not invoice_list: if not invoice_list:
@ -101,7 +101,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
return columns, data return columns, data
def get_columns(invoice_list, additional_table_columns): def get_columns(invoice_list, additional_table_columns, include_payments):
"""return columns based on filters""" """return columns based on filters"""
columns = [ columns = [
_("Invoice") + ":Link/Purchase Invoice:120", _("Invoice") + ":Link/Purchase Invoice:120",
@ -141,16 +141,18 @@ def get_columns(invoice_list, additional_table_columns):
tuple([inv.name for inv in invoice_list]), tuple([inv.name for inv in invoice_list]),
) )
tax_accounts = frappe.db.sql_list( purchase_taxes_query = get_taxes_query(
"""select distinct account_head invoice_list, "Purchase Taxes and Charges", "Purchase Invoice"
from (select account_head, parent, docstatus from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
and category in ('Total', 'Valuation and Total') union select account_head, parent, docstatus
from `tabAdvance Taxes and Charges` where parenttype = 'Payment Entry' and charge_type in ('On Paid Amount', 'Actual')) a
where docstatus = 1 and (account_head is not null and account_head != '')
and parent in (%s) order by account_head"""
% ", ".join(["%s"] * len(invoice_list)),
tuple(inv.name for inv in invoice_list),
) )
purchase_tax_accounts = purchase_taxes_query.run(as_dict=True, pluck="account_head")
tax_accounts = purchase_tax_accounts
if include_payments:
advance_taxes_query = get_taxes_query(
invoice_list, "Advance Taxes and Charges", "Payment Entry"
)
advance_tax_accounts = advance_taxes_query.run(as_dict=True, pluck="account_head")
tax_accounts = set(tax_accounts + advance_tax_accounts)
unrealized_profit_loss_accounts = frappe.db.sql_list( unrealized_profit_loss_accounts = frappe.db.sql_list(
"""SELECT distinct unrealized_profit_loss_account """SELECT distinct unrealized_profit_loss_account
@ -188,6 +190,27 @@ def get_columns(invoice_list, additional_table_columns):
return columns, expense_accounts, tax_accounts, unrealized_profit_loss_accounts return columns, expense_accounts, tax_accounts, unrealized_profit_loss_accounts
def get_taxes_query(invoice_list, doctype, parenttype):
taxes = frappe.qb.DocType(doctype)
query = (
frappe.qb.from_(taxes)
.select(taxes.account_head)
.distinct()
.where(
(taxes.parenttype == parenttype)
& (taxes.docstatus == 1)
& (taxes.account_head.isnotnull())
& (taxes.parent.isin([inv.name for inv in invoice_list]))
)
.orderby(taxes.account_head)
)
if doctype == "Purchase Taxes and Charges":
return query.where(taxes.category.isin(["Total", "Valuation and Total"]))
return query.where(taxes.charge_type.isin(["On Paid", "Actual"]))
def get_conditions(filters, payments=False): def get_conditions(filters, payments=False):
conditions = "" conditions = ""