mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-02 19:59:12 +00:00
043dc1b14b
* fix: asset depreciation ledger (#37991)
* fix: include opening acc depr while calculating asset depr ledger report
* chore: include opening acc depr properly in acc depr amt
* chore: add cost_center in asset depr ledger report
* fix: handle finance books properly in asset depr ledger report
* chore: rename 'include default book entries' to 'include default FB entries'
(cherry picked from commit 9a171db97f)
# Conflicts:
# erpnext/accounts/report/balance_sheet/balance_sheet.js
# erpnext/accounts/report/cash_flow/cash_flow.js
# erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
# erpnext/accounts/report/trial_balance/trial_balance.js
# erpnext/translations/pl.csv
# erpnext/translations/tr.csv
* chore: fix conflict in balance_sheet.js
* chore: fix conflict in cash_flow.js
* chore: fix conflict in consolidated_financial_statement.js
* chore: fix conflict in trial_balance.js
* chore: fix conflict in tr.csv
* chore: fix conflict in pl.csv
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
25 lines
781 B
JavaScript
25 lines
781 B
JavaScript
// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
|
|
// For license information, please see license.txt
|
|
|
|
frappe.require("assets/erpnext/js/financial_statements.js", function() {
|
|
frappe.query_reports["Cash Flow"] = $.extend({},
|
|
erpnext.financial_statements);
|
|
|
|
erpnext.utils.add_dimensions('Cash Flow', 10);
|
|
|
|
// The last item in the array is the definition for Presentation Currency
|
|
// filter. It won't be used in cash flow for now so we pop it. Please take
|
|
// of this if you are working here.
|
|
|
|
frappe.query_reports["Cash Flow"]["filters"].splice(8, 1);
|
|
|
|
frappe.query_reports["Cash Flow"]["filters"].push(
|
|
{
|
|
"fieldname": "include_default_book_entries",
|
|
"label": __("Include Default FB Entries"),
|
|
"fieldtype": "Check",
|
|
"default": 1
|
|
}
|
|
);
|
|
});
|