diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod index f74a798ec383ce47842ad92b84ad6ba2e0a65ab4..e90b0af702c203f25071d8a982bdc4e2d4a927d0 100644 --- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod +++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod @@ -88,13 +88,16 @@ <contentType>NUMBER</contentType> <maxValue v="100" /> <minValue v="0" /> - <outputFormat>0'%'</outputFormat> - <inputFormat>0'%'</inputFormat> + <outputFormat>0.00'%'</outputFormat> + <inputFormat>0.00</inputFormat> <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/scorepercent/onValidation.js</onValidation> </entityField> <entityField> <name>scoreInPoints</name> <title>Points</title> + <contentType>NUMBER</contentType> + <outputFormat>#,##0.00</outputFormat> + <inputFormat>#,##0.00</inputFormat> <state>READONLY</state> <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js</valueProcess> </entityField> diff --git a/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js b/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js index ab39285c8e6ce942461544c56aea0796a9a7058d..d971d3bccb94a97ca92024c6da2b59d6376eb9f3 100644 --- a/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js +++ b/entity/ClassificationScore_entity/entityfields/scoreinpoints/valueProcess.js @@ -13,4 +13,4 @@ var maxPoints = newSelect("CLASSIFICATIONTYPE.SCOREPOINTS") var points = percent/100*maxPoints; if(!points) points = 0; -result.string(points.toFixed(2)); \ No newline at end of file +result.string(points); \ No newline at end of file diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod index 0934836f181842f38e69f2df623a6991680f64c1..e12475949f9f1680936642c87819779ca78616db 100644 --- a/entity/Classification_entity/Classification_entity.aod +++ b/entity/Classification_entity/Classification_entity.aod @@ -151,6 +151,9 @@ <entityField> <name>SCOREPOINTS</name> <title>Points</title> + <contentType>NUMBER</contentType> + <outputFormat>#,##0.00</outputFormat> + <inputFormat>#,##0.00</inputFormat> </entityField> <entityField> <name>DISPLAYVALUE</name> diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index c9a551b7de0a31bce14caead59279587d9069ff0..900f465f943f4380e23670d07095ecc1fc325853 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -174,6 +174,7 @@ <documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation> <title>Total gross</title> <contentType>NUMBER</contentType> + <outputFormat>#,##0.00</outputFormat> <inputFormat>#,##0.00</inputFormat> <state>READONLY</state> <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess> diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index d463af5044cad07e970d56230d13fe5ee1860c1d..8d7dae6c6ef2e2f0fe923829348216f29c566a23 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -124,7 +124,8 @@ <title>Volume</title> <description></description> <contentType>NUMBER</contentType> - <inputFormat>#0</inputFormat> + <outputFormat>#,##0.00</outputFormat> + <inputFormat>#,##0.00</inputFormat> <groupable v="true" /> <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess> </entityField>