diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index da270f173299f7fa701b825f43c797584a2769fd..eee29581d9dcafac77aceb7875c2a9c0a1a00c36 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,5 +14,5 @@
     <include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
     
     <!--enable this only when you definetly want to overwrite the existing data with demo records:--> 
-    <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
+    <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
 </databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 57a75025cb8f696dc91403e2709085b09c64f741..a38155223e2b9519c0cc82868720451c221aa5cf 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -435,6 +435,7 @@
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
       <stateProcess>%aditoprj%/entity/Order_entity/entityfields/dunningdate/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Order_entity/entityfields/dunningdate/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>DUNNINGLEVEL</name>
diff --git a/entity/Order_entity/entityfields/dunningdate/valueProcess.js b/entity/Order_entity/entityfields/dunningdate/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5ae1be32b21e27a07049d1388af7d1feab5f678
--- /dev/null
+++ b/entity/Order_entity/entityfields/dunningdate/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.result");
+    
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")
+    result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paydate/valueProcess.js b/entity/Order_entity/entityfields/paydate/valueProcess.js
index 2b9e87298193970d839ea9a7acf976832a792553..d5ae1be32b21e27a07049d1388af7d1feab5f678 100644
--- a/entity/Order_entity/entityfields/paydate/valueProcess.js
+++ b/entity/Order_entity/entityfields/paydate/valueProcess.js
@@ -3,5 +3,5 @@ import("system.neon");
 import("system.vars");
 import("system.result");
     
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")//we need "", because we are in EditMode
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value") == "")
     result.string(vars.get("$sys.date"));
\ No newline at end of file