From 93c9beea4b647825744ec912933b9fa1884faff3 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 23 Sep 2013 08:03:50 -0500 Subject: [PATCH 1/3] IDEMPIERE-1390 Revenue Recognition window is not active / IDEMPIERE-362 --- .../oracle/201309230801_IDEMPIERE-1390.sql | 31 +++++++++++++++++++ .../201309230801_IDEMPIERE-1390.sql | 28 +++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 migration/i1.0c-release/oracle/201309230801_IDEMPIERE-1390.sql create mode 100644 migration/i1.0c-release/postgresql/201309230801_IDEMPIERE-1390.sql diff --git a/migration/i1.0c-release/oracle/201309230801_IDEMPIERE-1390.sql b/migration/i1.0c-release/oracle/201309230801_IDEMPIERE-1390.sql new file mode 100644 index 0000000000..3d90fb79e1 --- /dev/null +++ b/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 +; + diff --git a/migration/i1.0c-release/postgresql/201309230801_IDEMPIERE-1390.sql b/migration/i1.0c-release/postgresql/201309230801_IDEMPIERE-1390.sql new file mode 100644 index 0000000000..456aedc5eb --- /dev/null +++ b/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 +; + From 761a07b08ac640c7f116e1df23c02e1be944ef8d Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 26 Sep 2013 16:44:25 -0500 Subject: [PATCH 2/3] IDEMPIERE-1394 Copy toolbar button wrongly enabled / Thanks to Naim Berisha (nberisha) for the patch --- .../src/org/adempiere/webui/adwindow/ADWindowToolbar.java | 6 +++++- .../adempiere/webui/adwindow/AbstractADWindowContent.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java index 4ce1d8fc46..809229635b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java @@ -71,7 +71,7 @@ public class ADWindowToolbar extends FToolbar implements EventListener /** * */ - private static final long serialVersionUID = -367141745573893540L; + private static final long serialVersionUID = -5540268492066600133L; public static final String BTNPREFIX = "Btn"; @@ -433,6 +433,10 @@ public class ADWindowToolbar extends FToolbar implements EventListener public void enableNew(boolean enabled) { this.btnNew.setDisabled(!enabled); + } + + public void enableCopy(boolean enabled) + { this.btnCopy.setDisabled(!enabled); } 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 aabf0bd83c..7f69fbbb85 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 @@ -1401,6 +1401,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); // @@ -1446,6 +1447,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); } @@ -1622,6 +1624,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements { adTabbox.getSelectedTabpanel().dynamicDisplay(0); toolbar.enableNew(false); + toolbar.enableCopy(false); toolbar.enableDelete(false); breadCrumb.enableFirstNavigation(adTabbox.getSelectedGridTab().getCurrentRow() > 0); breadCrumb.enableLastNavigation(adTabbox.getSelectedGridTab().getCurrentRow() + 1 < adTabbox.getSelectedGridTab().getRowCount()); @@ -1669,6 +1672,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements { adTabbox.getSelectedTabpanel().dynamicDisplay(0); toolbar.enableNew(false); + toolbar.enableCopy(false); toolbar.enableDelete(false); breadCrumb.enableFirstNavigation(adTabbox.getSelectedGridTab().getCurrentRow() > 0); breadCrumb.enableLastNavigation(adTabbox.getSelectedGridTab().getCurrentRow() + 1 < adTabbox.getSelectedGridTab().getRowCount()); From 0b546eaed7a038e3d9be3ba27014ac1e62518d82 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 26 Sep 2013 16:58:48 -0500 Subject: [PATCH 3/3] IDEMPIERE-1364 Problem with the Find on any window having tree panel - thanks to Richard Morales --- .../WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java | 5 +---- 1 file changed, 1 insertion(+), 4 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 702a9ea97c..96c5717477 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 @@ -52,7 +52,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; @@ -1293,9 +1292,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(); - } + treePanel.getTree().onInitRender(); SimpleTreeModel model = (SimpleTreeModel)(TreeModel) treePanel.getTree().getModel(); if (treePanel.getTree().getSelectedItem() != null) {