From d5bc4753767dbc1080c3ed0da323e7016e2efa53 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 21 May 2013 03:22:34 -0500 Subject: [PATCH 1/2] IDEMPIERE-454 Easy import / Fix NPE on Invoice Info window introduced by fc38a12c9bd3 --- .../src/org/adempiere/webui/editor/WTableDirEditor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java index e2a1aa45ec..9f0b6558f4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java @@ -281,7 +281,8 @@ ContextMenuListener, IZoomableEditor //still not in list, reset to zero if (!getComponent().isSelected(value)) { - if (value instanceof Integer && gridField != null && gridField.getDisplayType() != DisplayType.ID && !gridTab.getTableModel().isImporting()) // for IDs is ok to be out of the list + if (value instanceof Integer && gridField != null && gridField.getDisplayType() != DisplayType.ID + && gridTab != null && !gridTab.getTableModel().isImporting()) // for IDs is ok to be out of the list { getComponent().setValue(null); if (curValue == null) From 06bb4e95acf31bc040b14e7b0a75af6de40aa48d Mon Sep 17 00:00:00 2001 From: Richard Morales Date: Tue, 21 May 2013 04:20:20 -0500 Subject: [PATCH 2/2] IDEMPIERE-936 NPE opening RfQ Response --- .../oracle/201305201121_IDEMPIERE-936.sql | 17 +++++++++++++++++ .../postgresql/201305201121_IDEMPIERE-936.sql | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 migration/i1.0b-release/oracle/201305201121_IDEMPIERE-936.sql create mode 100644 migration/i1.0b-release/postgresql/201305201121_IDEMPIERE-936.sql diff --git a/migration/i1.0b-release/oracle/201305201121_IDEMPIERE-936.sql b/migration/i1.0b-release/oracle/201305201121_IDEMPIERE-936.sql new file mode 100644 index 0000000000..c85e9e1abb --- /dev/null +++ b/migration/i1.0b-release/oracle/201305201121_IDEMPIERE-936.sql @@ -0,0 +1,17 @@ +-- May 20, 2013 11:19:05 AM COT +-- IDEMPIERE-936 NPE opening RfQ Response +UPDATE AD_Tab SET TabLevel=0,Updated=TO_DATE('2013-05-20 11:19:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=614 +; + +-- May 20, 2013 11:19:15 AM COT +-- IDEMPIERE-936 NPE opening RfQ Response +UPDATE AD_Tab SET TabLevel=1,Updated=TO_DATE('2013-05-20 11:19:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=616 +; + +-- May 20, 2013 11:19:22 AM COT +-- IDEMPIERE-936 NPE opening RfQ Response +UPDATE AD_Tab SET TabLevel=2,Updated=TO_DATE('2013-05-20 11:19:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=618 +; + +SELECT register_migration_script('201305201121_IDEMPIERE-936.sql') FROM dual +; diff --git a/migration/i1.0b-release/postgresql/201305201121_IDEMPIERE-936.sql b/migration/i1.0b-release/postgresql/201305201121_IDEMPIERE-936.sql new file mode 100644 index 0000000000..613f471e9a --- /dev/null +++ b/migration/i1.0b-release/postgresql/201305201121_IDEMPIERE-936.sql @@ -0,0 +1,17 @@ +-- May 20, 2013 11:19:05 AM COT +-- IDEMPIERE-936 NPE opening RfQ Response +UPDATE AD_Tab SET TabLevel=0,Updated=TO_TIMESTAMP('2013-05-20 11:19:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=614 +; + +-- May 20, 2013 11:19:15 AM COT +-- IDEMPIERE-936 NPE opening RfQ Response +UPDATE AD_Tab SET TabLevel=1,Updated=TO_TIMESTAMP('2013-05-20 11:19:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=616 +; + +-- May 20, 2013 11:19:22 AM COT +-- IDEMPIERE-936 NPE opening RfQ Response +UPDATE AD_Tab SET TabLevel=2,Updated=TO_TIMESTAMP('2013-05-20 11:19:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=618 +; + +SELECT register_migration_script('201305201121_IDEMPIERE-936.sql') FROM dual +;