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

IDEMPIERE-270 Reports should inherit search filter from window - fix create print format based on grid layout all columns/current columns logic

This commit is contained in:
Elaine Tan 2012-09-10 13:52:01 +08:00
parent 3c2f1a9ee4
commit 005dc99d7b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.adempiere.base/src/org/compiere/print/MPrintFormat.java
View File

@ -528,7 +528,7 @@ public class MPrintFormat extends X_AD_PrintFormat
GridTable tableModel = gridTab.getTableModel(); GridTable tableModel = gridTab.getTableModel();
GridField[] tmpFields = tableModel.getFields(); GridField[] tmpFields = tableModel.getFields();
MTabCustomization tabCustomization = MTabCustomization.get(Env.getCtx(), Env.getAD_User_ID(Env.getCtx()), gridTab.getAD_Tab_ID(), null); MTabCustomization tabCustomization = MTabCustomization.get(Env.getCtx(), Env.getAD_User_ID(Env.getCtx()), gridTab.getAD_Tab_ID(), null);
if (tabCustomization != null && tabCustomization.getAD_Tab_Customization_ID() > 0 if (!allColumns && tabCustomization != null && tabCustomization.getAD_Tab_Customization_ID() > 0
&& tabCustomization.getCustom() != null && tabCustomization.getCustom().trim().length() > 0) && tabCustomization.getCustom() != null && tabCustomization.getCustom().trim().length() > 0)
{ {
String custom = tabCustomization.getCustom().trim(); String custom = tabCustomization.getCustom().trim();
@ -544,7 +544,7 @@ public class MPrintFormat extends X_AD_PrintFormat
{ {
if (gridField.getAD_Field_ID() == AD_Field_ID) if (gridField.getAD_Field_ID() == AD_Field_ID)
{ {
if(allColumns || gridField.isDisplayedGrid()) if(gridField.isDisplayedGrid())
fieldList.add(gridField); fieldList.add(gridField);
break; break;
@ -559,7 +559,7 @@ public class MPrintFormat extends X_AD_PrintFormat
for(GridField field:tmpFields) for(GridField field:tmpFields)
{ {
if(allColumns || field.isDisplayedGrid()) if(field.isDisplayedGrid())
gridFieldList.add(field); gridFieldList.add(field);
} }
@ -578,6 +578,9 @@ public class MPrintFormat extends X_AD_PrintFormat
int seqNo = 1; int seqNo = 1;
for (GridField gridField : gridFields) for (GridField gridField : gridFields)
{ {
if (gridField.getAD_Column_ID() <= 0)
continue;
MPrintFormatItem pfi = MPrintFormatItem.createFromColumn (pf, gridField.getAD_Column_ID(), seqNo++); MPrintFormatItem pfi = MPrintFormatItem.createFromColumn (pf, gridField.getAD_Column_ID(), seqNo++);
if (pfi != null) if (pfi != null)
{ {