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

refactor: import financial_statement in erpnext bundle

Browse Source
This commit is contained in:
ruthra kumar 2023-10-07 18:24:46 +05:30
parent aad77b133b
commit 40e7c43ce3
9 changed files with 491 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/balance_sheet/balance_sheet.js
View File

@ -1,7 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.require("assets/erpnext/js/financial_statements.js", function () {
frappe.query_reports["Balance Sheet"] = $.extend( frappe.query_reports["Balance Sheet"] = $.extend(
{}, {},
erpnext.financial_statements erpnext.financial_statements
@ -22,4 +21,3 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () {
fieldtype: "Check", fieldtype: "Check",
default: 1, default: 1,
}); });
});

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

@ -1,9 +1,10 @@
// Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors // Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.require("assets/erpnext/js/financial_statements.js", function() { frappe.query_reports["Cash Flow"] = $.extend(
frappe.query_reports["Cash Flow"] = $.extend({}, {},
erpnext.financial_statements); erpnext.financial_statements
);
erpnext.utils.add_dimensions('Cash Flow', 10); erpnext.utils.add_dimensions('Cash Flow', 10);
@ -21,4 +22,3 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"default": 1 "default": 1
} }
); );
});

2
erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
View File

@ -2,7 +2,6 @@
// For license information, please see license.txt // For license information, please see license.txt
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Consolidated Financial Statement"] = { frappe.query_reports["Consolidated Financial Statement"] = {
"filters": [ "filters": [
{ {
@ -150,4 +149,3 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
}); });
} }
} }
});

2
erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js
View File

@ -2,7 +2,6 @@
// For license information, please see license.txt // For license information, please see license.txt
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Dimension-wise Accounts Balance Report"] = { frappe.query_reports["Dimension-wise Accounts Balance Report"] = {
"filters": [ "filters": [
{ {
@ -70,7 +69,6 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"initial_depth": 3 "initial_depth": 3
} }
});
function get_accounting_dimension_options() { function get_accounting_dimension_options() {
let options =["Cost Center", "Project"]; let options =["Cost Center", "Project"];

13
erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js
View File

@ -2,14 +2,10 @@
// For license information, please see license.txt // For license information, please see license.txt
frappe.query_reports["Gross and Net Profit Report"] = { frappe.query_reports["Gross and Net Profit Report"] = $.extend(
"filters": [ {},
erpnext.financial_statements
] );
}
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Gross and Net Profit Report"] = $.extend({},
erpnext.financial_statements);
frappe.query_reports["Gross and Net Profit Report"]["filters"].push( frappe.query_reports["Gross and Net Profit Report"]["filters"].push(
{ {
@ -18,4 +14,3 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"fieldtype": "Check" "fieldtype": "Check"
} }
); );
});

2
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
View File

@ -1,7 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.require("assets/erpnext/js/financial_statements.js", function () {
frappe.query_reports["Profit and Loss Statement"] = $.extend( frappe.query_reports["Profit and Loss Statement"] = $.extend(
{}, {},
erpnext.financial_statements erpnext.financial_statements
@ -15,4 +14,3 @@ frappe.require("assets/erpnext/js/financial_statements.js", function () {
fieldtype: "Check", fieldtype: "Check",
default: 1, default: 1,
}); });
});

2
erpnext/accounts/report/profitability_analysis/profitability_analysis.js
View File

@ -1,7 +1,6 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Profitability Analysis"] = { frappe.query_reports["Profitability Analysis"] = {
"filters": [ "filters": [
{ {
@ -130,4 +129,3 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Profitability Analysis"].filters[1].options.push(dimension["document_type"]); frappe.query_reports["Profitability Analysis"].filters[1].options.push(dimension["document_type"]);
}); });
});

2
erpnext/accounts/report/trial_balance/trial_balance.js
View File

@ -1,7 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Trial Balance"] = { frappe.query_reports["Trial Balance"] = {
"filters": [ "filters": [
{ {
@ -115,4 +114,3 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
} }
erpnext.utils.add_dimensions('Trial Balance', 6); erpnext.utils.add_dimensions('Trial Balance', 6);
});

1
erpnext/public/js/erpnext.bundle.js
View File

@ -30,5 +30,6 @@ import "./utils/landed_taxes_and_charges_common.js";
import "./utils/sales_common.js"; import "./utils/sales_common.js";
import "./controllers/buying.js"; import "./controllers/buying.js";
import "./utils/demo.js"; import "./utils/demo.js";
import "./financial_statements.js";
// import { sum } from 'frappe/public/utils/util.js' // import { sum } from 'frappe/public/utils/util.js'