From 4e038d62bb22303ff715b9480e74dbbde73c0e32 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Thu, 21 Mar 2013 14:43:53 +0800
Subject: [PATCH] IDEMPIERE-785 Save and new button is not working.

---
 .../src/org/adempiere/webui/adwindow/ADTabpanel.java   | 10 ++--------
 .../webui/adwindow/AbstractADWindowContent.java        |  2 +-
 .../adempiere/webui/adwindow/GridTabRowRenderer.java   |  8 ++------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
index 5718813d94..1911cba42a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
@@ -971,17 +971,11 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
 	public void focusToFirstEditor() {
 		WEditor toFocus = null;
 		for (WEditor editor : editors) {
-			if (editor.isVisible() && editor.getComponent().getParent() != null) {
+			if (editor.isVisible() && editor.isReadWrite() && editor.getComponent().getParent() != null
+				&& !(editor instanceof WImageEditor)) {
 				toFocus = editor;
 				break;
 			}
-
-			if (toFocus == null) {
-				if (editor.isVisible() && editor.isReadWrite() && editor.getComponent().getParent() != null
-					&& !(editor instanceof WImageEditor)) {
-					toFocus = editor;
-				}
-			}
 		}
 		if (toFocus != null) {
 			focusToEditor(toFocus);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
index a2ef6eaebf..22a350ce56 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
@@ -1923,7 +1923,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 		    }
 		}
 
-		if (dirtyTabpanel != null && dirtyTabpanel.getGridTab().isDetail()) {
+		if (dirtyTabpanel != null && dirtyTabpanel != adTabbox.getSelectedTabpanel()) {
 			Executions.getCurrent().setAttribute("adtabpane.saved", dirtyTabpanel);
 			dirtyTabpanel.getGridTab().refreshParentTabs();
 		}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java
index ca302e7522..f9ae3f3f46 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java
@@ -586,13 +586,9 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
 			WEditor firstEditor = null;
 			for (WEditor editor : getEditors()) {
 				if (editor.isVisible() && editor.getComponent().getParent() != null) {
-					toFocus = editor;
-					break;
-				}
-
-				if (editor.isVisible() && editor.getComponent().getParent() != null) {
-					if (toFocus == null && editor.isReadWrite()) {
+					if (editor.isReadWrite()) {
 						toFocus = editor;
+						break;
 					}
 					if (firstEditor == null)
 						firstEditor = editor;