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

IDEMPIERE-2479:Printformat, Surpress Repeats doesnt works for HTML and XLS 

for csv
This commit is contained in:
hieplq 2015-07-05 15:35:07 +07:00
parent 87ca88e18a
commit 2d5d2b9858
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
org.adempiere.base/src/org/compiere/print/ReportEngine.java
View File

@ -898,9 +898,12 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
delimiter = '\t'; delimiter = '\t';
try try
{ {
Object [] preValues = new Object [m_layout.colSuppressRepeats.length];
int printColIndex = -1;
// for all rows (-1 = header row) // for all rows (-1 = header row)
for (int row = -1; row < m_printData.getRowCount(); row++) for (int row = -1; row < m_printData.getRowCount(); row++)
{ {
printColIndex = -1;
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
if (row != -1) if (row != -1)
m_printData.setRowIndex(row); m_printData.setRowIndex(row);
@ -923,10 +926,14 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
m_printFormat.getItem(col).getPrintName(language)); m_printFormat.getItem(col).getPrintName(language));
else else
{ {
printColIndex++;
Object obj = m_printData.getNode(new Integer(item.getAD_Column_ID())); Object obj = m_printData.getNode(new Integer(item.getAD_Column_ID()));
String data = ""; String data = "";
if (obj == null) if (obj == null){
; if (m_layout.colSuppressRepeats[printColIndex]){
preValues[col] = null;
}
}
else if (obj instanceof PrintDataElement) else if (obj instanceof PrintDataElement)
{ {
PrintDataElement pde = (PrintDataElement)obj; PrintDataElement pde = (PrintDataElement)obj;
@ -934,6 +941,14 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
data = pde.getValueAsString(); data = pde.getValueAsString();
else else
data = pde.getValueDisplay(language); // formatted data = pde.getValueDisplay(language); // formatted
if (m_layout.colSuppressRepeats[printColIndex]){
if (data.equals(preValues[printColIndex])){
continue;
}else{
preValues[printColIndex] = data;
}
}
} }
else if (obj instanceof PrintData) else if (obj instanceof PrintData)
{ {