nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-01 04:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove presentation currency option from cashflow

Browse Source
This commit is contained in:
tundebabzy
2018-01-23 16:30:26 +01:00
parent f23cdd8be7
commit 0fb8b4b15d
2 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
erpnext/accounts/report/cash_flow/cash_flow.js
View File

@@ -1,36 +1,13 @@
// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
const get_currencies = () => {
// frappe.db.get_list returns a Promise
return frappe.db.get_list('GL Entry',
{
distinct: true,
fields:['account_currency'],
as_list: true
}
);
}
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Cash Flow"] = $.extend({},
erpnext.financial_statements);
const flatten = (array) => {
return [].concat.apply([], array);
}
get_currencies().then(currency_list => flatten(currency_list)).then(currency_list => {
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Cash Flow"] = $.extend({},
erpnext.financial_statements);
frappe.query_reports["Cash Flow"]["filters"].push({
"fieldname": "accumulated_values",
"label": __("Accumulated Values"),
"fieldtype": "Check"
},
{
"fieldname": "presentation_currency",
"label": __("Currency"),
"fieldtype": "Select",
"options": currency_list
});
frappe.query_reports["Cash Flow"]["filters"].push({
"fieldname": "accumulated_values",
"label": __("Accumulated Values"),
"fieldtype": "Check"
});
});

4
erpnext/accounts/report/cash_flow/cash_flow.py
View File

@@ -51,9 +51,9 @@ def execute(filters=None):
# compute net profit / loss
income = get_data(filters.company, "Income", "Credit", period_list,
accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True, filters=filters)
accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
expense = get_data(filters.company, "Expense", "Debit", period_list,
accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True, filters=filters)
accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)