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

Merge pull request #35362 from frappe/mergify/bp/version-14-hotfix/pr-35299

Browse Source 
refactor: replace join with subquery in PCV (backport #35299)
This commit is contained in:
ruthra kumar
2023-06-01 15:43:37 +05:30
committed by GitHub
parent 4a62252e7e 4620ed6e42
commit 114cb98b8e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
View File

@@ -169,21 +169,18 @@ class PeriodClosingVoucher(AccountsController):
return frappe.db.sql( return frappe.db.sql(
""" """
select select
t2.account_currency, t1.account_currency,
{dimension_fields}, {dimension_fields},
sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as bal_in_account_currency, sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as bal_in_account_currency,
sum(t1.debit) - sum(t1.credit) as bal_in_company_currency sum(t1.debit) - sum(t1.credit) as bal_in_company_currency
from `tabGL Entry` t1, `tabAccount` t2 from `tabGL Entry` t1
where where
t1.is_cancelled = 0 t1.is_cancelled = 0
and t1.account = t2.name and t1.account in (select name from `tabAccount` where report_type = 'Profit and Loss' and docstatus < 2 and company = %s)
and t2.report_type = 'Profit and Loss'
and t2.docstatus < 2
and t2.company = %s
and t1.posting_date between %s and %s and t1.posting_date between %s and %s
group by {dimension_fields} group by {dimension_fields}
""".format( """.format(
dimension_fields=", ".join(dimension_fields) dimension_fields=", ".join(dimension_fields),
), ),
(self.company, self.get("year_start_date"), self.posting_date), (self.company, self.get("year_start_date"), self.posting_date),
as_dict=1, as_dict=1,