diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 252f4f9d7679caa955f9d10b9c2607036cef6ef8..50c3cf2b3506ba026a6b09e245caf67fef07d176 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -5133,6 +5133,9 @@ <entry> <key>Either or both a contact and a company must be specified</key> </entry> + <entry> + <key>Attribute groups can't be selected</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 d834509c11a40ffde29002657ce349d5c4fc5851..77be6535b8af9354a1c7cadbfee6ab0f2d570abb 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -6445,6 +6445,7 @@ </entry> <entry> <key>${CONTRACT_STATUS}</key> + <value>Vertragsstatus</value> </entry> <entry> <key>Time in minutes</key> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 3a8d684a03bd628054756d11bd42d184e89cabc1..135724535ae50441d2ef279762383c065e05f0e3 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -5183,6 +5183,9 @@ <entry> <key>Either or both a contact and a company must be specified</key> </entry> + <entry> + <key>Attribute groups can't be selected</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js index 0ee28b832aa50302df49fc97851e8f186c3c4d1a..78498993cd51d6210fef007ecc08ce7d31000eab 100644 --- a/process/Attribute_lib/process.js +++ b/process/Attribute_lib/process.js @@ -632,8 +632,8 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p var minMaxCountsSelect = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_NAME, MIN_COUNT, MAX_COUNT") .from("AB_ATTRIBUTEUSAGE") .join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID") - .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", possibleAttributes, SqlBuilder.IN()) - .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType) + .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", possibleAttributes, SqlBuilder.IN()) + .and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType) //retrieve all min/max counts of the possible attributes minMaxCounts = minMaxCountsSelect.table();