From 3cb7d395e17b2ef985af7f6957bc94b0d33ea5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Tak=C3=A1cs?= <93127072+PeterTakacs300@users.noreply.github.com> Date: Sun, 2 Apr 2023 09:40:10 +0200 Subject: [PATCH] IDEMPIERE-5652 - Print Format: Format Pattern is not Applied on Grouping/Summary rows (#1762) --- org.adempiere.base/src/org/compiere/print/DataEngine.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java index f372bcb641..6771cc704b 100644 --- a/org.adempiere.base/src/org/compiere/print/DataEngine.java +++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java @@ -972,7 +972,7 @@ public class DataEngine { String valueString = value.toString(); if (value instanceof Timestamp) - valueString = DisplayType.getDateFormat(pdc.getDisplayType(), m_language).format(value); + valueString = DisplayType.getDateFormat(pdc.getDisplayType(), m_language, pdc.getFormatPattern()).format(value); if (format.getTableFormat().isPrintFunctionSymbols()) // Translate Sum, etc. valueString += PrintDataFunction.getFunctionSymbol(functions[f]); pd.addNode(new PrintDataElement(pdc.getAD_PrintFormatItem_ID(), pdc.getColumnName(), @@ -1192,7 +1192,7 @@ public class DataEngine { String valueString = value.toString(); if (value instanceof Timestamp) - valueString = DisplayType.getDateFormat(pdc.getDisplayType(), m_language).format(value); + valueString = DisplayType.getDateFormat(pdc.getDisplayType(), m_language, pdc.getFormatPattern()).format(value); if (format.getTableFormat().isPrintFunctionSymbols()) // Translate Sum, etc. valueString += PrintDataFunction.getFunctionSymbol(functions[f]); pd.addNode(new PrintDataElement(pdc.getAD_PrintFormatItem_ID(), pdc.getColumnName(), @@ -1232,6 +1232,8 @@ public class DataEngine name = Msg.getMsg(format.getLanguage(), PrintDataFunction.getFunctionName(functions[f])); else name = PrintDataFunction.getFunctionSymbol(functions[f]); // Symbol + if (m_group.isFunctionColumn(pdc.getAD_PrintFormatItem_ID(), functions[f])) + name += " " + m_group.getValue(PrintDataGroup.TOTAL, pdc.getAD_PrintFormatItem_ID(), functions[f]); pd.addNode(new PrintDataElement(pdc.getAD_PrintFormatItem_ID(), pdc.getColumnName(), name.trim(), DisplayType.String, pdc.getFormatPattern())); }