diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index 263f297f2a3fd6bc18b9e93406e47f733b7558ea..2abad2c9a73136193dd1e24e4bb2a09f4dd1dd3b 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -196,6 +196,12 @@
     <entityProvider>
       <name>DSGVOEntries</name>
     </entityProvider>
+    <entityField>
+      <name>APPLY_CHANGE_FOR_ALL_CONTROL</name>
+      <title>Apply changes for all</title>
+      <contentType>BOOLEAN</contentType>
+      <stateProcess>%aditoprj%/entity/DSGVO_entity/entityfields/apply_change_for_all_control/stateProcess.js</stateProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/DSGVO_entity/entityfields/apply_change_for_all_control/stateProcess.js b/entity/DSGVO_entity/entityfields/apply_change_for_all_control/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..945550f65b9e92442c23068c3a50cfc90445b013
--- /dev/null
+++ b/entity/DSGVO_entity/entityfields/apply_change_for_all_control/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+var recordState = vars.get("$sys.recordstate");
+var fieldState;
+if (recordState == neon.OPERATINGSTATE_NEW || recordState == neon.OPERATINGSTATE_EDIT)
+    fieldState = neon.COMPONENTSTATE_EDITABLE;
+else
+    fieldState = neon.COMPONENTSTATE_INVISIBLE;
+
+result.string(fieldState);
\ No newline at end of file
diff --git a/entity/DSGVO_entity/recordcontainers/jdito/onUpdate.js b/entity/DSGVO_entity/recordcontainers/jdito/onUpdate.js
index e93e6a8c937df1095ea120bc3ab69c5869cc554b..eb725a596641dc15059ec7ebc8839131a2361278 100644
--- a/entity/DSGVO_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/DSGVO_entity/recordcontainers/jdito/onUpdate.js
@@ -1,31 +1,28 @@
+import("system.neon");
 import("system.db");
 import("Sql_lib");
 import("system.vars");
 
 var columns = [
-    "CONTACT_ID",
-    "DATE_NEW",
-    "DATE_EDIT",
-    "PURPOSE",
-    "ROW_ID",
     "STATUORITYSOURCE",
-    "DSGVOTYPE",
-    "USER_NEW",
-    "USER_EDIT",
-    "VALID_TO"
+    "PURPOSE",
+    "VALID_TO",
+    "DATE_EDIT",
+    "USER_EDIT"
 ];
 var values = [
-    vars.get("$field.CONTACT_ID"),
-    vars.get("$field.DATE_NEW"),
-    vars.get("$field.DATE_EDIT"),
-    vars.get("$field.PURPOSE"),
-    vars.get("$field.ROW_ID"),
     vars.get("$field.STATUORITYSOURCE"),
-    vars.get("$field.DSGVOTYPE"),
-    vars.get("$field.USER_NEW"),
+    vars.get("$field.PURPOSE"),
+    vars.get("$field.VALID_TO"),
+    vars.get("$field.DATE_EDIT"),
     vars.get("$field.USER_EDIT"),
-    vars.get("$field.VALID_TO")
+    
 ];
 
-db.updateData("DSGVO", columns, null, values, 
-    SqlCondition.equals("DSGVO.DSGVOID", vars.get("$field.UID"), "1=2"));
\ No newline at end of file
+var updateCond;
+if (vars.getString("$field.APPLY_CHANGE_FOR_ALL_CONTROL") == "1")
+    updateCond = SqlCondition.equals("DSGVO.CONTACT_ID", vars.get("$field.CONTACT_ID"), "1=2");
+else
+    updateCond = SqlCondition.equals("DSGVO.DSGVOID", vars.get("$field.UID"), "1=2");
+
+db.updateData("DSGVO", columns, null, values, updateCond);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 4af5e779b7763be81e74b33d8ba98a228750f040..a4ab00278fb9caf82be3d270b6c772427b3ba4b9 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5939,6 +5939,15 @@
     <entry>
       <key>New Appointment</key>
     </entry>
+    <entry>
+      <key>Custom template</key>
+    </entry>
+    <entry>
+      <key>Apply changes for all</key>
+    </entry>
+    <entry>
+      <key>grandchild of</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
   <sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index ae7d9edd08e50be34f6b02b7bd7e93fe7033c62d..b9b91486f444d8fdf06457e5f4262b7fff50b367 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -7463,6 +7463,16 @@
       <key>New Appointment</key>
       <value>Neuer Termin</value>
     </entry>
+    <entry>
+      <key>ankle of</key>
+    </entry>
+    <entry>
+      <key>Apply changes for all</key>
+      <value>Änderungen für alle übernehmen</value>
+    </entry>
+    <entry>
+      <key>series delete action</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 93e98574ca2f19b8bf3bf42fdf2460b06c19be02..86c3b95de68aa0f6cae204871404b92cca77e40b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5989,6 +5989,15 @@
     <entry>
       <key>New Appointment</key>
     </entry>
+    <entry>
+      <key>Custom template</key>
+    </entry>
+    <entry>
+      <key>Apply changes for all</key>
+    </entry>
+    <entry>
+      <key>grandchild of</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonView/DSGVOEdit_view/DSGVOEdit_view.aod b/neonView/DSGVOEdit_view/DSGVOEdit_view.aod
index d770c6d416195a1d10eb34266224168a363fdba3..3f2da448e6a1693eec946f3ff95f752425219b22 100644
--- a/neonView/DSGVOEdit_view/DSGVOEdit_view.aod
+++ b/neonView/DSGVOEdit_view/DSGVOEdit_view.aod
@@ -30,6 +30,10 @@
           <name>a9e1245c-7798-4170-9f2f-2e33f61cd6aa</name>
           <entityField>VALID_TO</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>605ab093-46de-4da2-a155-c86b02206553</name>
+          <entityField>APPLY_CHANGE_FOR_ALL_CONTROL</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/DSGVOPreview_view/DSGVOPreview_view.aod b/neonView/DSGVOPreview_view/DSGVOPreview_view.aod
index 8f90a845cab4553cc7caecc4ea589f99519ce030..e21acf9f29c10cc0ce20b3209deea6f3a967f48e 100644
--- a/neonView/DSGVOPreview_view/DSGVOPreview_view.aod
+++ b/neonView/DSGVOPreview_view/DSGVOPreview_view.aod
@@ -34,6 +34,10 @@
           <name>db62ba6a-91e9-42e3-a95c-7259c237c290</name>
           <entityField>VALID_TO</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>6cd8795a-9779-4a7d-9aaf-7da580424742</name>
+          <entityField>APPLY_CHANGE_FOR_ALL_CONTROL</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>