vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: only allow currency fieldtypes based on company currency in charts and number cards

Browse source
This commit is contained in:
prssanna 2020-04-30 18:13:40 +05:30
parent f074960151
commit d4db09e57c
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
frappe/desk/doctype/number_card/number_card.js
View file

@ -18,24 +18,29 @@ frappe.ui.form.on('Number Card', {
});
frm.set_value('filters_json', '[]');
frm.set_value('aggregate_function_based_on', '');
if (frm.doc.document_type) {
frm.trigger('set_options');
}
frm.trigger('set_options');
},
set_options: function(frm) {
let aggregate_based_on_fields = [];
const doctype = frm.doc.document_type;
frappe.model.with_doctype(doctype, () => {
frappe.get_meta(doctype).fields.map(df => {
if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) {
aggregate_based_on_fields.push({label: df.label, value: df.fieldname});
}
});
if (doctype) {
frappe.model.with_doctype(doctype, () => {
frappe.get_meta(doctype).fields.map(df => {
if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) {
if (df.fieldtype == 'Currency') {
if (!df.options || df.options !== 'Company:company:default_currency') {
return;
}
}
aggregate_based_on_fields.push({label: df.label, value: df.fieldname});
}
});
frm.set_df_property('aggregate_function_based_on', 'options', aggregate_based_on_fields);
});
frm.set_df_property('aggregate_function_based_on', 'options', aggregate_based_on_fields);
});
}
},
render_filters_table: function(frm) {

5
frappe/public/js/frappe/views/dashboard/dashboard_view.js
View file

@ -427,6 +427,11 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
date_fields.push({label: df.label, value: df.fieldname});
}
if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) {
if (df.fieldtype == 'Currency') {
if (!df.options || df.options !== 'Company:company:default_currency') {
return;
}
}
value_fields.push({label: df.label, value: df.fieldname});
aggregate_function_fields.push({label: df.label, value: df.fieldname});
}

5
frappe/public/js/frappe/widgets/widget_dialog.js
View file

@ -372,6 +372,11 @@ class NumberCardDialog extends WidgetDialog {
if (this.document_type) {
frappe.get_meta(this.document_type).fields.map(df => {
if (frappe.model.numeric_fieldtypes.includes(df.fieldtype)) {
if (df.fieldtype == 'Currency') {
if (!df.options || df.options !== 'Company:company:default_currency') {
return;
}
}
aggregate_function_fields.push({label: df.label, value: df.fieldname});
}
});