diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java
index 6c665db523..dde8d15da2 100644
--- a/org.adempiere.base/src/org/compiere/print/DataEngine.java
+++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java
@@ -854,7 +854,8 @@ public class DataEngine
String valueString = value.toString();
if (value instanceof Timestamp)
valueString = DisplayType.getDateFormat(pdc.getDisplayType(), m_language).format(value);
- valueString += PrintDataFunction.getFunctionSymbol(functions[f]);
+ if (format.getTableFormat().isPrintFunctionSymbols()) // Translate Sum, etc.
+ valueString += PrintDataFunction.getFunctionSymbol(functions[f]);
pd.addNode(new PrintDataElement(pdc.getColumnName(),
valueString, DisplayType.String, false, pdc.isPageBreak(), pdc.getFormatPattern()));
}
@@ -1053,7 +1054,8 @@ public class DataEngine
String valueString = value.toString();
if (value instanceof Timestamp)
valueString = DisplayType.getDateFormat(pdc.getDisplayType(), m_language).format(value);
- valueString += PrintDataFunction.getFunctionSymbol(functions[f]);
+ if (format.getTableFormat().isPrintFunctionSymbols()) // Translate Sum, etc.
+ valueString += PrintDataFunction.getFunctionSymbol(functions[f]);
pd.addNode(new PrintDataElement(pdc.getColumnName(),
valueString, DisplayType.String, pdc.getFormatPattern()));
}
@@ -1086,10 +1088,11 @@ public class DataEngine
pdc = pd.getColumnInfo()[c];
if (c == 0) // put Function in first Column
{
- String name = "";
+ String name;
if (!format.getTableFormat().isPrintFunctionSymbols()) // Translate Sum, etc.
name = Msg.getMsg(format.getLanguage(), PrintDataFunction.getFunctionName(functions[f]));
- name += PrintDataFunction.getFunctionSymbol(functions[f]); // Symbol
+ else
+ name = PrintDataFunction.getFunctionSymbol(functions[f]); // Symbol
pd.addNode(new PrintDataElement(pdc.getColumnName(), name.trim(),
DisplayType.String, pdc.getFormatPattern()));
}
diff --git a/org.adempiere.server-feature/buckminster.cspex b/org.adempiere.server-feature/buckminster.cspex
index 5b77e1a6b4..6c19bd929c 100644
--- a/org.adempiere.server-feature/buckminster.cspex
+++ b/org.adempiere.server-feature/buckminster.cspex
@@ -9,6 +9,7 @@
+
@@ -66,6 +67,7 @@
+
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
index fae05bdb3f..8d56a2bbf0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
@@ -417,6 +417,7 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements EventListener
ListElement pp = (ListElement)yesModel.getElementAt(i);
yesList.addItem(new KeyNamePair(pp.m_key, pp.getName()));
}
+ yesList.setSelectedIndices(indices);
wc.setIsChanged(true);
if ( yesList.getSelectedItem() != null)
{
diff --git a/org.idempiere.fitnesse-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml
index ccf6cf6b62..0ae2311729 100644
--- a/org.idempiere.fitnesse-feature/feature.xml
+++ b/org.idempiere.fitnesse-feature/feature.xml
@@ -37,4 +37,11 @@
version="0.0.0"
unpack="false"/>
+
+