Bugfixes SqlBuilder usage

entity/BulkMailRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js

@@ -13,7 +13,7 @@ var recipientIds = db.array(db.COLUMN, SqlBuilder.begin()
     .whereIfSet("BULKMAILRECIPIENT.BULKMAIL_ID", "$param.BulkMailId_param")
     .build());
 
-newWhere("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", recipientIds, SqlBuilder.IN())
+newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", recipientIds, SqlBuilder.IN())
     .deleteData(true, "BULKMAILRECIPIENT")
 
 neon.refreshAll();
\ No newline at end of file

entity/LetterRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/onActionProcess.js

@@ -10,7 +10,7 @@ var recipientIds = SqlBuilder.begin()
     .join("CONTACT", 
         newWhere("LETTERRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
         .and(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$letter())))
-    .andIfSet("LETTERRECIPIENT.SERIALLETTER_ID", "$param.SerialLetterId_param")
+    .whereIfSet("LETTERRECIPIENT.SERIALLETTER_ID", "$param.SerialLetterId_param")
     .array(db.COLUMN);
 
 if (recipientIds.length)

process/Bulkmail_lib/process.js

@@ -246,7 +246,7 @@ BulkMailUtils.isRecipient = function (pBulkMailId, pContactId, pRecipientId)
 {
     return newSelect("count(*)")
                 .from("BULKMAILRECIPIENT")
-                .and("BULKMAILRECIPIENT.CONTACT_ID", pContactId)
+                .where("BULKMAILRECIPIENT.CONTACT_ID", pContactId)
                 .and("BULKMAILRECIPIENT.BULKMAIL_ID", pBulkMailId)
                 .andIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", pRecipientId, "# != ?")
                 .cell() != "0"; //TODO: is there a way exists could be used?
@@ -277,7 +277,7 @@ BulkMailUtils.filterNewRecipients = function (pBulkMailId, pContactIds)
 {
     return newSelect("CONTACTID")
                 .from("CONTACT")
-                .whereInIfSet("CONTACT.CONTACTID", pContactIds, SqlBuilder.IN())
+                .whereIfSet("CONTACT.CONTACTID", pContactIds, SqlBuilder.IN())
                 // only add contacts that aren't already recipients
                 .and(null, newSelect("BULKMAILRECIPIENTID")
                                 .from("BULKMAILRECIPIENT")
@@ -406,9 +406,9 @@ SerialLetterUtils.buildSerialLetter = function (pSerialLetterId, pRecipientIds)
  */
 SerialLetterUtils.isRecipient = function (pSerialLetterId, pContactId, pRecipientId)
 {
-    return newSelct("count(*)")
+    return newSelect("count(*)")
                 .from("LETTERRECIPIENT")
-                .and("LETTERRECIPIENT.CONTACT_ID", pContactId)
+                .where("LETTERRECIPIENT.CONTACT_ID", pContactId)
                 .and("LETTERRECIPIENT.SERIALLETTER_ID", pSerialLetterId)
                 .andIfSet("LETTERRECIPIENT.LETTERRECIPIENTID", pRecipientId, "# != ?")
                 .cell() != "0"; // TODO: is there a way exists could be used?

process/Salesproject_lib/process.js

@@ -57,7 +57,7 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
                     .cell();       
         
         newWhere("SALESPROJECT_MILESTONE.SALESPROJECT_ID", salesprojectId)
-            .andPrepare("SALESPROJECT_MILESTONE.KIND", type)
+            .and("SALESPROJECT_MILESTONE.KIND", type)
             .and("SALESPROJECT_MILESTONE.DATE_END is null")
             .updateData(true, ["DATE_END"], null, [vars.get("$sys.date")], "SALESPROJECT_MILESTONE");
         

process/Turnover_lib/process.js

@@ -42,7 +42,7 @@ TurnoverUtil.getTurnoverData = function (pMaxYear, pYearCount, pSalesprojectId)
                     .and("SALESORDER.SALESORDERDATE", minYear, "year(#) >= ?", SQLTYPES.INTEGER)
                     .andIfSet("SALESORDER.SALESPROJECT_ID", pSalesprojectId)
                     .groupBy("year(SALESORDERDATE), month(SALESORDERDATE), SALESORDERITEM.GROUPCODEID, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE")
-                    .orderBy("by yearNum, monthNum")
+                    .orderBy("yearNum, monthNum")
                     .table();
 }
 

process/buildSerialLetter_serverProcess/process.js

@@ -13,7 +13,7 @@ var recipientIds = JSON.parse(vars.get("$local.recipientIds"));
 
 var templateId = newSelect("DOCUMENTTEMPLATE_ID")
                     .from("SERIALLETTER")
-                    .and("SERIALLETTER.SERIALLETTERID", letterId)
+                    .where("SERIALLETTER.SERIALLETTERID", letterId)
                     .cell(true);
 
 var template = SerialLetterUtils.getSerialLetterTemplate(letterId, templateId);