diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 74b45b0ba684f198d4f6897975a03b1b056ff32b..4e5c98f9dece6d09e3bc547dc137db746490724b 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -346,6 +346,41 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityConsumer>
+ <name>SpecificFilterAttributes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificFilterAttributes</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AttributeCount_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/attributecount_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>FilterProvider</name>
+ <dependencies>
+ <entityDependency>
+ <name>0560c6d0-8473-4050-9ca1-a935bbac2ef9</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>AttributesFilter</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/filterprovider/children/displaysimplename_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/AttributeRelation_entity/entityfields/filterprovider/children/displaysimplename_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/filterprovider/children/displaysimplename_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0f3ec47e2b963a577204e41d9847dd6ad0725a8
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/filterprovider/children/displaysimplename_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(false);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/attributecount_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/attributecount_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c0bc231731f77eee827bad7693c8ce56d7d45d8
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/attributecount_param/valueProcess.js
@@ -0,0 +1,8 @@
+import("Attribute_lib");
+import("system.result");
+import("system.vars");
+
+var objectType = vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param");
+var rowId = vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param");
+if (vars.get("$param.GetTree_param") == "true" && rowId)
+ result.object(AttributeRelationUtils.countAttributeRelations(rowId, objectType));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/objecttype_param/valueProcess.js b/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5c2ba1e99bd66da1cbc065319b7644302880879f
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/specificfilterattributes/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.exists("$param.ObjectType_param") ? vars.get("$param.ObjectType_param") : "");
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 6f00c57a63fb54566d003715a274b58dcc3ffbc0..26e2e934e598ad4d50c640da866a5cd4b452b3f2 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -485,6 +485,27 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityProvider>
+ <name>SpecificFilterAttributes</name>
+ <dependencies>
+ <entityDependency>
+ <name>9b2b5f2e-229d-4a10-a54f-cbf77aafe512</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>SpecificFilterAttributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/specificfilterattributes/children/displaysimplename_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ChildType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Attribute_entity/entityfields/specificfilterattributes/children/displaysimplename_param/valueProcess.js b/entity/Attribute_entity/entityfields/specificfilterattributes/children/displaysimplename_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0f3ec47e2b963a577204e41d9847dd6ad0725a8
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/specificfilterattributes/children/displaysimplename_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(false);
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index b57569f1d2a480a25ab25d612b399dc1e3b98ca0..4d5db6ed1a8789383791d9793b7c5791ae8f30a6 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1074,6 +1074,7 @@
</entityActionGroup>
<entityField>
<name>STANDARD_COUNTRY</name>
+ <title>Standard Country</title>
<groupable v="true" />
</entityField>
<entityParameter>
@@ -1139,10 +1140,12 @@
</entityField>
<entityField>
<name>STANDARD_ZIP</name>
+ <title>Standard Zip</title>
<groupable v="true" />
</entityField>
<entityField>
<name>STANDARD_CITY</name>
+ <title>Standard City</title>
<groupable v="true" />
</entityField>
<entityField>
@@ -1397,6 +1400,24 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityConsumer>
+ <name>AttributesFilter</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>FilterProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributesfilter/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/attributesfilter/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/attributesfilter/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/attributesfilter/children/objectrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..59af8506d7c8ff241823ba185c646366667521c0
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/attributesfilter/children/objectrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));//TODO: CONTACTID/ORGANISATIONID: review if this should be the CONTACTID or the ORGANISATIONID
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/attributesfilter/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/attributesfilter/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..59af8506d7c8ff241823ba185c646366667521c0
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/attributesfilter/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));//TODO: CONTACTID/ORGANISATIONID: review if this should be the CONTACTID or the ORGANISATIONID
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 2853fb597879f3ed452efdb45a7998fc36e0f0cd..bee7fd6513ec22226a7dec19b5ee03fd0a3c2cdf 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7284,6 +7284,15 @@
<entry>
<key>Probability in %</key>
</entry>
+ <entry>
+ <key>Standard City</key>
+ </entry>
+ <entry>
+ <key>Standard Country</key>
+ </entry>
+ <entry>
+ <key>Standard Zip</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 f2aba5d40f04df4be587f4dc4b73a2c1f7ceb8d8..04d7a48207285eab7fad8f9aae2cbbb541856022 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9662,6 +9662,18 @@ Bitte Datumseingabe prüfen</value>
<key>Probability in %</key>
<value>Wahrscheinlichkeit in %</value>
</entry>
+ <entry>
+ <key>Standard City</key>
+ <value>Standardstadt</value>
+ </entry>
+ <entry>
+ <key>Standard Country</key>
+ <value>Standartland</value>
+ </entry>
+ <entry>
+ <key>Standard Zip</key>
+ <value>Standart Plz</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 b09cc03cdef4fcb4fc80771342b5320e6b3c4172..8c0cd36df48ff5a70223a232937e8d497ab5c797 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7365,6 +7365,15 @@
<entry>
<key>Probability in %</key>
</entry>
+ <entry>
+ <key>Standard City</key>
+ </entry>
+ <entry>
+ <key>Standard Country</key>
+ </entry>
+ <entry>
+ <key>Standard Zip</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index e67a69bc2dba3cec08b1a22095ef42899a33709f..d64df9664bf2c4ac8519540ede2e36266b2d5323 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -89,7 +89,7 @@ AttributeFilterExtensionMaker.getFilterFields = function(pObjectType)
var res = [];
var loadingConfig = entities.createConfigForLoadingRows().entity("Attribute_entity")
- .provider("SpecificAttribute")
+ .provider("SpecificFilterAttributes")
.fields(["UID", "FULL_ATTRIBUTE_NAME", "ATTRIBUTE_TYPE"])
.addParameter("ObjectType_param", pObjectType);