Skip to content
Snippets Groups Projects
Commit 6ed718d3 authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch 'sales_2003640_FixConversionRateDisplayCompletedSalesprojects' into '2021.2'

[Projekt: xRM-Sales][TicketNr.: 2003640][Conversionrate: abgeschlossene...

See merge request xrm/basic!1621
parents 85ab0e6e fd1438a9
No related branches found
No related tags found
No related merge requests found
...@@ -361,6 +361,7 @@ Salesproject.calculateConversionRate = function() ...@@ -361,6 +361,7 @@ Salesproject.calculateConversionRate = function()
// (optional grouping 2): // (optional grouping 2):
// ... // ...
let conversionPhases = {}; let conversionPhases = {};
var completedSalesProjects = {};
data.forEach(function([salesprojectId, kind, value, grouping]) data.forEach(function([salesprojectId, kind, value, grouping])
{ {
if(grouping != null && !conversionPhases[grouping]) if(grouping != null && !conversionPhases[grouping])
...@@ -376,6 +377,7 @@ Salesproject.calculateConversionRate = function() ...@@ -376,6 +377,7 @@ Salesproject.calculateConversionRate = function()
|| value == $KeywordRegistry.salesprojectState$order()) || value == $KeywordRegistry.salesprojectState$order())
{ {
conversionPhase[salesprojectId] = phases.length; conversionPhase[salesprojectId] = phases.length;
completedSalesProjects[salesprojectId] = "";
} }
}); });
...@@ -425,7 +427,7 @@ Salesproject.calculateConversionRate = function() ...@@ -425,7 +427,7 @@ Salesproject.calculateConversionRate = function()
var salesprojectIds = []; var salesprojectIds = [];
for(let salesprojectId in conversionPhases) for(let salesprojectId in conversionPhases)
{ {
if(!groupedPhase || groupedPhase == conversionPhases[salesprojectId]) if(!groupedPhase || groupedPhase == conversionPhases[salesprojectId] || completedSalesProjects.hasOwnProperty(salesprojectId))
{ {
salesprojectIds.push(salesprojectId); salesprojectIds.push(salesprojectId);
} }
......
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