diff --git a/Modules.Patterns/Modules/Controls.vb b/Modules.Patterns/Modules/Controls.vb
index 75c467fb..4c4f7e56 100644
--- a/Modules.Patterns/Modules/Controls.vb
+++ b/Modules.Patterns/Modules/Controls.vb
@@ -48,7 +48,8 @@ Namespace Modules
 
                             Case GetType(DevExpress.XtraEditors.DateEdit)
                                 Dim oDateEdit As DevExpress.XtraEditors.DateEdit = oControl
-                                oReplaceValue = oDateEdit.EditValue
+                                Dim oDateValue As Date = oDateEdit.EditValue
+                                oReplaceValue = oDateValue.ToString("yyyyMMdd")
 
                             Case GetType(DevExpress.XtraEditors.LookUpEdit)
                                 Dim oLookupEdit As DevExpress.XtraEditors.LookUpEdit = oControl