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

fix: Dimension filters in accounting reports

Browse Source
This commit is contained in:
Deepesh Garg 2020-12-04 11:28:26 +05:30
parent 12b45b3f2a
commit 7b2d518059
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/public/js/utils.js
View File

@ -194,15 +194,21 @@ $.extend(erpnext.utils, {
add_dimensions: function(report_name, index) { add_dimensions: function(report_name, index) {
let filters = frappe.query_reports[report_name].filters; let filters = frappe.query_reports[report_name].filters;
erpnext.dimension_filters.forEach((dimension) => { frappe.call({
let found = filters.some(el => el.fieldname === dimension['fieldname']); method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.get_dimensions",
callback: function(r) {
let accounting_dimensions = r.message[0];
accounting_dimensions.forEach((dimension) => {
let found = filters.some(el => el.fieldname === dimension['fieldname']);
if (!found) { if (!found) {
filters.splice(index, 0 ,{ filters.splice(index, 0 ,{
"fieldname": dimension["fieldname"], "fieldname": dimension["fieldname"],
"label": __(dimension["label"]), "label": __(dimension["label"]),
"fieldtype": "Link", "fieldtype": "Link",
"options": dimension["document_type"] "options": dimension["document_type"]
});
}
}); });
} }
}); });