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

chore: refactor get_finance_book_value_map

Browse Source
This commit is contained in:
anandbaburajan 2022-12-06 23:16:02 +05:30
parent e7d404a30a
commit 2cd42dbb10
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
View File

@ -176,15 +176,17 @@ def get_finance_book_value_map(filters):
return frappe._dict( return frappe._dict(
frappe.db.sql( frappe.db.sql(
""" Select """ Select
parent, SUM(depreciation_amount) ads.name, SUM(depreciation_amount)
FROM `tabDepreciation Schedule` FROM `tabAsset Depreciation Schedule` ads, `tabDepreciation Schedule` ds
WHERE WHERE
parentfield='schedules' ds.parent = ads.name
AND schedule_date<=%s AND ifnull(ads.finance_book, '')=%s
AND journal_entry IS NOT NULL AND ads.docstatus=1
AND ifnull(finance_book, '')=%s AND ds.parentfield='depreciation_schedule'
GROUP BY parent""", AND ds.schedule_date<=%s
(date, cstr(filters.finance_book or "")), AND ds.journal_entry IS NOT NULL
GROUP BY ads.name""",
(cstr(filters.finance_book or ""), date),
) )
) )