diff --git a/.liquibase/Data_alias/basic/2019.1.4/DSGVO/create_DSGVO.xml b/.liquibase/Data_alias/basic/2019.1.4/DSGVO/create_DSGVO.xml
index 648b930429499fe1b9c811cf06b9abc92f4f9bae..adc14bb0340d1daad4c627f90bc9acb802fc1a6d 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/DSGVO/create_DSGVO.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/DSGVO/create_DSGVO.xml
@@ -39,7 +39,7 @@
<column name="TRANSMISSION" type="CHAR(36)" />
<column name="RECIPIENT" type="NVARCHAR(100)" />
- <column name="GARANTEE" type="NVARCHAR(100)" />
+ <column name="GUARANTEE" type="NVARCHAR(100)" />
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index f0a34e7e111cfb42a579d6d10335dba1f7f63296..02a73ae060d5db83d1a78faee414b148c90bf414 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -10456,7 +10456,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>GARANTEE</name>
+ <name>GUARANTEE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index 6c5411ae692c28229230f24859149f2992934710..ae9552cdc64e852d189033e6ba55f02022e3e23c 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -15,8 +15,8 @@
<stateProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/recipient/stateProcess.js</stateProcess>
</entityField>
<entityField>
- <name>GARANTEE</name>
- <title>Garantees</title>
+ <name>GUARANTEE</name>
+ <title>Guarantees</title>
<mandatoryProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/garantee/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/garantee/stateProcess.js</stateProcess>
</entityField>
@@ -148,8 +148,8 @@
<recordfield>DSGVOINFO.DSGVOINFOID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>GARANTEE.value</name>
- <recordfield>DSGVOINFO.GARANTEE</recordfield>
+ <name>GUARANTEE.value</name>
+ <recordfield>DSGVOINFO.GUARANTEE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TRANSMISSION.value</name>
diff --git a/entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js b/entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js
index 22a51f66b481a6036ba5e97aa055bb668cde174e..b75bb534bbdf293739a08430b9c06de7655ab3a2 100644
--- a/entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js
+++ b/entity/DSGVOInfo_entity/entityfields/deadline/onValueChange.js
@@ -6,6 +6,6 @@ if (vars.get("$this.value") == $KeywordRegistry.DSGVODeadline$onTime())
{
neon.setFieldValues({
"$field.RECIPIENT": "",
- "$field.GARANTEE": ""
+ "$field.GUARANTEE": ""
})
}
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js b/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js
index 5c5bf7d44a887f1117c909f9016d2d01c36ad2e1..031834e9c654cf7f3e6ddbeb9b814dc655ceb95e 100644
--- a/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js
+++ b/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js
@@ -6,6 +6,6 @@ if (vars.get("$this.value") == $KeywordRegistry.DSGVOTransmission$none())
{
neon.setFieldValues({
"$field.RECIPIENT": "",
- "$field.GARANTEE": ""
+ "$field.GUARANTEE": ""
})
}
\ No newline at end of file
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js b/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js
index 1bd107f2c167bf0e4403e5f78a4c9ab2655196a5..e8669f4fa41b190b0d2409d52bf653dfa1d2a9b3 100644
--- a/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/DSGVOInfo_entity/recordcontainers/db/onDBInsert.js
@@ -6,7 +6,7 @@ if (vars.get("$param.ReportType_param"))
datasource: vars.get("$field.DATASOURCE"),
transmission: vars.get("$field.TRANSMISSION"),
recipient: vars.get("$field.RECIPIENT"),
- garantees: vars.get("$field.GARANTEE"),
+ garantees: vars.get("$field.GUARANTEE"),
requestDate: vars.get("$field.dateRequest"),
deadline: vars.get("$field.deadline"),
deadlineDate: vars.get("$field.dateDeadline")
diff --git a/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js b/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js
index 1bd107f2c167bf0e4403e5f78a4c9ab2655196a5..e8669f4fa41b190b0d2409d52bf653dfa1d2a9b3 100644
--- a/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/DSGVOInfo_entity/recordcontainers/db/onDBUpdate.js
@@ -6,7 +6,7 @@ if (vars.get("$param.ReportType_param"))
datasource: vars.get("$field.DATASOURCE"),
transmission: vars.get("$field.TRANSMISSION"),
recipient: vars.get("$field.RECIPIENT"),
- garantees: vars.get("$field.GARANTEE"),
+ garantees: vars.get("$field.GUARANTEE"),
requestDate: vars.get("$field.dateRequest"),
deadline: vars.get("$field.deadline"),
deadlineDate: vars.get("$field.dateDeadline")
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f0aeeeaa62a4e6e85ec9acf85030061de57d33f8..1cf560ba892c45dea63a4fb92728b2e66c49ba0a 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4599,6 +4599,216 @@
<entry>
<key>Add to Bulkmail</key>
</entry>
+ <entry>
+ <key>DSGVO Information</key>
+ </entry>
+ <entry>
+ <key>Data Privacy</key>
+ </entry>
+ <entry>
+ <key>No data has been anonymized.</key>
+ </entry>
+ <entry>
+ <key>Es wurden keine Daten anonymisiert.</key>
+ </entry>
+ <entry>
+ <key>Anonymization</key>
+ </entry>
+ <entry>
+ <key>The following data has been anonymised: %0</key>
+ </entry>
+ <entry>
+ <key>Your changes have an impact on the data privacy information (DSGVO).</key>
+ </entry>
+ <entry>
+ <key>Data Privacies</key>
+ </entry>
+ <entry>
+ <key>advertising consent</key>
+ </entry>
+ <entry>
+ <key>Sonstige personenbezogene Daten</key>
+ </entry>
+ <entry>
+ <key>Names</key>
+ </entry>
+ <entry>
+ <key>Namen</key>
+ </entry>
+ <entry>
+ <key>Adressdaten</key>
+ </entry>
+ <entry>
+ <key>DSGVO anonymisation</key>
+ </entry>
+ <entry>
+ <key>newsletter dispatch</key>
+ </entry>
+ <entry>
+ <key>Folgende Daten wurden anonymisiert: </key>
+ </entry>
+ <entry>
+ <key>Address data</key>
+ </entry>
+ <entry>
+ <key>contract of sale</key>
+ </entry>
+ <entry>
+ <key>DataPrivacy Use</key>
+ </entry>
+ <entry>
+ <key>Source</key>
+ </entry>
+ <entry>
+ <key>consent</key>
+ </entry>
+ <entry>
+ <key>Information Report</key>
+ </entry>
+ <entry>
+ <key>Attribute data</key>
+ </entry>
+ <entry>
+ <key>other personal data</key>
+ </entry>
+ <entry>
+ <key>Kommunikationsdaten</key>
+ </entry>
+ <entry>
+ <key>DSGVO Anonymisierung</key>
+ </entry>
+ <entry>
+ <key>DSGVO Disclosure</key>
+ </entry>
+ <entry>
+ <key>Disclosure Report</key>
+ </entry>
+ <entry>
+ <key>Update data privacy information</key>
+ </entry>
+ <entry>
+ <key>DataPrivacy Right</key>
+ </entry>
+ <entry>
+ <key>balancing of interests</key>
+ </entry>
+ <entry>
+ <key>Personal data</key>
+ </entry>
+ <entry>
+ <key>The transfer of data to recipients located in a third country is based on the following guarantees:</key>
+ </entry>
+ <entry>
+ <key>MarketingCampaign</key>
+ </entry>
+ <entry>
+ <key>Recipient, Country</key>
+ </entry>
+ <entry>
+ <key>We save your data until </key>
+ </entry>
+ <entry>
+ <key>Guarantees</key>
+ </entry>
+ <entry>
+ <key>On time</key>
+ </entry>
+ <entry>
+ <key>Nur eigene anzeigen</key>
+ </entry>
+ <entry>
+ <key>CampaignManagement</key>
+ </entry>
+ <entry>
+ <key>For this report</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder must contain a select clause!</key>
+ </entry>
+ <entry>
+ <key>Inland</key>
+ </entry>
+ <entry>
+ <key>The data is transmitted to the following recipients:</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder must be instanciated with 'new'</key>
+ </entry>
+ <entry>
+ <key>Extension letter date</key>
+ </entry>
+ <entry>
+ <key>Balancing of interests</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder must contain a from clause!</key>
+ </entry>
+ <entry>
+ <key>None</key>
+ </entry>
+ <entry>
+ <key>Date of request</key>
+ </entry>
+ <entry>
+ <key>Export CSV</key>
+ </entry>
+ <entry>
+ <key>Not all data privacy fields for all private data is filled. Cannot create report.</key>
+ </entry>
+ <entry>
+ <key>Birthday</key>
+ </entry>
+ <entry>
+ <key>Extend - request count</key>
+ </entry>
+ <entry>
+ <key>Transmission</key>
+ </entry>
+ <entry>
+ <key>You don't have permission for this view.</key>
+ </entry>
+ <entry>
+ <key>Extend - complexity</key>
+ </entry>
+ <entry>
+ <key>Advertising consent</key>
+ </entry>
+ <entry>
+ <key>We hereby comply with your request within the statutory period of one month.</key>
+ </entry>
+ <entry>
+ <key>%0 mails sent sucessfully, %1 mails failed. Process took %2 s.</key>
+ </entry>
+ <entry>
+ <key>Foreign country</key>
+ </entry>
+ <entry>
+ <key>phase information</key>
+ </entry>
+ <entry>
+ <key>the high complexity of your application</key>
+ </entry>
+ <entry>
+ <key>As stated in our letter of %0, we have made use of the possibility to extend the deadline to three months due to %1.</key>
+ </entry>
+ <entry>
+ <key>Deadline</key>
+ </entry>
+ <entry>
+ <key>Newsletter dispatch</key>
+ </entry>
+ <entry>
+ <key>We received data from </key>
+ </entry>
+ <entry>
+ <key>the number of your applications</key>
+ </entry>
+ <entry>
+ <key>Your changes may have an impact on the data privacy information (DSGVO).\n Please update these.</key>
+ </entry>
+ <entry>
+ <key>External Datasource</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 b80c6bdd8332307e558ab6127acb06593e977404..1be0f8cc5cd2fad740ffa4c0961ac569b2222041 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -5652,6 +5652,334 @@
<key>No valid Selection</key>
<value>Keine gültige Auswahl</value>
</entry>
+ <entry>
+ <key>Support Ticket</key>
+ <value>Support Ticket</value>
+ </entry>
+ <entry>
+ <key>DSGVO Information</key>
+ <value>DSGVO Informationen</value>
+ </entry>
+ <entry>
+ <key>Remarks</key>
+ <value>Anmerkungen</value>
+ </entry>
+ <entry>
+ <key>Data Privacy</key>
+ <value>Datenschutz</value>
+ </entry>
+ <entry>
+ <key>Organisation</key>
+ <value>Organisation</value>
+ </entry>
+ <entry>
+ <key>No data has been anonymized.</key>
+ <value>Keine Daten wurden anonymisiert.</value>
+ </entry>
+ <entry>
+ <key>Anonymization</key>
+ <value>Anonymisierung</value>
+ </entry>
+ <entry>
+ <key>The following data has been anonymised: %0</key>
+ <value>Die folgenden Daten wurden anonymisiert: %0</value>
+ </entry>
+ <entry>
+ <key>Your changes have an impact on the data privacy information (DSGVO).</key>
+ <value>Ihre Änderungen haben Auswirkungen auf den Datenschutz (DSGVO).</value>
+ </entry>
+ <entry>
+ <key>Rented car</key>
+ <value>Mietwagen</value>
+ </entry>
+ <entry>
+ <key>Data Privacies</key>
+ <value>Datenprivilegien</value>
+ </entry>
+ <entry>
+ <key>advertising consent</key>
+ <value>Werbeeinwilligung</value>
+ </entry>
+ <entry>
+ <key>Update campaign step</key>
+ <value>Aktualisieren des Kampagnenschrittes</value>
+ </entry>
+ <entry>
+ <key>Names</key>
+ <value>Namen</value>
+ </entry>
+ <entry>
+ <key>Adressdaten</key>
+ <value>Adressdaten</value>
+ </entry>
+ <entry>
+ <key>No contacts selected</key>
+ <value>Keine Kontakte ausgewählt</value>
+ </entry>
+ <entry>
+ <key>DSGVO anonymisation</key>
+ <value>DSGVO Anonymisierung</value>
+ </entry>
+ <entry>
+ <key>Transport cost</key>
+ <value>Transportkosten</value>
+ </entry>
+ <entry>
+ <key>Day Fee</key>
+ <value>Tagesgebühr</value>
+ </entry>
+ <entry>
+ <key>newsletter dispatch</key>
+ <value>Newsletterversand</value>
+ </entry>
+ <entry>
+ <key>Month</key>
+ <value>Monat</value>
+ </entry>
+ <entry>
+ <key>Address data</key>
+ <value>Adressdaten</value>
+ </entry>
+ <entry>
+ <key>contract of sale</key>
+ <value>Kaufvertrag</value>
+ </entry>
+ <entry>
+ <key>My campaigns</key>
+ <value>Meine Kampagnen</value>
+ </entry>
+ <entry>
+ <key>Hospitality</key>
+ <value>Gastfreundschaft</value>
+ </entry>
+ <entry>
+ <key>DataPrivacy Use</key>
+ <value>DataPrivacy</value>
+ </entry>
+ <entry>
+ <key>Bed and Breakfast</key>
+ <value>Bett und Frühstück</value>
+ </entry>
+ <entry>
+ <key>Source</key>
+ <value>Quelle</value>
+ </entry>
+ <entry>
+ <key>Show my campaigns</key>
+ <value>Zeigen meine Kampagnen</value>
+ </entry>
+ <entry>
+ <key>consent</key>
+ <value>Zustimmung</value>
+ </entry>
+ <entry>
+ <key>Information Report</key>
+ <value>Informationsbericht</value>
+ </entry>
+ <entry>
+ <key>Attribute data</key>
+ <value>Attributdaten</value>
+ </entry>
+ <entry>
+ <key>other personal data</key>
+ <value>andere persönliche Daten</value>
+ </entry>
+ <entry>
+ <key>The contact has an advertising ban for emails!</key>
+ <value>Der Kontakt hat ein Werbeverbot für E-Mails!</value>
+ </entry>
+ <entry>
+ <key>Until</key>
+ <value>Bis</value>
+ </entry>
+ <entry>
+ <key>From</key>
+ <value>Von</value>
+ </entry>
+ <entry>
+ <key>DSGVO Disclosure</key>
+ <value>DSGVO Auskunft</value>
+ </entry>
+ <entry>
+ <key>Disclosure Report</key>
+ <value>Auskunftsbericht</value>
+ </entry>
+ <entry>
+ <key>Add to Bulkmail</key>
+ <value>Zu Massenmail hinzufügen</value>
+ </entry>
+ <entry>
+ <key>Park fees</key>
+ <value>Parkgebühren</value>
+ </entry>
+ <entry>
+ <key>Abscences</key>
+ <value>Abszenzenen</value>
+ </entry>
+ <entry>
+ <key>Expense Report</key>
+ <value>Ausgabenabrechnung</value>
+ </entry>
+ <entry>
+ <key>Update data privacy information</key>
+ <value>Datenschutzinformationen aktualisieren</value>
+ </entry>
+ <entry>
+ <key>DataPrivacy Right</key>
+ <value>Datenschutzrecht</value>
+ </entry>
+ <entry>
+ <key>balancing of interests</key>
+ <value>Interessenausgleich</value>
+ </entry>
+ <entry>
+ <key>Working material</key>
+ <value>Arbeitsmaterial</value>
+ </entry>
+ <entry>
+ <key>Trip purpose</key>
+ <value>Reisezweck</value>
+ </entry>
+ <entry>
+ <key>Personal data</key>
+ <value>Persönliche Daten</value>
+ </entry>
+ <entry>
+ <key>The transfer of data to recipients located in a third country is based on the following guarantees:</key>
+ <value>Die Übermittlung von Daten an Empfänger in einem Drittland basiert auf folgenden Garantien:</value>
+ </entry>
+ <entry>
+ <key>Recipient, Country</key>
+ <value>Empfänger, Land</value>
+ </entry>
+ <entry>
+ <key>We save your data until </key>
+ <value>Wir speichern Ihre Daten bis </value>
+ </entry>
+ <entry>
+ <key>Guarantee</key>
+ <value>Garantieen</value>
+ </entry>
+ <entry>
+ <key>On time</key>
+ <value>Pünktlich</value>
+ </entry>
+ <entry>
+ <key>For this report</key>
+ <value>Für diesen Bericht</value>
+ </entry>
+ <entry>
+ <key>SqlBuilder must contain a select clause!</key>
+ <value>SqlBuilder muss eine Select-Clause enthalten!</value>
+ </entry>
+ <entry>
+ <key>Inland</key>
+ <value>Inland</value>
+ </entry>
+ <entry>
+ <key>The data is transmitted to the following recipients:</key>
+ <value>Die Daten werden an folgende Empfänger übertragen:</value>
+ </entry>
+ <entry>
+ <key>SqlBuilder must be instanciated with 'new'</key>
+ <value>SqlBuilder muss mit 'new' instanziiert werden.</value>
+ </entry>
+ <entry>
+ <key>Balancing of interests</key>
+ <value>Interessenausgleich</value>
+ </entry>
+ <entry>
+ <key>SqlBuilder must contain a from clause!</key>
+ <value>SqlBuilder muss eine from-Clause enthalten!</value>
+ </entry>
+ <entry>
+ <key>None</key>
+ <value>Keine</value>
+ </entry>
+ <entry>
+ <key>Date of request</key>
+ <value>Datum der Anforderung</value>
+ </entry>
+ <entry>
+ <key>Export CSV</key>
+ <value>CSV exportieren</value>
+ </entry>
+ <entry>
+ <key>Not all data privacy fields for all private data is filled. Cannot create report.</key>
+ <value>Nicht alle Datenschutzfelder für alle privaten Daten werden ausgefüllt. Bericht kann nicht erstellt werden.</value>
+ </entry>
+ <entry>
+ <key>Birthday</key>
+ <value>Geburtstag</value>
+ </entry>
+ <entry>
+ <key>Extend - request count</key>
+ <value>Verlängert - Anfrageanzahl</value>
+ </entry>
+ <entry>
+ <key>Transmission</key>
+ <value>Ãœbermittlung</value>
+ </entry>
+ <entry>
+ <key>You don't have permission for this view.</key>
+ <value>Sie haben keine Berechtigung für diese Ansicht.</value>
+ </entry>
+ <entry>
+ <key>Extend - complexity</key>
+ <value>Verlängert - Komplexität</value>
+ </entry>
+ <entry>
+ <key>Advertising consent</key>
+ <value>Werbeeinwilligung</value>
+ </entry>
+ <entry>
+ <key>We hereby comply with your request within the statutory period of one month.</key>
+ <value>Wir kommen Ihrer Aufforderung hiermit innerhalb der gesetzlichen Frist von einem Monat nach.</value>
+ </entry>
+ <entry>
+ <key>%0 mails sent sucessfully, %1 mails failed. Process took %2 s.</key>
+ <value>%0 Mails erfolgreich gesendet, %1 Mails fehlgeschlagen. Der Prozess nahm %2 s. in Anspruch.</value>
+ </entry>
+ <entry>
+ <key>Foreign country</key>
+ <value>Auslandsland</value>
+ </entry>
+ <entry>
+ <key>phase information</key>
+ <value>Phaseninformationen</value>
+ </entry>
+ <entry>
+ <key>the high complexity of your application</key>
+ <value>die hohe Komplexität Ihrer Anwendung</value>
+ </entry>
+ <entry>
+ <key>As stated in our letter of %0, we have made use of the possibility to extend the deadline to three months due to %1.</key>
+ <value>Wie in unserem Schreiben von %0 erwähnt, haben wir von der Möglichkeit Gebrauch gemacht, die Frist aufgrund von %1 auf drei Monate zu verlängern.</value>
+ </entry>
+ <entry>
+ <key>Deadline</key>
+ <value>Frist</value>
+ </entry>
+ <entry>
+ <key>Newsletter dispatch</key>
+ <value>Newsletterversand</value>
+ </entry>
+ <entry>
+ <key>We received data from </key>
+ <value>Wir haben Daten erhalten von</value>
+ </entry>
+ <entry>
+ <key>the number of your applications</key>
+ <value>die Anzahl Ihrer Anwendungen</value>
+ </entry>
+ <entry>
+ <key>Your changes may have an impact on the data privacy information (DSGVO).\n Please update these.</key>
+ <value>Ihre Änderungen können sich auf die Datenschutzinformationen (DSGVO) auswirken.\n Bitte aktualisieren Sie diese.</value>
+ </entry>
+ <entry>
+ <key>External Datasource</key>
+ <value>Externe Datenquelle</value>
+ </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 5a18e05f465a75547ae8672dae17adebee31a130..3619ed230b46c568cbd235a2afb9009644ebfd8e 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -4654,18 +4654,12 @@
<entry>
<key>Update data privacy information</key>
</entry>
- <entry>
- <key>Support Ticket</key>
- </entry>
<entry>
<key>CC</key>
</entry>
<entry>
<key>Remarks</key>
</entry>
- <entry>
- <key>Xing</key>
- </entry>
<entry>
<key>Organisation</key>
</entry>
@@ -4687,24 +4681,12 @@
<entry>
<key>Overnight stay</key>
</entry>
- <entry>
- <key>LinkedIn</key>
- </entry>
<entry>
<key>In creation</key>
</entry>
<entry>
<key>Rented car</key>
</entry>
- <entry>
- <key>Update</key>
- </entry>
- <entry>
- <key>The contact has an advertising ban for emails!</key>
- </entry>
- <entry>
- <key>Blog</key>
- </entry>
<entry>
<key>Until</key>
</entry>
@@ -4762,6 +4744,120 @@
<entry>
<key>Add to Bulkmail</key>
</entry>
+ <entry>
+ <key>The transfer of data to recipients located in a third country is based on the following guarantees:</key>
+ </entry>
+ <entry>
+ <key>MarketingCampaign</key>
+ </entry>
+ <entry>
+ <key>Recipient, Country</key>
+ </entry>
+ <entry>
+ <key>We save your data until </key>
+ </entry>
+ <entry>
+ <key>Guarantees</key>
+ </entry>
+ <entry>
+ <key>On time</key>
+ </entry>
+ <entry>
+ <key>Nur eigene anzeigen</key>
+ </entry>
+ <entry>
+ <key>CampaignManagement</key>
+ </entry>
+ <entry>
+ <key>For this report</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder must contain a select clause!</key>
+ </entry>
+ <entry>
+ <key>Inland</key>
+ </entry>
+ <entry>
+ <key>The data is transmitted to the following recipients:</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder must be instanciated with 'new'</key>
+ </entry>
+ <entry>
+ <key>Extension letter date</key>
+ </entry>
+ <entry>
+ <key>Balancing of interests</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder must contain a from clause!</key>
+ </entry>
+ <entry>
+ <key>None</key>
+ </entry>
+ <entry>
+ <key>Date of request</key>
+ </entry>
+ <entry>
+ <key>Export CSV</key>
+ </entry>
+ <entry>
+ <key>Not all data privacy fields for all private data is filled. Cannot create report.</key>
+ </entry>
+ <entry>
+ <key>Birthday</key>
+ </entry>
+ <entry>
+ <key>Extend - request count</key>
+ </entry>
+ <entry>
+ <key>Transmission</key>
+ </entry>
+ <entry>
+ <key>You don't have permission for this view.</key>
+ </entry>
+ <entry>
+ <key>Extend - complexity</key>
+ </entry>
+ <entry>
+ <key>Advertising consent</key>
+ </entry>
+ <entry>
+ <key>We hereby comply with your request within the statutory period of one month.</key>
+ </entry>
+ <entry>
+ <key>%0 mails sent sucessfully, %1 mails failed. Process took %2 s.</key>
+ </entry>
+ <entry>
+ <key>Foreign country</key>
+ </entry>
+ <entry>
+ <key>phase information</key>
+ </entry>
+ <entry>
+ <key>the high complexity of your application</key>
+ </entry>
+ <entry>
+ <key>As stated in our letter of %0, we have made use of the possibility to extend the deadline to three months due to %1.</key>
+ </entry>
+ <entry>
+ <key>Deadline</key>
+ </entry>
+ <entry>
+ <key>Newsletter dispatch</key>
+ </entry>
+ <entry>
+ <key>We received data from </key>
+ </entry>
+ <entry>
+ <key>the number of your applications</key>
+ </entry>
+ <entry>
+ <key>Your changes may have an impact on the data privacy information (DSGVO).\n Please update these.</key>
+ </entry>
+ <entry>
+ <key>External Datasource</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/DSGVOInfoEdit_view/DSGVOInfoEdit_view.aod b/neonView/DSGVOInfoEdit_view/DSGVOInfoEdit_view.aod
index 2916545905abafc119c54eaa40a596137837e10e..990c3ea22a7de41dde152fc78236d03c7f606561 100644
--- a/neonView/DSGVOInfoEdit_view/DSGVOInfoEdit_view.aod
+++ b/neonView/DSGVOInfoEdit_view/DSGVOInfoEdit_view.aod
@@ -26,7 +26,7 @@
</entityFieldLink>
<entityFieldLink>
<name>75fc7de5-9204-4102-8ecf-5975b1fcbe6a</name>
- <entityField>GARANTEE</entityField>
+ <entityField>GUARANTEE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>c655e773-4d81-4d11-b014-52da00f54eba</name>
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index 8c485326b4dc18f5c55227335953ed22b1d33ca8..527b1d0c5e5b51eb90c4ef2f305246578e145e70 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -394,9 +394,13 @@ DataPrivacyUtils.checkAllFilled = function(pContactId)
{
var countNotFilled = db.cell(SqlCondition.begin()
.andPrepare("DSGVO.CONTACT_ID", pContactId)
- .and("STATUORITYSOURCE is null or PURPOSE is null or VALID_TO is null")
+ .andSqlCondition(SqlCondition.begin()
+ .or("STATUORITYSOURCE is null")
+ .or("PURPOSE is null")
+ .or("VALID_TO is null"))
.buildSql("select count(*) from DSGVO", "1=2"))
- return countNotFilled == 0;
+
+ return countNotFilled == "0";
}
DataPrivacyUtils.openReport = function(pContactId, pReportName, pDSGVOInfo, pLocale)