From d4c627092b2fc50c31e8ac89724cc92b4ffa9cf8 Mon Sep 17 00:00:00 2001
From: "h.boesl" <h.boesl@adito.de>
Date: Fri, 10 Jan 2020 17:00:28 +0100
Subject: [PATCH] text.formatDouble(item[9], translate.text("#,##0"), true) ->
text.formatDouble(item[9], "#,##0", true),
---
.../translate4log/property.js | 2 +-
.../translate4log/property.js | 2 +-
.../entityfields/info/valueProcess.js | 2 +-
process/Offer_lib/process.js | 12 +++++------
process/Order_lib/process.js | 20 +++++++++----------
process/Util_lib/process.js | 2 +-
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
index 496dbb034e..d5c240bd0a 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/net/customproperties/translate4log/property.js
@@ -5,4 +5,4 @@ import("system.text");
import("Loghistory_lib");
var params = Translate4LogParams.load();
-result.string(text.formatDouble(params.value, translate.text("#,##0.00", params.locale)));
\ No newline at end of file
+result.string(text.formatDouble(params.value, "#,##0.00", true));
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
index 496dbb034e..d5c240bd0a 100644
--- a/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
+++ b/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/offer/entityfields/vat/customproperties/translate4log/property.js
@@ -5,4 +5,4 @@ import("system.text");
import("Loghistory_lib");
var params = Translate4LogParams.load();
-result.string(text.formatDouble(params.value, translate.text("#,##0.00", params.locale)));
\ No newline at end of file
+result.string(text.formatDouble(params.value, "#,##0.00", true));
\ No newline at end of file
diff --git a/entity/Classification_entity/entityfields/info/valueProcess.js b/entity/Classification_entity/entityfields/info/valueProcess.js
index 681613e42a..7030b6384f 100644
--- a/entity/Classification_entity/entityfields/info/valueProcess.js
+++ b/entity/Classification_entity/entityfields/info/valueProcess.js
@@ -15,7 +15,7 @@ var resultText = "";
data.forEach(function(pScore)
{
- resultText += translate.text(pScore[0]) + " = " + text.formatDouble(pScore[1], translate.text("#,##0.00")) + "<br>"
+ resultText += translate.text(pScore[0]) + " = " + text.formatDouble(pScore[1], "#,##0.00", true) + "<br>"
});
result.string(resultText);
\ No newline at end of file
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index a59f4a9358..7aa667c897 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -212,13 +212,13 @@ OfferUtils.openOfferReport = function (pOfferID)
item[6], //productcode
header, //header
footer, //footer
- text.formatDouble(item[9], translate.text("#,##0"), true), //quantity
- text.formatDouble(item[10], translate.text("#,##0.00"), true), //price
- text.formatDouble(item[11], translate.text("0.00"), true), //discount
+ text.formatDouble(item[9], "#,##0", true), //quantity
+ text.formatDouble(item[10], "#,##0.00", true), //price
+ text.formatDouble(item[11], "0.00", true), //discount
offerData[10], //versnr
offerData[5], //offercode
- text.formatDouble(item[12], translate.text("#,##0.00"), true), //vat
- text.formatDouble(itemSum, translate.text("#,##0.00"), true), //itemsum
+ text.formatDouble(item[12], "#,##0.00", true), //vat
+ text.formatDouble(itemSum, "#,##0.00", true), //itemsum
KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), item[8]) //unittext
];
});
@@ -261,7 +261,7 @@ OfferUtils.openOfferReport = function (pOfferID)
"OfferDeliveryTerm" : KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), offerData[4]),
"responsible" : adma,
"SUMITEMSUM" : sumItemSum,
- "TOTAL" : text.formatDouble(total, translate.text("#,##0.00"), true),
+ "TOTAL" : text.formatDouble(total, "#,##0.00", true),
"printDiscount" : printDiscount ? "1" : "0"
};
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index a2aa75f231..4a99e0212e 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -272,19 +272,19 @@ OrderUtils.openOrderReport = function (pOrderID)
item[6], //productcode
orderData[8], //header
orderData[14], //footer
- text.formatDouble(item[9], translate.text("#,##0"), true), //quantity
- text.formatDouble(item[10], translate.text("#,##0.00"), true), //price
- text.formatDouble(item[11], translate.text("0.00"), true), //discount
+ text.formatDouble(item[9], "#,##0", true), //quantity
+ text.formatDouble(item[10], "#,##0.00", true), //price
+ text.formatDouble(item[11], "0.00", true), //discount
orderData[10], //versnr
orderData[5], //offercode
- text.formatDouble(orderData[9], translate.text("#,##0.00"), true), //vat
- text.formatDouble(itemSum, translate.text("#,##0.00"), true), //itemsum
+ text.formatDouble(orderData[9], "#,##0.00", true), //vat
+ text.formatDouble(itemSum, "#,##0.00", true), //itemsum
KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), item[8]), //unittext
item[2],
item[13],
item[8],
item[14],
- text.formatDouble(item[12], translate.text("#,##0.00"), true)
+ text.formatDouble(item[12], "#,##0.00", true)
];
});
@@ -326,7 +326,7 @@ OrderUtils.openOrderReport = function (pOrderID)
"OrderDeliveryTerm" : KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), orderData[4]),
"responsible" : adma,
"SUMITEMSUM" : sumItemSum,
- "TOTAL" : text.formatDouble(total, translate.text("#,##0.00"), true),
+ "TOTAL" : text.formatDouble(total, "#,##0.00", true),
"printDiscount" : printDiscount ? "1" : "0",
"Person" : db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")))
};
@@ -480,11 +480,11 @@ OrderUtils.openReminderReport = function (pOrderID)
pOrderID, //relationid
orderData[6], //currency
orderData[7], //orderdate
- text.formatDouble(orderData[9], translate.text("#,##0.00"), true), //vat
+ text.formatDouble(orderData[9], "#,##0.00", true), //vat
orderData[11], //ordercode
orderData[17], //net
- text.formatDouble(brutto, translate.text("#,##0.00"), true),//brutto
- text.formatDouble(offen, translate.text("#,##0.00"), true),//offen
+ text.formatDouble(brutto, "#,##0.00", true),//brutto
+ text.formatDouble(offen, "#,##0.00", true),//offen
orderData[18], //due date
orderData[20], //dunning text
orderData[19] //dunninglevel
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index eaa63736e5..9f046efd15 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -172,7 +172,7 @@ NumberUtils.validateIsBetweenFloat = function(pTitle, pValue, pMin, pMax, pIgnor
NumberUtils.formatWithCurrency = function(pNumber, pPattern, pCurrency)
{
if (pNumber && pPattern)
- return text.formatDouble(pNumber, pPattern + " " + pCurrency);
+ return text.formatDouble(pNumber, pPattern + " " + pCurrency, true);
return "0 " + pCurrency;
}
--
GitLab