From 487a0d630accbf1afb14d49640f8858c9caf860e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 3 Nov 2009 17:25:08 +0000 Subject: [PATCH] Fix [2891211] - VDate: once a date is set, its not possible to NULL it https://sourceforge.net/tracker/?func=detail&atid=879332&aid=2891211&group_id=176962 Thanks to FreePath (Silvano) --- client/src/org/compiere/grid/ed/VDate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/org/compiere/grid/ed/VDate.java b/client/src/org/compiere/grid/ed/VDate.java index add4b86ff0..b1e0676d71 100644 --- a/client/src/org/compiere/grid/ed/VDate.java +++ b/client/src/org/compiere/grid/ed/VDate.java @@ -370,7 +370,7 @@ public class VDate extends JComponent */ public void propertyChange (PropertyChangeEvent evt) { - if (evt.getPropertyName().equals(org.compiere.model.GridField.PROPERTY)) + if (evt.getPropertyName().equals(GridField.PROPERTY)) setValue(evt.getNewValue()); } // propertyChange @@ -540,7 +540,7 @@ public class VDate extends JComponent AEnv.showCenterWindow(frame, cal); Timestamp result = cal.getTimestamp(); log.config( "Result=" + result); - if (result == null) + if (result == null && !cal.isCancel()) // F3P: added check for 'isCancel', result = value; // original cal = null; return result; @@ -550,7 +550,7 @@ public class VDate extends JComponent * Set Field/WindowNo for ValuePreference * @param mField MField */ - public void setField (org.compiere.model.GridField mField) + public void setField (GridField mField) { m_mField = mField; if (m_mField != null