hg merge release-1.0c (forward-porting)

migration/i1.0c-release/oracle/201309230801_IDEMPIERE-1390.sql

@@ -0,0 +1,31 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Sep 23, 2013 7:56:22 AM COT
+-- IDEMPIERE-1390 Revenue Recognition window is not active
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_DATE('2013-09-23 07:56:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11767
+;
+
+-- Sep 23, 2013 7:56:24 AM COT
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_DATE('2013-09-23 07:56:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5529
+;
+
+-- Sep 23, 2013 7:56:26 AM COT
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_DATE('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5431
+;
+
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_DATE('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3079
+;
+
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_DATE('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=53577
+;
+
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_DATE('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4821
+;
+
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_DATE('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=53875
+;
+
+SELECT register_migration_script('201309230801_IDEMPIERE-1390.sql') FROM dual
+;
+

migration/i1.0c-release/postgresql/201309230801_IDEMPIERE-1390.sql

@@ -0,0 +1,28 @@
+-- Sep 23, 2013 7:56:22 AM COT
+-- IDEMPIERE-1390 Revenue Recognition window is not active
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2013-09-23 07:56:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11767
+;
+
+-- Sep 23, 2013 7:56:24 AM COT
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2013-09-23 07:56:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5529
+;
+
+-- Sep 23, 2013 7:56:26 AM COT
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5431
+;
+
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3079
+;
+
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=53577
+;
+
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4821
+;
+
+UPDATE AD_Field SET IsDisplayed='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2013-09-23 07:56:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=53875
+;
+
+SELECT register_migration_script('201309230801_IDEMPIERE-1390.sql') FROM dual
+;
+

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java

@@ -51,7 +51,6 @@ import org.adempiere.webui.editor.WebEditorFactory;
 import org.adempiere.webui.event.ContextMenuListener;
 import org.adempiere.webui.panel.HelpController;
 import org.adempiere.webui.util.GridTabDataBinder;
-import org.adempiere.webui.util.TreeUtils;
 import org.adempiere.webui.window.FDialog;
 import org.compiere.model.DataStatusEvent;
 import org.compiere.model.DataStatusListener;
@@ -1305,9 +1304,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
 		if (recordId <= 0) return;
 		
 		//force on init render
-		if (TreeUtils.isOnInitRenderPosted(treePanel.getTree()) || treePanel.getTree().getTreechildren() == null) {
 		treePanel.getTree().onInitRender();
-		}
 
 		SimpleTreeModel model = (SimpleTreeModel)(TreeModel<?>) treePanel.getTree().getModel();
 		if (treePanel.getTree().getSelectedItem() != null) {

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java

@@ -71,7 +71,7 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -367141745573893540L;
+	private static final long serialVersionUID = -5540268492066600133L;
 
 	public static final String BTNPREFIX = "Btn";
 
@@ -442,6 +442,10 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
     public void enableNew(boolean enabled)
     {
         this.btnNew.setDisabled(!enabled);
+    }
+
+    public void enableCopy(boolean enabled)
+    {
         this.btnCopy.setDisabled(!enabled);
     }
 

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java

@@ -1420,6 +1420,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 	            insertRecord = tabPanel.getGridTab().isInsertRecord();
 	        }
 	        toolbar.enableNew(!changed && insertRecord && !tabPanel.getGridTab().isSortTab());
+	        toolbar.enableCopy(!changed && insertRecord && !tabPanel.getGridTab().isSortTab() && adTabbox.getSelectedGridTab().getRowCount()>0);
 	        toolbar.enableRefresh(!changed);
 	        toolbar.enableDelete(!changed && !readOnly && !tabPanel.getGridTab().isSortTab() && !processed);
 	        toolbar.enableDeleteSelection(!changed && !readOnly && !tabPanel.getGridTab().isSortTab() && !processed && tabPanel.isGridView());
@@ -1466,6 +1467,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
         if (e.getTotalRows() == 0 && insertRecord && !detailTab && !tabPanel.getGridTab().isSortTab())
         {
             toolbar.enableNew(true);
+            toolbar.enableCopy(false);
             toolbar.enableDelete(false);
             toolbar.enableDeleteSelection(false);
         }
@@ -1643,6 +1645,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 			        {
 			            adTabbox.getSelectedTabpanel().dynamicDisplay(0);
 			            toolbar.enableNew(false);
+			            toolbar.enableCopy(false);
 			            toolbar.enableDelete(false);
 			            toolbar.enableDeleteSelection(false);
 			            breadCrumb.enableFirstNavigation(adTabbox.getSelectedGridTab().getCurrentRow() > 0);
@@ -1691,6 +1694,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
         {
             adTabbox.getSelectedTabpanel().dynamicDisplay(0);
             toolbar.enableNew(false);
+            toolbar.enableCopy(false);
             toolbar.enableDelete(false);
             toolbar.enableDeleteSelection(false);
             breadCrumb.enableFirstNavigation(adTabbox.getSelectedGridTab().getCurrentRow() > 0);