Skip to content
Snippets Groups Projects
Commit 3cb8839d authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch 'sales_1081961_FixTurnOverClassificationFilter' into '2021.1.0'

[Projekt: xRM-Sales][TicketNr.: 1081961][Turnover Fehler wegen...

See merge request xrm/basic!1045
parents 421ea83d 34e8c5d6
No related branches found
No related tags found
No related merge requests found
......@@ -461,7 +461,6 @@ TurnoverDynamicChart.getFilterMapping = function (pKind)
filterMapping = TurnoverDynamicChart.addOrganisationFiltersToFilterMapping(filterMapping);
filterMapping = TurnoverDynamicChart.addClassificationGroupFilterToFilterMapping(filterMapping);
filterMapping = TurnoverDynamicChart.addClassificationTypeFilterToFilterMapping(filterMapping);
filterMapping = TurnoverDynamicChart.addAttributeFilterToFilterMapping(filterMapping);
return filterMapping[pKind];
......@@ -531,40 +530,6 @@ TurnoverDynamicChart.addClassificationGroupFilterToFilterMapping = function (pMa
}
/**
* Adds the classification type filter extensions to the filter object and returns the complete object. <br>
*
* @param {Object} pMapping <p>
* <br> The filter mapping object
*/
TurnoverDynamicChart.addClassificationTypeFilterToFilterMapping = function (pMapping)
{
var fields = JSON.parse(ClassificationTypeFilterUtils.getFilterFields("Organisation")); // gets all possible classification types for filtering
var classificationTable = "CLASSIFICATION";
var compareField = "CLASSIFICATION.VALUE";
fields.forEach(function(classificationField)
{
let filterName = classificationField["name"];
let filterFieldName = "#EXTENSION.ClassificationType_filter." + filterName + "#TEXT";
pMapping.Planning[filterFieldName] = function (pValue, pOperator) {
return TurnoverDynamicChart.classificationCond(pValue, pOperator, "FORECAST.CONTACT_ID", compareField, classificationTable);
};
pMapping.Forecast[filterFieldName] = function (pValue, pOperator) {
return TurnoverDynamicChart.classificationCond(pValue, pOperator, "SALESPROJECT.CONTACT_ID", compareField, classificationTable);
};
pMapping.Turnover[filterFieldName] = function (pValue, pOperator) {
return TurnoverDynamicChart.classificationCond(pValue, pOperator, "SALESORDER.CONTACT_ID", compareField, classificationTable);
};
});
return pMapping;
}
/**
* Adds the attribute filter extensions to the filter object and returns the complete object. <br>
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment