868d6abb7 2025 -> 2026
11122c04f Добавлен необязательный параметр withCurrencySymbol в CurrencyFormatter и CurrencyConverter (по умолчанию true для обратной совместимости). Обновлены формы счетов для отображения сумм без символов валют.
63081666f Заголовки исходных файлов: 2024 -> 2025.
b6092df09 Авторское право 2023 -> 2024
ab45d51fa Авторское право 2001-2022 -> 2001-2023.
868d6abb7
2025 -> 2026868d6abb75cd191a892911ac8e45058932cf9074
diff --git a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
index 97e3b3a72..de7e8ad41 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2026 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
11122c04f
Добавлен необязательный параметр withCurrencySymbol в CurrencyFormatter и CurrencyConverter (по умолчанию true для обратной совместимости). Обновлены формы счетов для отображения сумм без символов валют.11122c04f5a35f05f1f116382357407b9e16452c
diff --git a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
index 86d69ceb9..97e3b3a72 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
@@ -46,7 +46,18 @@ public class CurrencyFormatter
*/
public static String format(final BigDecimal value)
{
- return format(value, ThreadLocalUserContext.getLocale());
+ return format(value, ThreadLocalUserContext.getLocale(), true);
+ }
+
+ /**
+ * Uses the locale of the context user.
+ * @param value
+ * @param withCurrencySymbol If true, appends currency symbol (default true for backward compatibility)
+ * @return 1,234.00 € or 1,234.00 (without symbol)
+ */
+ public static String format(final BigDecimal value, final boolean withCurrencySymbol)
+ {
+ return format(value, ThreadLocalUserContext.getLocale(), withCurrencySymbol);
}
/**
@@ -56,11 +67,27 @@ public class CurrencyFormatter
* @return 1,234.00 €
*/
public static String format(final BigDecimal value, final Locale locale)
+ {
+ return format(value, locale, true);
+ }
+
+ /**
+ * Uses the currency symbol of ConfigXml.
+ * @param value
+ * @param locale
+ * @param withCurrencySymbol If true, appends currency symbol (default true for backward compatibility)
+ * @return 1,234.00 € or 1,234.00 (without symbol)
+ */
+ public static String format(final BigDecimal value, final Locale locale, final boolean withCurrencySymbol)
{
if (value == null) {
return "";
}
NumberFormat nf = NumberHelper.getCurrencyFormat(locale);
- return nf.format(value) + " " + ConfigurationServiceAccessor.get().getCurrencySymbol();
+ if (withCurrencySymbol) {
+ return nf.format(value) + " " + ConfigurationServiceAccessor.get().getCurrencySymbol();
+ } else {
+ return nf.format(value);
+ }
}
} 63081666f
Заголовки исходных файлов: 2024 -> 2025.63081666f620fb87315f01b817e560e0b2f6a33a
diff --git a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
index 729aec945..86d69ceb9 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2025 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
b6092df09
Авторское право 2023 -> 2024b6092df0927c4a3b161e888445f31dcab57493f2
diff --git a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
index 7932d18fd..729aec945 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2023 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2024 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//
ab45d51fa
Авторское право 2001-2022 -> 2001-2023.ab45d51fa419ede6174b31d69987f96d4b841ff9
diff --git a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
index 4d7b3a7f3..7932d18fd 100644
--- a/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
+++ b/projectforge-business/src/main/java/org/projectforge/business/utils/CurrencyFormatter.java
@@ -3,7 +3,7 @@
// Project ProjectForge Community Edition
// www.projectforge.org
//
-// Copyright (C) 2001-2022 Micromata GmbH, Germany (www.micromata.com)
+// Copyright (C) 2001-2023 Micromata GmbH, Germany (www.micromata.com)
//
// ProjectForge is dual-licensed.
//