From e565badf79455ef5502882cb1e6da7dfbf31d634 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 12 Oct 2012 17:17:09 -0500 Subject: [PATCH] IDEMPIERE-421 NPE - Payment Info --- .../org/adempiere/webui/panel/InfoPanel.java | 11 ++++++-- .../webui/panel/InfoPaymentPanel.java | 28 +++++++++++++------ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index 5e5162a59b..4f0d2834cc 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -1093,6 +1093,9 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM contentPanel.setSelectedIndex(0); } } + else if (event.getName().equals(Events.ON_CHANGE)) + { + } //default else { @@ -1108,9 +1111,11 @@ public abstract class InfoPanel extends Window implements EventListener, WTableM progressWindow.doHighlighted(); } - private void hideBusyDialog() { - progressWindow.dispose(); - progressWindow = null; + private void hideBusyDialog() { + if (progressWindow != null) { + progressWindow.dispose(); + progressWindow = null; + } } public void onQueryCallback() diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java index 5d56de8eca..1ed2444032 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java @@ -311,11 +311,17 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener, if (fDateFrom.getValue() != null || fDateTo.getValue() != null) { - Date f = fDateFrom.getValue(); - Timestamp from = new Timestamp(f.getTime()); + Timestamp from = null; + if (fDateFrom.getValue() != null) { + Date f = fDateFrom.getValue(); + from = new Timestamp(f.getTime()); + } - Date t = fDateTo.getValue(); - Timestamp to = new Timestamp(t.getTime()); + Timestamp to = null; + if (fDateTo.getValue() != null) { + Date t = fDateTo.getValue(); + to = new Timestamp(t.getTime()); + } if (from == null && to != null) sql.append(" AND TRUNC(p.DateTrx) <= ?"); @@ -368,11 +374,17 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener, if (fDateFrom.getValue() != null || fDateTo.getValue() != null) { - Date f = fDateFrom.getValue(); - Timestamp from = new Timestamp(f.getTime()); + Timestamp from = null; + if (fDateFrom.getValue() != null) { + Date f = fDateFrom.getValue(); + from = new Timestamp(f.getTime()); + } - Date t = fDateTo.getValue(); - Timestamp to = new Timestamp(t.getTime()); + Timestamp to = null; + if (fDateTo.getValue() != null) { + Date t = fDateTo.getValue(); + to = new Timestamp(t.getTime()); + } log.fine("Date From=" + from + ", To=" + to);