https://sourceforge.net/tracker/?func=detail&aid=2791073&group_id=176962&atid=955896

- don't prompt save ignored
- auto focus to error field
- messagebox should always be modal

zkwebui/WEB-INF/src/org/adempiere/webui/component/GridPanel.java

@@ -27,6 +27,7 @@ import org.compiere.model.GridTable;
 import org.compiere.model.MSysConfig;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
+import org.zkoss.zk.au.out.AuFocus;
 import org.zkoss.zk.au.out.AuScript;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
@@ -49,7 +50,7 @@ import org.zkoss.zul.event.ZulEvents;
 public class GridPanel extends Borderlayout implements EventListener
 {
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = 860960136170704359L;
 
@@ -58,18 +59,18 @@ public class GridPanel extends Borderlayout implements EventListener
 	private static final int MAX_COLUMN_WIDTH = 300;
 
 	private Grid listbox = null;
-	
+
 	private int pageSize = 100;
-	
+
 	private GridField[] gridField;
 	private AbstractTableModel tableModel;
-	
+
 	private int numColumns = 5;
-	
+
 	private int windowNo;
-	
+
 	private GridTab gridTab;
-	
+
 	private boolean init;
 
 	private GridTableListModel listModel;
@@ -83,14 +84,14 @@ public class GridPanel extends Borderlayout implements EventListener
 	private boolean modeless;
 
 	public static final String PAGE_SIZE_KEY = "ZK_PAGING_SIZE";
-	
+
 	public static final String MODE_LESS_KEY = "ZK_GRID_EDIT_MODELESS";
-	
+
 	public GridPanel()
 	{
 		this(0);
 	}
-	
+
 	/**
 	 * @param windowNo
 	 */
@@ -100,55 +101,55 @@ public class GridPanel extends Borderlayout implements EventListener
 		listbox = new Grid();
 		south = new South();
 		this.appendChild(south);
-		
+
 		//default paging size
 		pageSize = MSysConfig.getIntValue(PAGE_SIZE_KEY, 100);
-		
+
 		//default true for backward compatibility
 		modeless = MSysConfig.getBooleanValue(MODE_LESS_KEY, true);
 	}
 
 	/**
-	 * 
+	 *
 	 * @param gridTab
 	 */
 	public void init(GridTab gridTab)
 	{
 		if (init) return;
-				
+
 		this.gridTab = gridTab;
 		tableModel = gridTab.getTableModel();
-		
+
 		numColumns = tableModel.getColumnCount();
-		
+
 		gridField = ((GridTable)tableModel).getFields();
-				
+
 		setupColumns();
 		render();
-		
+
 		updateListIndex();
-		
+
 		this.init = true;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isInit() {
 		return init;
 	}
-	
+
 	/**
 	 * call when tab is activated
 	 * @param gridTab
 	 */
-	public void activate(GridTab gridTab) {		
+	public void activate(GridTab gridTab) {
 		if (!isInit()) {
 			init(gridTab);
 		}
 	}
-	
+
 	/**
 	 * refresh after switching from form view
 	 * @param gridTab
@@ -171,9 +172,9 @@ public class GridPanel extends Borderlayout implements EventListener
 	 */
 	public void updateListIndex() {
 		if (gridTab == null || !gridTab.isOpen()) return;
-		
+
-		int rowIndex  = gridTab.getCurrentRow();		
+		int rowIndex  = gridTab.getCurrentRow();
-		if (pageSize > 0) {			
+		if (pageSize > 0) {
 			if (paging.getTotalSize() != gridTab.getRowCount())
 				paging.setTotalSize(gridTab.getRowCount());
 			int pgIndex = rowIndex >= 0 ? rowIndex % pageSize : 0;
@@ -186,18 +187,18 @@ public class GridPanel extends Borderlayout implements EventListener
 			} else if (rowIndex == renderer.getCurrentRowIndex()){
 				if (modeless && !renderer.isEditing())
 					Events.echoEvent("onPostSelectedRowChanged", this, null);
-				return;				
+				return;
 			} else {
 				if (renderer.isEditing()) {
 					renderer.stopEditing(false);
-					if (((renderer.getCurrentRowIndex() - pgIndex) / pageSize) == pgNo) { 
+					if (((renderer.getCurrentRowIndex() - pgIndex) / pageSize) == pgNo) {
 						listModel.updateComponent(renderer.getCurrentRowIndex() % pageSize);
 					}
 				}
 			}
 			if (paging.getActivePage() != pgNo) {
 				paging.setActivePage(pgNo);
-			}						
+			}
 			if (rowIndex >= 0 && pgIndex >= 0) {
 				Events.echoEvent("onPostSelectedRowChanged", this, null);
 			}
@@ -216,12 +217,12 @@ public class GridPanel extends Borderlayout implements EventListener
 	{
 		this.pageSize = pageSize;
 	}
-	
+
 	public void clear()
 	{
 		this.getChildren().clear();
 	}
-	
+
 	/**
 	 * toggle visibility
 	 * @param bool
@@ -233,17 +234,17 @@ public class GridPanel extends Borderlayout implements EventListener
 		else
 			this.setVisible(false);
 	}
-	
+
 	private void setupColumns()
-	{		
+	{
 		if (init) return;
-		
+
-		Columns columns = new Columns(); 
+		Columns columns = new Columns();
 		listbox.appendChild(columns);
 		columns.setSizable(true);
 		columns.setMenupopup("auto");
 		columns.setColumnsgroup(false);
-		
+
 		Map<Integer, String> colnames = new HashMap<Integer, String>();
 		int index = 0;
 		for (int i = 0; i < numColumns; i++)
@@ -256,35 +257,35 @@ public class GridPanel extends Borderlayout implements EventListener
 				column.setSortAscending(new SortComparator(i, true, Env.getLanguage(Env.getCtx())));
 				column.setSortDescending(new SortComparator(i, false, Env.getLanguage(Env.getCtx())));
 				column.setLabel(gridField[i].getHeader());
-				int l = DisplayType.isNumeric(gridField[i].getDisplayType()) 
+				int l = DisplayType.isNumeric(gridField[i].getDisplayType())
 					? 120 : gridField[i].getDisplayLength() * 9;
 				if (gridField[i].getHeader().length() * 9 > l)
 					l = gridField[i].getHeader().length() * 9;
-				if (l > MAX_COLUMN_WIDTH) 
+				if (l > MAX_COLUMN_WIDTH)
 					l = MAX_COLUMN_WIDTH;
 				else if ( l < MIN_COLUMN_WIDTH)
 					l = MIN_COLUMN_WIDTH;
 				column.setWidth(Integer.toString(l) + "px");
 				columns.appendChild(column);
 			}
-		}		
+		}
 	}
-	
+
 	private void render()
 	{
 		LayoutUtils.addSclass("adtab-grid-panel", this);
-		
+
 		listbox.setVflex(true);
 		listbox.setFixedLayout(true);
 		listbox.addEventListener(Events.ON_CLICK, this);
-		
+
-		updateModel();				
+		updateModel();
-		
+
 		Center center = new Center();
 		center.appendChild(listbox);
 		this.appendChild(center);
-		
+
-		if (pageSize > 0) 
+		if (pageSize > 0)
 		{
 			paging = new Paging();
 			paging.setPageSize(pageSize);
@@ -298,21 +299,21 @@ public class GridPanel extends Borderlayout implements EventListener
 		{
 			south.setVisible(false);
 		}
-				
+
 	}
-	
+
 	private void updateModel() {
-		listModel = new GridTableListModel((GridTable)tableModel, windowNo);		
+		listModel = new GridTableListModel((GridTable)tableModel, windowNo);
 		listModel.setPageSize(pageSize);
 		if (renderer != null && renderer.isEditing())
 			renderer.stopEditing(false);
 		renderer = new GridTabRowRenderer(gridTab, windowNo);
 		renderer.setGridPanel(this);
-				
+
 		listbox.setRowRenderer(renderer);
-		listbox.setModel(listModel);		
+		listbox.setModel(listModel);
 	}
-	
+
 	/**
 	 * deactivate panel
 	 */
@@ -322,9 +323,9 @@ public class GridPanel extends Borderlayout implements EventListener
 	}
 
 	public void onEvent(Event event) throws Exception
-	{		
+	{
 		if (event == null)
-			return;		
+			return;
 		else if (event.getTarget() == listbox && Events.ON_CLICK.equals(event.getName()))
 		{
 			Object data = event.getData();
@@ -342,7 +343,7 @@ public class GridPanel extends Borderlayout implements EventListener
 				else
 				{
 					int index = listbox.getRows().getChildren().indexOf(data);
-					if (index >= 0 ) {					
+					if (index >= 0 ) {
 						onSelectedRowChange(index);
 					}
 				}
@@ -362,24 +363,24 @@ public class GridPanel extends Borderlayout implements EventListener
 	private void onSelectedRowChange(int index) {
 		if (updateModelIndex(index)) {
 			updateListIndex();
-		} 
+		}
 	}
-	
+
 	/**
 	 * Event after the current selected row change
 	 */
 	public void onPostSelectedRowChanged() {
-		if (listbox.getRows().getChildren().isEmpty()) 
+		if (listbox.getRows().getChildren().isEmpty())
 			return;
-		
+
 		int rowIndex  = gridTab.isOpen() ? gridTab.getCurrentRow() : -1;
-		if (rowIndex >= 0 && pageSize > 0) {			
+		if (rowIndex >= 0 && pageSize > 0) {
 			int pgIndex = rowIndex >= 0 ? rowIndex % pageSize : 0;
 			org.zkoss.zul.Row row = (org.zkoss.zul.Row) listbox.getRows().getChildren().get(pgIndex);
 			if (!isRowRendered(row, pgIndex)) {
-				listbox.renderRow(row);				
+				listbox.renderRow(row);
 			} else {
-				renderer.setCurrentRow(row);				
+				renderer.setCurrentRow(row);
 			}
 			if (modeless && !renderer.isEditing()) {
 				renderer.editCurrentRow();
@@ -392,7 +393,7 @@ public class GridPanel extends Borderlayout implements EventListener
 			if (!isRowRendered(row, rowIndex)) {
 				listbox.renderRow(row);
 			} else {
-				renderer.setCurrentRow(row);				
+				renderer.setCurrentRow(row);
 			}
 			if (modeless && !renderer.isEditing()) {
 				renderer.editCurrentRow();
@@ -409,7 +410,7 @@ public class GridPanel extends Borderlayout implements EventListener
 	}
 
 	private boolean isRowRendered(org.zkoss.zul.Row row, int index) {
-		if (row.getChildren().size() == 0) {			
+		if (row.getChildren().size() == 0) {
 			return false;
 		} else if (row.getChildren().size() == 1) {
 			if (!(row.getChildren().get(0) instanceof Div)) {
@@ -418,20 +419,20 @@ public class GridPanel extends Borderlayout implements EventListener
 		}
 		return true;
 	}
-	
+
 	private boolean updateModelIndex(int rowIndex) {
 		if (pageSize > 0) {
 			int start = listModel.getPage() * listModel.getPageSize();
 			rowIndex = start + rowIndex;
-		} 
+		}
-		
+
 		if (gridTab.getCurrentRow() != rowIndex) {
 			gridTab.navigate(rowIndex);
 			return true;
 		}
 		return false;
 	}
-	
+
 	/**
 	 * @return Grid
 	 */
@@ -448,7 +449,7 @@ public class GridPanel extends Borderlayout implements EventListener
         {
             return;
         }
-        
+
         //  Selective
         if (col > 0)
         	return;
@@ -475,7 +476,7 @@ public class GridPanel extends Borderlayout implements EventListener
 	}
 
 	/**
-	 * 
+	 *
 	 * @param windowNo
 	 */
 	public void setWindowNo(int windowNo) {
@@ -498,4 +499,17 @@ public class GridPanel extends Borderlayout implements EventListener
 			renderer.setFocusToEditor();
 		}
 	}
+
+	public void setFocusToField(String columnName) {
+		boolean found = false;
+		for (WEditor editor : renderer.getEditors()) {
+			if (found)
+				editor.setHasFocus(false);
+			else if (columnName.equals(editor.getColumnName())) {
+				editor.setHasFocus(true);
+				Clients.response(new AuFocus(editor.getComponent()));
+				found = true;
+			}
+		}
+	}
 }

zkwebui/WEB-INF/src/org/adempiere/webui/component/Messagebox.java

@@ -42,15 +42,15 @@ import org.zkoss.zul.Separator;
 public class Messagebox extends Window implements EventListener
 {
 	/**
-	 * 
+	 *
 	 */
 	private static final long serialVersionUID = -4957498533838144942L;
 	private String msg = new String("");
 	private String imgSrc = new String("");
-	
+
 //	private Label lblMsg = new Label();
 	private Text lblMsg = new Text();
-	
+
 	private Button btnOk = new Button();
 	private Button btnCancel = new Button();
 	private Button btnYes = new Button();
@@ -58,62 +58,62 @@ public class Messagebox extends Window implements EventListener
 	private Button btnAbort = new Button();
 	private Button btnRetry = new Button();
 	private Button btnIgnore = new Button();
-	
+
 	private Image img = new Image();
 
 	private int returnValue;
-	
+
 	/** A OK button. */
 	public static final int OK = 0x0001;
-	
+
 	/** A Cancel button. */
 	public static final int CANCEL = 0x0002;
-	
+
 	/** A Yes button. */
 	public static final int YES = 0x0010;
-	
+
 	/** A No button. */
 	public static final int NO = 0x0020;
-	
+
 	/** A Abort button. */
 	public static final int ABORT = 0x0100;
-	
+
 	/** A Retry button. */
 	public static final int RETRY = 0x0200;
-	
+
 	/** A IGNORE button. */
 	public static final int IGNORE = 0x0400;
-	
+
 	/** A symbol consisting of a question mark in a circle. */
 	public static final String QUESTION = "~./zul/img/msgbox/question.gif";
-	
+
 	/** A symbol consisting of an exclamation point in a triangle with a yellow background. */
 	public static final String EXCLAMATION  = "~./zul/img/msgbox/exclamation.gif";
-	
+
 	/** A symbol of a lowercase letter i in a circle. */
 	public static final String INFORMATION = "~./zul/img/msgbox/information.gif";
-	
+
 	/** A symbol consisting of a white X in a circle with a red background. */
 	public static final String ERROR = "~./zul/img/msgbox/error.gif";
-	
+
 	/** Contains no symbols. */
 	public static final String NONE = null;
-	
+
 	public Messagebox()
 	{
 		super();
 	}
-	
+
 	private void init()
 	{
 		Properties ctx = Env.getCtx();
 		lblMsg.setValue(msg);
-		
+
 		btnOk.setLabel(Util.cleanAmp(Msg.getMsg(ctx, "OK")));
 		btnOk.setImage("/images/Ok16.png");
 		btnOk.addEventListener(Events.ON_CLICK, this);
 		LayoutUtils.addSclass("action-text-button", btnOk);
-			
+
 		btnCancel.setLabel(Util.cleanAmp(Msg.getMsg(ctx, "Cancel")));
 		btnCancel.setImage("/images/Cancel16.png");
 		btnCancel.addEventListener(Events.ON_CLICK, this);
@@ -123,47 +123,47 @@ public class Messagebox extends Window implements EventListener
 		btnYes.setImage("/images/Ok16.png");
 		btnYes.addEventListener(Events.ON_CLICK, this);
 		LayoutUtils.addSclass("action-text-button", btnYes);
-		
+
 		btnNo.setLabel(Util.cleanAmp(Msg.getMsg(ctx, "No")));
 		btnNo.setImage("/images/Cancel16.png");
 		btnNo.addEventListener(Events.ON_CLICK, this);
 		LayoutUtils.addSclass("action-text-button", btnNo);
-		
+
 		btnAbort.setLabel("Abort");
 		//btnAbort.setImage("/images/");
 		btnAbort.addEventListener(Events.ON_CLICK, this);
 		LayoutUtils.addSclass("action-text-button", btnAbort);
-		
+
 		btnRetry.setLabel("Retry");
 		//btnRetry.setImage("/images/");
 		btnRetry.addEventListener(Events.ON_CLICK, this);
 		LayoutUtils.addSclass("action-text-button", btnRetry);
-		
+
 		btnIgnore.setLabel("Ignore");
 		btnIgnore.setImage("/images/Ignore16.png");
 		btnIgnore.addEventListener(Events.ON_CLICK, this);
 		LayoutUtils.addSclass("action-text-button", btnIgnore);
-		
+
 		Panel pnlMessage = new Panel();
 		pnlMessage.setWidth("100%");
 		pnlMessage.setStyle("text-align:left");
 		pnlMessage.appendChild(lblMsg);
 
 		Panel pnlImage = new Panel();
-		
+
 		img.setSrc(imgSrc);
-		
+
 		pnlImage.setWidth("100%");
 		pnlImage.setStyle("text-align:center");
 		pnlImage.appendChild(img);
-				
+
 		Hbox hbox = new Hbox();
 		hbox.setWidth("100%");
 		hbox.setWidths("10%, 90%");
-		
+
 		hbox.appendChild(pnlImage);
 		hbox.appendChild(pnlMessage);
-		
+
 		Hbox pnlButtons = new Hbox();
 		pnlButtons.setWidth("100%");
 		pnlButtons.setStyle("text-align:center");
@@ -174,27 +174,27 @@ public class Messagebox extends Window implements EventListener
 		pnlButtons.appendChild(btnAbort);
 		pnlButtons.appendChild(btnRetry);
 		pnlButtons.appendChild(btnIgnore);
-		
+
 		this.setWidth("100%");
 		this.setBorder("normal");
 		this.setContentStyle("background-color:#ffffff");
 		this.setPosition("left, top");
-		
+
 		Separator blank = new Separator();
 		blank.setOrient("vertical");
 		blank.setHeight("5px");
-		
+
 		hbox.appendChild(blank);
 		hbox.appendChild(pnlButtons);
-				
+
 		this.appendChild(hbox);
 	}
-	
+
 	public int show(String message, String title, int buttons, String icon)
 	{
 		this.msg = message;
 		this.imgSrc = icon;
-		
+
 		btnOk.setVisible(false);
 		btnCancel.setVisible(false);
 		btnYes.setVisible(false);
@@ -202,66 +202,55 @@ public class Messagebox extends Window implements EventListener
 		btnRetry.setVisible(false);
 		btnAbort.setVisible(false);
 		btnIgnore.setVisible(false);
-		
+
 		if ((buttons & OK) != 0)
 			btnOk.setVisible(true);
-		
+
 		if ((buttons & CANCEL) != 0)
 			btnCancel.setVisible(true);
-		
+
 		if ((buttons & YES) != 0)
 			btnYes.setVisible(true);
-		
+
 		if ((buttons & NO) != 0)
 			btnNo.setVisible(true);
-		
+
 		if ((buttons & RETRY) != 0)
 			btnRetry.setVisible(true);
-		
+
 		if ((buttons & ABORT) != 0)
 			btnAbort.setVisible(true);
-		
+
 		if ((buttons & IGNORE) != 0)
 			btnIgnore.setVisible(true);
-		
+
 		init();
-		
+
-		if (icon.equals(QUESTION))
+		this.setTitle(title);
-		{
+		this.setWidth("500px");
-			this.setTitle(title);
+		this.setPosition("center");
-			this.setWidth("500px");
+		this.setClosable(true);
-			this.setPosition("center");
+		this.setAttribute(Window.MODE_KEY, Window.MODE_MODAL);
-			this.setClosable(true);
+		this.setSizable(true);
-			this.setAttribute(Window.MODE_KEY, Window.MODE_MODAL);
+
-			this.setSizable(true);
-		}
-		else
-		{
-			this.setTitle(title);
-			this.setAttribute(Window.MODE_KEY, Window.MODE_OVERLAPPED);
-			this.setWidth("500px");
-			this.setClosable(true);
-			this.setSizable(true);
-		}
-		
 		this.setVisible(true);
 		AEnv.showCenterScreen(this);
-		
+
 		return returnValue;
 	}
-	
+
 	public static int showDialog(String message, String title, int buttons, String icon) throws InterruptedException
 	{
 		Messagebox msg = new Messagebox();
-		
+
 		return msg.show(message, title, buttons, icon);
 	}
-	
+
-	public void onEvent(Event event) throws Exception 
+	public void onEvent(Event event) throws Exception
 	{
 		if (event == null)
 			return;
-		
+
 		if (event.getTarget() == btnOk)
 		{
 			returnValue = OK;
@@ -290,7 +279,7 @@ public class Messagebox extends Window implements EventListener
 		{
 			returnValue = IGNORE;
 		}
-		
+
 		this.detach();
 	}
 }

zkwebui/WEB-INF/src/org/adempiere/webui/editor/WEditor.java

@@ -478,4 +478,8 @@ public abstract class WEditor implements EventListener, PropertyChangeListener
 	public boolean isHasFocus() {
 		return hasFocus;
 	}
+
+	public void setHasFocus(boolean b) {
+		hasFocus = b;
+	}
 }

zkwebui/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java

@@ -1062,6 +1062,23 @@ DataStatusListener, IADTabpanel, VetoableChangeListener
 			listPanel.focus();
 	}
 
+	public void setFocusToField(String columnName) {
+		if (formComponent.isVisible()) {
+			boolean found = false;
+			for (WEditor editor : editors) {
+				if (found)
+					editor.setHasFocus(false);
+				else if (columnName.equals(editor.getColumnName())) {
+					editor.setHasFocus(true);
+					Clients.response(new AuFocus(editor.getComponent()));
+					found = true;
+				}
+			}
+		} else {
+			listPanel.setFocusToField(columnName);
+		}
+	}
+
 	/**
 	 * @see IADTabpanel#onEnterKey()
 	 */

zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java

@@ -928,6 +928,17 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
         //  Confirm Error
         if (e.isError() && !e.isConfirmed())
         {
+        	//focus to error field
+        	ADTabpanel tabPanel = (ADTabpanel) getADTab().getSelectedTabpanel();
+        	GridField[] fields = curTab.getFields();
+        	for (GridField field : fields)
+        	{
+        		if (field.isError())
+        		{
+        			tabPanel.setFocusToField(field.getColumnName());
+        			break;
+        		}
+        	}
             FDialog.error(curWindowNo, null, e.getAD_Message(), e.getInfo());
             e.setConfirmed(true);   //  show just once - if MTable.setCurrentRow is involved the status event is re-issued
         }
@@ -1244,8 +1255,7 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
 		String msg = CLogger.retrieveErrorString(null);
 		if (msg != null)
 			FDialog.error(curWindowNo, parent, null, msg);
-		else
+
-			FDialog.error(curWindowNo, parent, "SaveIgnored");
 		//actual error will prompt in the dataStatusChanged event
 		statusBar.setStatusLine(Msg.getMsg(Env.getCtx(), "SaveIgnored"), true);
 	}