From 1093272fa1116f7e77bb6f018f2d1d794d96f94a Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Fri, 26 Jul 2024 08:12:55 +0200
Subject: [PATCH] IDEMPIERE-6196 Fix selection columns on several windows
 (#2426)

---
 .../src/org/adempiere/webui/window/FindWindow.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
index 74de5c0da7..0a5a138c67 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
@@ -949,7 +949,14 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         Collections.sort(gridFieldList, new Comparator<GridField>() {
 			@Override
 			public int compare(GridField o1, GridField o2) {
-				return o1.getSeqNoSelection()-o2.getSeqNoSelection();
+				// order by SeqNoSelection, sending the zeroes to the end
+				int sel1 = o1.getSeqNoSelection();
+				if (sel1 == 0)
+					sel1 = Integer.MAX_VALUE;
+				int sel2 = o2.getSeqNoSelection();
+				if (sel2 == 0)
+					sel2 = Integer.MAX_VALUE;
+				return sel1-sel2;
 			}
 		});