midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 422170911913

This commit is contained in:
Heng Sin Low 2013-03-13 08:13:17 +08:00
parent f1b5bcbba2 b97fd2cff8
commit e08b355553
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.adempiere.base/src/org/compiere/print/DataEngine.java
View File

@ -854,7 +854,8 @@ public class DataEngine
String valueString = value.toString(); String valueString = value.toString();
if (value instanceof Timestamp) if (value instanceof Timestamp)
valueString = DisplayType.getDateFormat(pdc.getDisplayType(), m_language).format(value); 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(), pd.addNode(new PrintDataElement(pdc.getColumnName(),
valueString, DisplayType.String, false, pdc.isPageBreak(), pdc.getFormatPattern())); valueString, DisplayType.String, false, pdc.isPageBreak(), pdc.getFormatPattern()));
} }
@ -1053,7 +1054,8 @@ public class DataEngine
String valueString = value.toString(); String valueString = value.toString();
if (value instanceof Timestamp) if (value instanceof Timestamp)
valueString = DisplayType.getDateFormat(pdc.getDisplayType(), m_language).format(value); 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(), pd.addNode(new PrintDataElement(pdc.getColumnName(),
valueString, DisplayType.String, pdc.getFormatPattern())); valueString, DisplayType.String, pdc.getFormatPattern()));
} }
@ -1086,10 +1088,11 @@ public class DataEngine
pdc = pd.getColumnInfo()[c]; pdc = pd.getColumnInfo()[c];
if (c == 0) // put Function in first Column if (c == 0) // put Function in first Column
{ {
String name = ""; String name;
if (!format.getTableFormat().isPrintFunctionSymbols()) // Translate Sum, etc. if (!format.getTableFormat().isPrintFunctionSymbols()) // Translate Sum, etc.
name = Msg.getMsg(format.getLanguage(), PrintDataFunction.getFunctionName(functions[f])); 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(), pd.addNode(new PrintDataElement(pdc.getColumnName(), name.trim(),
DisplayType.String, pdc.getFormatPattern())); DisplayType.String, pdc.getFormatPattern()));
} }

2
org.adempiere.server-feature/buckminster.cspex
View File

@ -9,6 +9,7 @@
<dependency name="org.idempiere.fitnesse" componentType="eclipse.feature"/> <dependency name="org.idempiere.fitnesse" componentType="eclipse.feature"/>
<dependency name="org.idempiere.fitnesse.fixture" componentType="osgi.bundle"/> <dependency name="org.idempiere.fitnesse.fixture" componentType="osgi.bundle"/>
<dependency name="org.idempiere.fitnesse.server" componentType="osgi.bundle"/> <dependency name="org.idempiere.fitnesse.server" componentType="osgi.bundle"/>
<dependency name="org.idempiere.fitrecorder" componentType="osgi.bundle"/>
<dependency name="org.idempiere.ui.zk.selenium" componentType="osgi.bundle"/> <dependency name="org.idempiere.ui.zk.selenium" componentType="osgi.bundle"/>
</dependencies> </dependencies>
<generators> <generators>
@ -66,6 +67,7 @@
<attribute name="bundle.jars" component="org.idempiere.fitnesse.fixture"/> <attribute name="bundle.jars" component="org.idempiere.fitnesse.fixture"/>
<attribute name="bundle.jars" component="org.idempiere.fitnesse.server"/> <attribute name="bundle.jars" component="org.idempiere.fitnesse.server"/>
<attribute name="bundle.jars" component="org.idempiere.fitnesse"/> <attribute name="bundle.jars" component="org.idempiere.fitnesse"/>
<attribute name="bundle.jars" component="org.idempiere.fitrecorder"/>
<attribute name="bundle.jars" component="org.idempiere.ui.zk.selenium"/> <attribute name="bundle.jars" component="org.idempiere.ui.zk.selenium"/>
</public> </public>
<public name="feature.references"> <public name="feature.references">

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WRC3SortCriteriaPanel.java
View File

@ -417,6 +417,7 @@ public class WRC3SortCriteriaPanel extends WRCTabPanel implements EventListener
ListElement pp = (ListElement)yesModel.getElementAt(i); ListElement pp = (ListElement)yesModel.getElementAt(i);
yesList.addItem(new KeyNamePair(pp.m_key, pp.getName())); yesList.addItem(new KeyNamePair(pp.m_key, pp.getName()));
} }
yesList.setSelectedIndices(indices);
wc.setIsChanged(true); wc.setIsChanged(true);
if ( yesList.getSelectedItem() != null) if ( yesList.getSelectedItem() != null)
{ {

7
org.idempiere.fitnesse-feature/feature.xml
View File

@ -37,4 +37,11 @@
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin
id="org.idempiere.fitrecorder"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>