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

IDEMPIERE-4681 Can't use hidden column in display logic (#561) 

* IDEMPIERE-4681 Can't use hidden column in display logic

* IDEMPIERE-4681 Can't use hidden column in display logic

handle @ColumnName:0@ and @ColumnName.xyz@
This commit is contained in:
hengsin 2021-02-16 18:14:30 +08:00 committed by GitHub
parent 6acc8e235d
commit c91a13ee88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,9 @@ public class DataEngine
.append(" INNER JOIN AD_Column c ON (pfi.AD_Column_ID=c.AD_Column_ID)") .append(" INNER JOIN AD_Column c ON (pfi.AD_Column_ID=c.AD_Column_ID)")
.append(" LEFT OUTER JOIN AD_ReportView_Col rvc ON (pf.AD_ReportView_ID=rvc.AD_ReportView_ID AND c.AD_Column_ID=rvc.AD_Column_ID) ") .append(" LEFT OUTER JOIN AD_ReportView_Col rvc ON (pf.AD_ReportView_ID=rvc.AD_ReportView_ID AND c.AD_Column_ID=rvc.AD_Column_ID) ")
.append("WHERE pf.AD_PrintFormat_ID=?") // #1 .append("WHERE pf.AD_PrintFormat_ID=?") // #1
.append(" AND pfi.IsActive='Y' AND (pfi.IsPrinted='Y' OR c.IsKey='Y' OR pfi.SortNo > 0) ") .append(" AND pfi.IsActive='Y' AND (pfi.IsPrinted='Y' OR c.IsKey='Y' OR pfi.SortNo > 0 ")
.append(" OR EXISTS(select 1 from AD_PrintFormatItem x where x.AD_PrintFormat_ID=pf.AD_PrintFormat_ID and x.DisplayLogic is not null and ")
.append("(x.DisplayLogic Like '%@'||c.ColumnName||'@%' OR x.DisplayLogic Like '%@'||c.ColumnName||':%@%' OR x.DisplayLogic Like '%@'||c.ColumnName||'.%@%'))) ")
.append(" AND pfi.PrintFormatType IN ('" .append(" AND pfi.PrintFormatType IN ('"
+ MPrintFormatItem.PRINTFORMATTYPE_Field + MPrintFormatItem.PRINTFORMATTYPE_Field
+ "','" + "','"
@ -385,11 +387,6 @@ public class DataEngine
groupByColumns.add(tableName+"."+ColumnName); groupByColumns.add(tableName+"."+ColumnName);
pdc = new PrintDataColumn(AD_Column_ID, ColumnName, AD_Reference_ID, FieldLength, KEY, isPageBreak); // KeyColumn pdc = new PrintDataColumn(AD_Column_ID, ColumnName, AD_Reference_ID, FieldLength, KEY, isPageBreak); // KeyColumn
} }
// not printed Sort Columns
else if (!IsPrinted)
{
;
}
// -- Parent, TableDir (and unqualified Search) -- // -- Parent, TableDir (and unqualified Search) --
else if ( /* (IsParent && DisplayType.isLookup(AD_Reference_ID)) || <-- IDEMPIERE-71 Carlos Ruiz - globalqss */ else if ( /* (IsParent && DisplayType.isLookup(AD_Reference_ID)) || <-- IDEMPIERE-71 Carlos Ruiz - globalqss */
AD_Reference_ID == DisplayType.TableDir AD_Reference_ID == DisplayType.TableDir
@ -627,9 +624,6 @@ public class DataEngine
} }
// //
if (pdc == null || (!IsPrinted && !IsKey))
continue;
pdc.setFormatPattern(formatPattern); pdc.setFormatPattern(formatPattern);
columns.add(pdc); columns.add(pdc);
} // for all Fields in Tab } // for all Fields in Tab