Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Added Periodicity to Consolidate Financial Statements and Cost Center Financial Statements and Added Variance feature to Consolidated Financial Statements #1793

Merged
merged 14 commits into from
Nov 23, 2021
Merged

feat: Added Periodicity to Consolidate Financial Statements and Cost Center Financial Statements and Added Variance feature to Consolidated Financial Statements #1793

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f39ff5e
single company consolidated financial statement report
Oct 26, 2021
d2f66ec
add periodicity for multiple company
Nov 3, 2021
758718c
push changes related to totals
imdadhussain Nov 9, 2021
9f7ed60
added and update period list code consolidated financial statement fo…
imdadhussain Nov 9, 2021
bda5ca4
Add total for assests and equlity and liability (horizontal).
imdadhussain Nov 10, 2021
3daea65
update for get_provisional_profit_loss() for Total Assets, Equity and…
imdadhussain Nov 10, 2021
3143f4b
remove unused funtion and intentation
imdadhussain Nov 10, 2021
1d82179
made change for profit and losses and cash flow for consolidated stat…
imdadhussain Nov 10, 2021
b502b81
remove comment from profit and losses file
imdadhussain Nov 10, 2021
d7dec19
remove unwanteed comment and optimized get_columns for periodicity
imdadhussain Nov 10, 2021
1821317
optimized code in consolidated financial for prepare_data
imdadhussain Nov 11, 2021
1158a12
code optimzed in balance.py for provisional_profit_loss
imdadhussain Nov 11, 2021
cc2e327
remove commented code in cost_center_financial_statements
imdadhussain Nov 11, 2021
30edb7e
remove commented code in consolidated_financial_statement.py in add_t…
imdadhussain Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 84 additions & 10 deletions erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,31 @@ frappe.query_reports["Consolidated Financial Statement"] = {
"reqd": 1
},
{
"fieldname":"from_fiscal_year",
"label": __("Start Year"),
"fieldtype": "Link",
"options": "Fiscal Year",
"default": frappe.defaults.get_user_default("fiscal_year"),
"fieldname": "from_date",
"label": __("From Date"),
"fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_start_date"),
"reqd": 1
},
{
"fieldname":"to_fiscal_year",
"label": __("End Year"),
"fieldtype": "Link",
"options": "Fiscal Year",
"default": frappe.defaults.get_user_default("fiscal_year"),
"fieldname": "to_date",
"label": __("To Date"),
"fieldtype": "Date",
"default": frappe.defaults.get_user_default("year_end_date"),
"reqd": 1
},
{
"fieldname": "periodicity",
"label": __("Periodicity"),
"fieldtype": "Select",
"options": [
{ "value": "Custom", "label": __("Custom Date Range") },
{ "value": "Monthly", "label": __("Monthly") },
{ "value": "Quarterly", "label": __("Quarterly") },
{ "value": "Half-Yearly", "label": __("Half-Yearly") },
{ "value": "Yearly", "label": __("Yearly") }
],
"default": "Yearly",
"reqd": 1
},
{
Expand All @@ -49,6 +61,16 @@ frappe.query_reports["Consolidated Financial Statement"] = {
"options": erpnext.get_presentation_currency_list(),
"default": frappe.defaults.get_user_default("Currency")
},
{
"fieldname": "cost_center",
"label": __("Cost Center"),
"fieldtype": "MultiSelectList",
get_data: function(txt) {
return frappe.db.get_link_options('Cost Center', txt, {
company: frappe.query_report.get_filter_value("company")
});
}
},
{
"fieldname":"accumulated_in_group_company",
"label": __("Accumulated Values in Group Company"),
Expand All @@ -60,6 +82,58 @@ frappe.query_reports["Consolidated Financial Statement"] = {
"label": __("Include Default Book Entries"),
"fieldtype": "Check",
"default": 1
},
{
"fieldname":"from_company",
"label": __("From Company"),
"fieldtype": "Link",
"options": "Company",
"hidden": 1,
"reqd": 0,
get_query: function () {
var company = frappe.query_report.get_filter_value("company");
company_list = {
doctype: "Company",
filters: {
"is_group": 0,
"parent_company": company,
},
};
return company_list
},
},
{
"fieldname":"to_company",
"label": __("To Company"),
"fieldtype": "Link",
"options": "Company",
"hidden": 1,
"reqd": 0,
get_query: function () {
var company = frappe.query_report.get_filter_value("company");
company_list = {
doctype: "Company",
filters: {
"is_group": 0,
"parent_company": company,
},
};
return company_list
},
},
{
"fieldname":"compare_with_company",
"label": __("Compare Statements"),
"fieldtype": "Check",
"default": 0,
on_change: () => {
let filter_based_on = frappe.query_report.get_filter_value('compare_with_company');
frappe.query_report.toggle_filter_display('from_company', filter_based_on === 0);
frappe.query_report.toggle_filter_display('to_company', filter_based_on === 0);
frappe.query_report.refresh();
},

}

]
}
Loading