Skip to content
Snippets Groups Projects
Commit 3daf01de authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

Merge branch '2021.1.1' into '2021.1'

2021.1.1

See merge request xrm/basic!1128
parents 11633229 5d1a5b20
No related branches found
No related tags found
No related merge requests found
......@@ -19,8 +19,8 @@ var res = {
"contactIdField":"OBJECT_ROWID"
},
"Advertising": {},
"Bulkmail": {
"subContext":"BulkmailRecipient",
"BulkMail": {
"subContext":"BulkMailRecipient",
"childField":"BULKMAIL_ID",
"parentField":"BULKMAILID",
"contactIdField":"CONTACT_ID"
......
......@@ -29,8 +29,8 @@ var res = {
"Advertising": {
"contactIdField":"CONTACT_ID"
},
"Bulkmail": {
"subContext":"BulkmailRecipient",
"BulkMail": {
"subContext":"BulkMailRecipient",
"childField":"BULKMAIL_ID",
"parentField":"BULKMAILID",
"contactIdField":"CONTACT_ID"
......
......@@ -11610,7 +11610,7 @@ Bitte Datumseingabe prüfen</value>
<value>Gebiet: Nummer</value>
</entry>
<entry>
<key>Bulkmail</key>
<key>BulkMail</key>
<value>Serienmail</value>
</entry>
<entry>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment