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 160a7d8869..6b3fab1bc9 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 @@ -107,7 +107,8 @@ public class CompositeADTabbox extends AbstractADTabbox public void onCallback(Boolean result) { if (result) { onEditDetail(row); - adWindowPanel.onNew(); + if (!adWindowPanel.getActiveGridTab().isNew()) + adWindowPanel.onNew(); } } }); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java index 930ae69f84..648f76ea00 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java @@ -531,7 +531,10 @@ public class DetailPane extends Panel implements EventListener, IdSpace { if (i < 0 || tabbox.getTabs() == null || i >= tabbox.getTabs().getChildren().size()) return; - tabbox.getTabs().getChildren().get(i).setVisible(visible); + Tab tab = (Tab) tabbox.getTabs().getChildren().get(i); + tab.setVisible(visible); + if (tab.getLinkedPanel() != null) + tab.getLinkedPanel().setVisible(visible); } public boolean isTabVisible(int i) {