diff --git a/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js b/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js index b7a1299898ad76e88e886b8e3b64dff067d125b3..93eba9d8b97d65649f4be9e3407c9dbb3544d914 100644 --- a/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js +++ b/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js @@ -1,4 +1,3 @@ -import("system.logging"); import("Sql_lib"); import("DocumentTemplate_lib"); import("system.result"); @@ -32,13 +31,6 @@ var contactIds = []; if (vars.get("$param.CopyBulkMailId_param")) { - logging.log(JSON.stringify(["COPY: ", - "BulkMailRecipient_entity", - "BulkMailRecipients", - ["BulkMailId_param", vars.get("$param.CopyBulkMailId_param")], - ["#UID"] - -], null, "\t")) var config = entities.createConfigForLoadingRows() .entity("BulkMailRecipient_entity") .provider("BulkMailRecipients") @@ -46,7 +38,6 @@ if (vars.get("$param.CopyBulkMailId_param")) .fields(["CONTACT_ID"]); var copiedRecipients = entities.getRows(config); - logging.log(JSON.stringify([copiedRecipients], null, "\t")) contactIds = copiedRecipients.map(function(pRecipient) { @@ -57,7 +48,5 @@ if (vars.get("$param.CopyBulkMailId_param")) if (vars.getString("$param.PresetRecipients_param")) contactIds = contactIds.concat(JSON.parse(vars.getString("$param.PresetRecipients_param"))); -logging.log(JSON.stringify([contactIds], null, "\t")) - if (contactIds && contactIds.length > 0) BulkMailUtils.addRecipients(bulkMailId, BulkMailUtils.filterNewRecipients(bulkMailId, contactIds)); \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 3e689d4945a71ab85d47afe6ad271095dbf28551..80001d629e8fec2952a15578cc189915de487cee 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -5094,6 +5094,12 @@ <entry> <key>My Forecast</key> </entry> + <entry> + <key>Copy bulkmail</key> + </entry> + <entry> + <key>Count template attachments</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 cf892149e0922ad8a88593368a6206f9db924a95..bf7d5dc4e4a9e234f05889d73bebd79cab9c3e98 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -6438,6 +6438,13 @@ <key>Use template attachments</key> <value>Verwende Vorlagenanhänge</value> </entry> + <entry> + <key>Copy bulkmail</key> + <value>Kopiere Serienmail</value> + </entry> + <entry> + <key>Count template attachments</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 776de7d7038be70536eaad0628d4a0932134967a..3d160bb9cbebb9a00829a5be3cccad49f1a63522 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -5138,6 +5138,18 @@ <entry> <key>Use template attachments</key> </entry> + <entry> + <key>My Turnover</key> + </entry> + <entry> + <key>My Forecast</key> + </entry> + <entry> + <key>Copy bulkmail</key> + </entry> + <entry> + <key>Count template attachments</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js index 2d4dce1f8cae34bb7a310c6fd079ac303e700512..591431ebb6878910352b2f7705681f91dfee9277 100644 --- a/process/Bulkmail_lib/process.js +++ b/process/Bulkmail_lib/process.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.translate"); import("ActivityTask_lib"); import("system.util"); @@ -219,7 +218,6 @@ BulkMailUtils.addRecipients = function (pBulkMailId, pContactIds) */ BulkMailUtils.getBulkMailTemplate = function (pBulkMailId, pDocumentTemplateId, pResolveSubtemplates, pUseTemplateAttachments) { - logging.log(JSON.stringify([pBulkMailId, pDocumentTemplateId, pResolveSubtemplates, pUseTemplateAttachments], null, "\t")) var bulkTemplate = DocumentTemplate.loadTemplate(pBulkMailId, "BULKMAIL", pResolveSubtemplates); var documentTemplate = DocumentTemplate.loadTemplate(pDocumentTemplateId, undefined, pResolveSubtemplates);