From c1390e3097fd25a478e7460f6fd0ec39911f91a1 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Mon, 22 May 2017 09:54:01 +0700
Subject: [PATCH] IDEMPIERE-3370:NPE when back to tab hasn't detail tab

---
 .../src/org/adempiere/webui/adwindow/CompositeADTabbox.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
index 2a63e7ede3..ea3dcbb805 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
@@ -580,7 +580,7 @@ public class CompositeADTabbox extends AbstractADTabbox
 						detailPane.setSelectedIndex(0);
 						activateDetailIfVisible();
 					} else {
-						if (((ADTabpanel) headerTab).isDetailVisible()) {
+						if (((ADTabpanel) headerTab).isDetailVisible() && detailPane.getSelectedADTabpanel() != null) {
 							IADTabpanel selectDetailPanel = detailPane.getSelectedADTabpanel();
 							if (!selectDetailPanel.isVisible()) {							
 								selectDetailPanel.setVisible(true);