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

Fix issue after merging hotfix into staging-fixes

Browse Source
This commit is contained in:
Rohit Waghchaure 2018-10-04 16:33:43 +05:30
parent 7d929c508f
commit 18678696db
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py
View File

@ -31,6 +31,12 @@ def get_data(filters):
filters_data.append(["against_voucher", "in", assets]) 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', gl_entries = frappe.get_all('GL Entry',
filters= filters_data, filters= filters_data,
fields = ["against_voucher", "debit_in_account_currency as debit", "voucher_no", "posting_date"], fields = ["against_voucher", "debit_in_account_currency as debit", "voucher_no", "posting_date"],

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
View File

@ -7,7 +7,7 @@ def get_data():
'Purchase Invoice': 'purchase_receipt', 'Purchase Invoice': 'purchase_receipt',
'Asset': 'purchase_receipt', 'Asset': 'purchase_receipt',
'Landed Cost Voucher': 'receipt_document', 'Landed Cost Voucher': 'receipt_document',
'Auto Repeat': 'reference_document' 'Auto Repeat': 'reference_document',
'Purchase Receipt': 'return_against' 'Purchase Receipt': 'return_against'
}, },
'internal_links': { 'internal_links': {