mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-22 03:35:43 +00:00
fix(asset depreciations and balances): showing opening entries
(cherry picked from commit d3afa67be3)
This commit is contained in:
@@ -273,6 +273,7 @@ def get_asset_value_adjustment_map_by_category(filters):
|
|||||||
AND a.company = %(company)s
|
AND a.company = %(company)s
|
||||||
AND a.purchase_date <= %(to_date)s
|
AND a.purchase_date <= %(to_date)s
|
||||||
AND gle.account = aca.fixed_asset_account
|
AND gle.account = aca.fixed_asset_account
|
||||||
|
AND gle.is_opening = 'No'
|
||||||
GROUP BY a.asset_category
|
GROUP BY a.asset_category
|
||||||
""",
|
""",
|
||||||
{"from_date": filters.from_date, "to_date": filters.to_date, "company": filters.company},
|
{"from_date": filters.from_date, "to_date": filters.to_date, "company": filters.company},
|
||||||
@@ -543,6 +544,7 @@ def get_asset_value_adjustment_map(filters):
|
|||||||
AND a.company = %(company)s
|
AND a.company = %(company)s
|
||||||
AND a.purchase_date <= %(to_date)s
|
AND a.purchase_date <= %(to_date)s
|
||||||
AND gle.account = aca.fixed_asset_account
|
AND gle.account = aca.fixed_asset_account
|
||||||
|
AND gle.is_opening = 'No'
|
||||||
GROUP BY a.name
|
GROUP BY a.name
|
||||||
""",
|
""",
|
||||||
{"from_date": filters.from_date, "to_date": filters.to_date, "company": filters.company},
|
{"from_date": filters.from_date, "to_date": filters.to_date, "company": filters.company},
|
||||||
|
|||||||
Reference in New Issue
Block a user