commit b0b179f1b760abfe430b8c192580f8b12b53ba3b
author Saqib <thefalconx33@gmail.com> Wed Jan 15 19:05:35 2020 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Jan 15 19:05:35 2020 +0530
tree f739199cc03c551f0be8ae8fb3d5c1c09bc59dee
parent a346469e0cf3e54ff3f01fd2e18a364b423db759

fix: make jv depreciations only if calculate depr is checked (#20282)

erpnext/assets/doctype/asset/depreciation.py

diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index 2d23f77..ad671ba 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -22,7 +22,7 @@
 def get_depreciable_assets(date):
 	return frappe.db.sql_list("""select a.name
 		from tabAsset a, `tabDepreciation Schedule` ds
-		where a.name = ds.parent and a.docstatus=1 and ds.schedule_date<=%s
+		where a.name = ds.parent and a.docstatus=1 and ds.schedule_date<=%s and a.calculate_depreciation = 1
 			and a.status in ('Submitted', 'Partially Depreciated')
 			and ifnull(ds.journal_entry, '')=''""", date)