fix: can't open general ledger from consolidated financial report (#25542)
This commit is contained in:
Saqib
GitHub
parent
1e554378c7
commit
384f4b5b7e
@ -2,118 +2,128 @@
|
|||||||
// For license information, please see license.txt
|
// For license information, please see license.txt
|
||||||
/* eslint-disable */
|
/* eslint-disable */
|
||||||
|
|
||||||
frappe.query_reports["Consolidated Financial Statement"] = {
|
frappe.require("assets/erpnext/js/financial_statements.js", function() {
|
||||||
"filters": [
|
frappe.query_reports["Consolidated Financial Statement"] = {
|
||||||
{
|
"filters": [
|
||||||
"fieldname":"company",
|
{
|
||||||
"label": __("Company"),
|
"fieldname":"company",
|
||||||
"fieldtype": "Link",
|
"label": __("Company"),
|
||||||
"options": "Company",
|
"fieldtype": "Link",
|
||||||
"default": frappe.defaults.get_user_default("Company"),
|
"options": "Company",
|
||||||
"reqd": 1
|
"default": frappe.defaults.get_user_default("Company"),
|
||||||
},
|
"reqd": 1
|
||||||
{
|
},
|
||||||
"fieldname":"filter_based_on",
|
{
|
||||||
"label": __("Filter Based On"),
|
"fieldname":"filter_based_on",
|
||||||
"fieldtype": "Select",
|
"label": __("Filter Based On"),
|
||||||
"options": ["Fiscal Year", "Date Range"],
|
"fieldtype": "Select",
|
||||||
"default": ["Fiscal Year"],
|
"options": ["Fiscal Year", "Date Range"],
|
||||||
"reqd": 1,
|
"default": ["Fiscal Year"],
|
||||||
on_change: function() {
|
"reqd": 1,
|
||||||
let filter_based_on = frappe.query_report.get_filter_value('filter_based_on');
|
on_change: function() {
|
||||||
frappe.query_report.toggle_filter_display('from_fiscal_year', filter_based_on === 'Date Range');
|
let filter_based_on = frappe.query_report.get_filter_value('filter_based_on');
|
||||||
frappe.query_report.toggle_filter_display('to_fiscal_year', filter_based_on === 'Date Range');
|
frappe.query_report.toggle_filter_display('from_fiscal_year', filter_based_on === 'Date Range');
|
||||||
frappe.query_report.toggle_filter_display('period_start_date', filter_based_on === 'Fiscal Year');
|
frappe.query_report.toggle_filter_display('to_fiscal_year', filter_based_on === 'Date Range');
|
||||||
frappe.query_report.toggle_filter_display('period_end_date', filter_based_on === 'Fiscal Year');
|
frappe.query_report.toggle_filter_display('period_start_date', filter_based_on === 'Fiscal Year');
|
||||||
|
frappe.query_report.toggle_filter_display('period_end_date', filter_based_on === 'Fiscal Year');
|
||||||
|
|
||||||
frappe.query_report.refresh();
|
frappe.query_report.refresh();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"period_start_date",
|
||||||
|
"label": __("Start Date"),
|
||||||
|
"fieldtype": "Date",
|
||||||
|
"hidden": 1,
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"period_end_date",
|
||||||
|
"label": __("End Date"),
|
||||||
|
"fieldtype": "Date",
|
||||||
|
"hidden": 1,
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"from_fiscal_year",
|
||||||
|
"label": __("Start Year"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Fiscal Year",
|
||||||
|
"default": frappe.defaults.get_user_default("fiscal_year"),
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"to_fiscal_year",
|
||||||
|
"label": __("End Year"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Fiscal Year",
|
||||||
|
"default": frappe.defaults.get_user_default("fiscal_year"),
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"finance_book",
|
||||||
|
"label": __("Finance Book"),
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"options": "Finance Book"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"report",
|
||||||
|
"label": __("Report"),
|
||||||
|
"fieldtype": "Select",
|
||||||
|
"options": ["Profit and Loss Statement", "Balance Sheet", "Cash Flow"],
|
||||||
|
"default": "Balance Sheet",
|
||||||
|
"reqd": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "presentation_currency",
|
||||||
|
"label": __("Currency"),
|
||||||
|
"fieldtype": "Select",
|
||||||
|
"options": erpnext.get_presentation_currency_list(),
|
||||||
|
"default": frappe.defaults.get_user_default("Currency")
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname":"accumulated_in_group_company",
|
||||||
|
"label": __("Accumulated Values in Group Company"),
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"default": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "include_default_book_entries",
|
||||||
|
"label": __("Include Default Book Entries"),
|
||||||
|
"fieldtype": "Check",
|
||||||
|
"default": 1
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"formatter": function(value, row, column, data, default_formatter) {
|
||||||
|
if (data && column.fieldname=="account") {
|
||||||
|
value = data.account_name || value;
|
||||||
|
|
||||||
|
column.link_onclick =
|
||||||
|
"erpnext.financial_statements.open_general_ledger(" + JSON.stringify(data) + ")";
|
||||||
|
column.is_tree = true;
|
||||||
}
|
}
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname":"period_start_date",
|
|
||||||
"label": __("Start Date"),
|
|
||||||
"fieldtype": "Date",
|
|
||||||
"hidden": 1,
|
|
||||||
"reqd": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname":"period_end_date",
|
|
||||||
"label": __("End Date"),
|
|
||||||
"fieldtype": "Date",
|
|
||||||
"hidden": 1,
|
|
||||||
"reqd": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname":"from_fiscal_year",
|
|
||||||
"label": __("Start Year"),
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"options": "Fiscal Year",
|
|
||||||
"default": frappe.defaults.get_user_default("fiscal_year"),
|
|
||||||
"reqd": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname":"to_fiscal_year",
|
|
||||||
"label": __("End Year"),
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"options": "Fiscal Year",
|
|
||||||
"default": frappe.defaults.get_user_default("fiscal_year"),
|
|
||||||
"reqd": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname":"finance_book",
|
|
||||||
"label": __("Finance Book"),
|
|
||||||
"fieldtype": "Link",
|
|
||||||
"options": "Finance Book"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname":"report",
|
|
||||||
"label": __("Report"),
|
|
||||||
"fieldtype": "Select",
|
|
||||||
"options": ["Profit and Loss Statement", "Balance Sheet", "Cash Flow"],
|
|
||||||
"default": "Balance Sheet",
|
|
||||||
"reqd": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname": "presentation_currency",
|
|
||||||
"label": __("Currency"),
|
|
||||||
"fieldtype": "Select",
|
|
||||||
"options": erpnext.get_presentation_currency_list(),
|
|
||||||
"default": frappe.defaults.get_user_default("Currency")
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname":"accumulated_in_group_company",
|
|
||||||
"label": __("Accumulated Values in Group Company"),
|
|
||||||
"fieldtype": "Check",
|
|
||||||
"default": 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"fieldname": "include_default_book_entries",
|
|
||||||
"label": __("Include Default Book Entries"),
|
|
||||||
"fieldtype": "Check",
|
|
||||||
"default": 1
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"formatter": function(value, row, column, data, default_formatter) {
|
|
||||||
value = default_formatter(value, row, column, data);
|
|
||||||
|
|
||||||
if (!data.parent_account) {
|
value = default_formatter(value, row, column, data);
|
||||||
value = $(`<span>${value}</span>`);
|
|
||||||
|
|
||||||
var $value = $(value).css("font-weight", "bold");
|
if (!data.parent_account) {
|
||||||
|
value = $(`<span>${value}</span>`);
|
||||||
|
|
||||||
value = $value.wrap("<p></p>").parent().html();
|
var $value = $(value).css("font-weight", "bold");
|
||||||
}
|
|
||||||
return value;
|
|
||||||
},
|
|
||||||
onload: function() {
|
|
||||||
let fiscal_year = frappe.defaults.get_user_default("fiscal_year")
|
|
||||||
|
|
||||||
frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
|
value = $value.wrap("<p></p>").parent().html();
|
||||||
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
|
}
|
||||||
frappe.query_report.set_filter_value({
|
return value;
|
||||||
period_start_date: fy.year_start_date,
|
},
|
||||||
period_end_date: fy.year_end_date
|
onload: function() {
|
||||||
|
let fiscal_year = frappe.defaults.get_user_default("fiscal_year")
|
||||||
|
|
||||||
|
frappe.model.with_doc("Fiscal Year", fiscal_year, function(r) {
|
||||||
|
var fy = frappe.model.get_doc("Fiscal Year", fiscal_year);
|
||||||
|
frappe.query_report.set_filter_value({
|
||||||
|
period_start_date: fy.year_start_date,
|
||||||
|
period_end_date: fy.year_end_date
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
@ -329,8 +329,9 @@ def prepare_data(accounts, start_date, end_date, balance_must_be, companies, com
|
|||||||
has_value = False
|
has_value = False
|
||||||
total = 0
|
total = 0
|
||||||
row = frappe._dict({
|
row = frappe._dict({
|
||||||
"account_name": _(d.account_name),
|
"account_name": ('%s - %s' %(_(d.account_number), _(d.account_name))
|
||||||
"account": _(d.account_name),
|
if d.account_number else _(d.account_name)),
|
||||||
|
"account": _(d.name),
|
||||||
"parent_account": _(d.parent_account),
|
"parent_account": _(d.parent_account),
|
||||||
"indent": flt(d.indent),
|
"indent": flt(d.indent),
|
||||||
"year_start_date": start_date,
|
"year_start_date": start_date,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user