schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: undefined error in Budget Variance and Profitability report

Browse Source 
'Budget' and 'Budget Account' doesn't have support for dynamic
dimension. It only supports hard-coded ones -  Project and Cost Center

(cherry picked from commit 92bc962f60)

# Conflicts:
#	erpnext/accounts/report/profitability_analysis/profitability_analysis.js
This commit is contained in:
ruthra kumar
2024-01-01 14:46:15 +05:30
committed by Mergify
parent 96dfcd7149
commit cad15cdec2
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/budget_variance_report/budget_variance_report.js
View File

@@ -88,7 +88,3 @@ frappe.query_reports["Budget Variance Report"] = {
return value; return value;
} }
} }
erpnext.dimension_filters.forEach((dimension) => {
frappe.query_reports["Budget Variance Report"].filters[4].options.push(dimension["document_type"]);
});

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

@@ -119,8 +119,18 @@ frappe.require("assets/erpnext/js/financial_statements.js", function() {
"initial_depth": 3 "initial_depth": 3
} }
<<<<<<< HEAD
erpnext.dimension_filters.forEach((dimension) => { erpnext.dimension_filters.forEach((dimension) => {
frappe.query_reports["Profitability Analysis"].filters[1].options.push(dimension["document_type"]); frappe.query_reports["Profitability Analysis"].filters[1].options.push(dimension["document_type"]);
}); });
}); });
=======
frappe.set_route("query-report", "Profit and Loss Statement");
},
"tree": true,
"name_field": "account",
"parent_field": "parent_account",
"initial_depth": 3
}
>>>>>>> 92bc962f60 (fix: undefined error in Budget Variance and Profitability report)