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

IDEMPIERE-6206 Shortcut for Payment not working with there are different windows for Receipt/Payment (#2432) 

* IDEMPIERE-6206 Shortcut for Payment not working with there are different windows for Receipt/Payment

* - remove unnecessary commented code
This commit is contained in:
Carlos Ruiz 2024-08-06 11:13:43 +02:00
parent 86c7e2d026
commit a577c1a343
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/DocumentSearchController.java
View File

@ -29,6 +29,7 @@ import org.compiere.model.MColumn;
import org.compiere.model.MLookup; import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory; import org.compiere.model.MLookupFactory;
import org.compiere.model.MLookupInfo; import org.compiere.model.MLookupInfo;
import org.compiere.model.MPayment;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MSearchDefinition; import org.compiere.model.MSearchDefinition;
@ -282,14 +283,27 @@ public class DocumentSearchController implements EventListener<Event>{
if (sql != null) { if (sql != null) {
if (powindow != null) { if (powindow != null) {
if (window != null) { String whereCol = null;
doRetrieval(msd, sql, params, lookup, window, table.getTableName(), " AND IsSOTrx='Y' ", list); if (table.columnExistsInDictionary("IsSOTrx")) {
whereCol = " AND IsSOTrx=";
} else {
if (MPayment.Table_Name.equals(table.getTableName())) {
whereCol = " AND IsReceipt=";
}
}
if (whereCol == null) {
doRetrieval(msd, sql, params, lookup, powindow, table.getTableName(), null, list);
} else {
if (window != null) {
String soWhereTrx = whereCol + "'Y' ";
doRetrieval(msd, sql, params, lookup, window, table.getTableName(), soWhereTrx, list);
}
String poWhereTrx = whereCol + "'N' ";
doRetrieval(msd, sql, params, lookup, powindow, table.getTableName(), poWhereTrx, list);
} }
doRetrieval(msd, sql, params, lookup, powindow, table.getTableName(), " AND IsSOTrx='N' ", list);
} else if (window != null) { } else if (window != null) {
doRetrieval(msd, sql, params, lookup, window, table.getTableName(), null, list); doRetrieval(msd, sql, params, lookup, window, table.getTableName(), null, list);
} }
} }
} }
return list; return list;