CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 17:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(minor): include condition to check docstatus

Browse Source
This commit is contained in:
Khushi Rawat
2024-09-24 01:41:54 +05:30
parent 0e1884539e
commit 1f42302997
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
View File

@@ -68,7 +68,7 @@ def get_group_by_asset_category_data(filters):
def get_asset_categories_for_grouped_by_category(filters): def get_asset_categories_for_grouped_by_category(filters):
condition = "" condition = ""
if filters.get("asset_category"): if filters.get("asset_category"):
condition += " and asset_category = %(asset_category)s" condition += " and a.asset_category = %(asset_category)s"
if filters.get("finance_book"): if filters.get("finance_book"):
condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = a.name and ads.finance_book = %(finance_book)s)" condition += " and exists (select 1 from `tabAsset Depreciation Schedule` ads where ads.asset = a.name and ads.finance_book = %(finance_book)s)"
@@ -113,11 +113,12 @@ def get_asset_categories_for_grouped_by_category(filters):
0 0
end), 0) as cost_of_scrapped_asset end), 0) as cost_of_scrapped_asset
from `tabAsset` a from `tabAsset` a
where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s {condition} where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {condition}
and not exists( and not exists(
select 1 from `tabAsset Capitalization Asset Item` acai join `tabAsset Capitalization` ac on acai.parent=ac.name select 1 from `tabAsset Capitalization Asset Item` acai join `tabAsset Capitalization` ac on acai.parent=ac.name
where acai.asset = a.name where acai.asset = a.name
and ac.posting_date between %(from_date)s AND %(to_date)s and ac.posting_date <= %(to_date)s
and ac.docstatus=1
) )
group by a.asset_category group by a.asset_category
""", """,
@@ -184,7 +185,8 @@ def get_asset_details_for_grouped_by_category(filters):
and not exists( and not exists(
select 1 from `tabAsset Capitalization Asset Item` acai join `tabAsset Capitalization` ac on acai.parent=ac.name select 1 from `tabAsset Capitalization Asset Item` acai join `tabAsset Capitalization` ac on acai.parent=ac.name
where acai.asset = a.name where acai.asset = a.name
and ac.posting_date between %(from_date)s AND %(to_date)s and ac.posting_date <= %(to_date)s
and ac.docstatus=1
) )
group by a.name group by a.name
""", """,