Merge pull request #15585 from rohitwaghchaure/fix_asset_depreciation_ledger_report
Fix issue after merging hotfix into staging-fixes
diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
index 4170092..3613131 100644
--- a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
@@ -31,6 +31,12 @@
filters_data.append(["against_voucher", "in", assets])
+ company_finance_book = erpnext.get_default_finance_book(filters.get("company"))
+ if (not filters.get('finance_book') or (filters.get('finance_book') == company_finance_book)):
+ filters_data.append(["finance_book", "in", ['', filters.get('finance_book')]])
+ elif filters.get("finance_book"):
+ filters_data.append(["finance_book", "=", filters.get('finance_book')])
+
gl_entries = frappe.get_all('GL Entry',
filters= filters_data,
fields = ["against_voucher", "debit_in_account_currency as debit", "voucher_no", "posting_date"],
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
index 36d5d22..a517703 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
@@ -7,7 +7,7 @@
'Purchase Invoice': 'purchase_receipt',
'Asset': 'purchase_receipt',
'Landed Cost Voucher': 'receipt_document',
- 'Auto Repeat': 'reference_document'
+ 'Auto Repeat': 'reference_document',
'Purchase Receipt': 'return_against'
},
'internal_links': {