diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 0418326a5360e0760bc3aee6657ad77b09b85c0b..afff33cc579f2a7096989c674bfa06cb7c97ba2a 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -94,8 +94,8 @@
<name>STRENGTH</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -108,8 +108,8 @@
<name>WEAKNESS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -122,8 +122,8 @@
<name>PRICE_POLITICS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -491,8 +491,8 @@
<name>ADDR_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -673,8 +673,8 @@
<name>MEDIUM_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -1109,7 +1109,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title></title>
<description></description>
<dependencies>
@@ -1142,7 +1142,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title></title>
<description></description>
<dependencies>
@@ -1695,8 +1695,8 @@
<name>PROBABILITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -1904,7 +1904,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title></title>
<description></description>
</entityFieldDb>
@@ -2088,8 +2088,8 @@
<name>PHASE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -2167,8 +2167,8 @@
<name>STATE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -2444,20 +2444,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>CONTACT_ID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>INFO</name>
<dbName></dbName>
@@ -2523,8 +2509,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -2621,8 +2607,8 @@
<name>PHASE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3019,8 +3005,8 @@
<name>CATEGORY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3300,6 +3286,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>OFFER_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -3384,7 +3384,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -3552,8 +3552,8 @@
<name>PRIORITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3833,20 +3833,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>RELATION_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4198,6 +4184,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>MEMO_VALUE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index b5987e3db77722f37ac0b5c57a368219d326ba0a..f0024a83bf8b842a582d39049682a1086d667fec 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -21,7 +21,6 @@
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
<mandatory v="true" />
- <groupable v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -329,6 +328,12 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>ENTRYDAY</name>
+ <title>Entrydate (Day)</title>
+ <groupable v="true" />
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entryday/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Activity_entity/entityfields/entrydate/valueProcess.js b/entity/Activity_entity/entityfields/entrydate/valueProcess.js
index 3a0d59096cd2de39b6098f1ed95af580dcebfce0..651bbe1ba274ee0bea9f70ef309afe11a883b175 100644
--- a/entity/Activity_entity/entityfields/entrydate/valueProcess.js
+++ b/entity/Activity_entity/entityfields/entrydate/valueProcess.js
@@ -1,6 +1,7 @@
+import("system.datetime");
import("system.vars");
import("system.result");
import("system.neon");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.getString("$this.value"))
+ result.string(datetime.date());
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/entryday/valueProcess.js b/entity/Activity_entity/entityfields/entryday/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5449ca198e2c3d9b4e8cdd2828a84b45acd1784
--- /dev/null
+++ b/entity/Activity_entity/entityfields/entryday/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.datetime");
+import("system.result");
+import("system.vars");
+
+var entryDate = vars.get("$field.ENTRYDATE");
+result.string(datetime.toDate(entryDate, "dd MMMM yyyy"));
\ No newline at end of file
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 404193668657a52c874035b82c351e95ce13806b..632ee34458f5cc6325c62d80d9c0280744897ec9 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -17,13 +17,16 @@
<entityField>
<name>CLASSIFICATION</name>
<possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/classification/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>BEGIN</name>
<selectionMode>SINGLE</selectionMode>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>END</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
</entityField>
<entityFieldGroup>
<name>STARTEND</name>
@@ -43,9 +46,11 @@
</entityField>
<entityField>
<name>REMINDER_CHECK</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>REMINDER</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/reminder/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>CATEGORIES</name>
@@ -57,6 +62,7 @@
</entityField>
<entityField>
<name>TRANSPARENCY</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/transparency/valueProcess.js</valueProcess>
</entityField>
<entityActionGroup>
<name>PartStatActionGroup</name>
@@ -100,9 +106,11 @@
</entityField>
<entityField>
<name>RRULE</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/rrule/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>RECURRENCEID</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SAFESCOPEFIELD</name>
diff --git a/entity/Appointment_entity/entityfields/begin/valueProcess.js b/entity/Appointment_entity/entityfields/begin/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ec0da52b21a9bb3169b5447365dda3006449bfb
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.DTSTART])
+ result.string(event[calendars.DTSTART]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/classification/valueProcess.js b/entity/Appointment_entity/entityfields/classification/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a4056b88346388dc049b7dbcf191192c0ce66b57
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/classification/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.CLASSIFICATION])
+ result.string(event[calendars.CLASSIFICATION]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/end/valueProcess.js b/entity/Appointment_entity/entityfields/end/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ed796fe837b42f4eec0696316a9f20e6654a7eb
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/end/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.DTEND])
+ result.string(event[calendars.DTEND]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js b/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4a9bbcc8f22e6c3c92abf23eddda3cdf7ddbebc6
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/recurrenceid/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.RECURRENCEID])
+ result.string(event[calendars.RECURRENCEID]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/reminder/valueProcess.js b/entity/Appointment_entity/entityfields/reminder/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b2b5966bb17617eefdd962c7b56942bba6f2173d
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/reminder/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.REMINDER_DURATION])
+ result.string(event[calendars.REMINDER_DURATION]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js b/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0929f447e7a9425bc6aee2645697c4e8da534282
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/reminder_check/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.HASREMINDER])
+ result.string(event[calendars.HASREMINDER]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/rrule/valueProcess.js b/entity/Appointment_entity/entityfields/rrule/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..560cffd4c2c2ce0f57494440835a19fa80eb7e91
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/rrule/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.RRULE])
+ result.string(event[calendars.RRULE]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/summary/valueProcess.js b/entity/Appointment_entity/entityfields/summary/valueProcess.js
index d3f5a12faa99758192ecc4ed3fc22c9249232e86..432475ace31148f4466c021837b49896e0a6fc45 100644
--- a/entity/Appointment_entity/entityfields/summary/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/summary/valueProcess.js
@@ -1 +1,15 @@
-
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.SUMMARY])
+ result.string(event[calendars.SUMMARY]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/transparency/valueProcess.js b/entity/Appointment_entity/entityfields/transparency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..774f704312ccb614d774153b95e867a49ac1b952
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/transparency/valueProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(event[calendars.TRANSPARENCY])
+ result.string(event[calendars.TRANSPARENCY]);
+}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 141186a60779045074c338ee4c6b907d5fed11ee..b585ba84eb837f511a4ad2d5bc57a7635328092d 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -16,9 +16,10 @@
<entityField>
<name>AB_ATTRIBUTE_ID</name>
<title>Attribute</title>
+ <consumer>SpecificAttribute</consumer>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
+ <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
@@ -69,6 +70,24 @@
<fieldName>Attributes</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>21de4424-d5e2-4c19-a5e1-1f59dbc186b3</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>5bcda86a-e56c-4a4a-ac13-c6eb68152200</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a9b81050-e7f8-408d-aa73-e2709188e121</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -134,6 +153,37 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>MEMO_VALUE</name>
+ </entityField>
+ <entityParameter>
+ <name>filteredAttributeIds_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>SpecificAttribute</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>objectType_param</name>
+ <code>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/code.js</code>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>filteredAttributeIds_param</name>
+ <code>%aditoprj%/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/code.js</code>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -198,6 +248,10 @@
<name>ATTRIBUTE_PARENT_ID.value</name>
<recordfield>AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MEMO_VALUE.value</name>
+ <recordfield>AB_ATTRIBUTERELATION.MEMO_VALUE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..601eb01de38092b0173fa46c4a762f98a38fb53e
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTE_ID")));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
index e641c892888d2ee12cdbf69f722f489e30af0f93..9347efa6c0caed251cd27fdabf8e94710302e365 100644
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/onValueChange.js
@@ -8,4 +8,5 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
neon.setFieldValue("$field.DATE_VALUE", null);
neon.setFieldValue("$field.ID_VALUE", null);
neon.setFieldValue("$field.NUMBER_VALUE", null);
+ neon.setFieldValue("$field.MEMO_VALUE", null);
}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js
deleted file mode 100644
index 2449074c9672b85ce7ddec1e78cfce6710a1e7fb..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/ab_attribute_id/possibleItemsProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param")));
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
index 02b623bee27c07fcd8fe0235160a4d63845b0de1..f1d1025828f4a7c554dd525a6f8ed38fc3551b2f 100644
--- a/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
@@ -3,36 +3,19 @@ import("system.result");
import("system.vars");
import("Attribute_lib");
+"$field.CHAR_VALUE";
+"$field.DATE_VALUE";
+"$field.NUMBER_VALUE";
+"$field.BOOL_VALUE";
+"$field.ID_VALUE";
+"$field.MEMO_VALUE";
+
if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
{
- var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeField();
+ var attrField = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeField();
var value = null;
- if (attrType != null) //load the value from the correct field for the type
- {
- switch (attrType)
- {
- case $AttributeTypes.TEXT.toString():
- value = vars.get("$field.CHAR_VALUE");
- break;
- case $AttributeTypes.DATE.toString():
- value = vars.get("$field.DATE_VALUE");
- break;
- case $AttributeTypes.NUMBER.toString():
- value = vars.get("$field.NUMBER_VALUE");
- break;
- case $AttributeTypes.BOOLEAN.toString():
- value = vars.get("$field.BOOL_VALUE");
- break;
- case $AttributeTypes.COMBO.toString():
- case $AttributeTypes.KEYWORD.toString():
- value = vars.get("$field.ID_VALUE");
- break;
- }
- }
- //var attrField = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeField();
- //var value = null;
- //if (attrField != null) //load the value from the correct field for the type
- // value = vars.get("$field." + attrField);
+ if (attrField != null) //load the value from the correct field for the type
+ value = vars.get("$field." + attrField);
if(value != null && value != "")
result.string(value);
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/code.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..7118851fb94840ce5cb2367b00b03809805e06e4
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/specificattribute/children/filteredattributeids_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.exists("$param.filteredAttributeIds_param") ? vars.get("$param.filteredAttributeIds_param") : "");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/code.js b/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..a86482ebe94e42a23bf7f73de26b8814820865d8
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/specificattribute/children/objecttype_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.exists("$param.objectType_param") ? vars.get("$param.objectType_param") : "");
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
index f83ae05abaf417c8b8502955eb3a6af39a9d4f89..f48af1586cd6331e94c372f69656df270f40b9e5 100644
--- a/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/db/conditionProcess.js
@@ -1,14 +1,23 @@
-import("system.db");
-import("system.vars");
-import("system.result");
-import("Sql_lib");
-
-if (vars.exists("$param.objectRowId_param") && vars.get("$param.objectRowId_param") != null)
-{
- cond = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", vars.get("$param.objectRowId_param"))
- .build();
- result.string(db.translateCondition(cond));
-}
-else
- result.string("1 = 2");
\ No newline at end of file
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+
+
+var cond = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTERELATION.OBJECT_ROWID", "$param.objectRowId_param");
+
+if (vars.exists("$param.filteredAttributeIds_param") && vars.get("$param.filteredAttributeIds_param"))
+{
+ var filteredIds = JSON.parse(vars.get("$param.filteredAttributeIds_param"));
+ var filteredIdsCondition = new SqlCondition();
+
+ filteredIds.forEach(function(id)
+ {
+ this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", id);
+ }, filteredIdsCondition);
+
+ cond.andSqlCondition(filteredIdsCondition);
+}
+result.string(db.translateCondition(cond.build("1=2")));
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 6126cfac10b5286f8342b04f53b8172fb738b2f8..5bfa6074a61696279c275fb486a20291b69144ea 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -29,11 +29,12 @@
</entityField>
<entityField>
<name>AB_ATTRIBUTEID</name>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/ab_attributeid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ATTRIBUTE_PARENT_ID</name>
- <title>Parent Attribute</title>
+ <title>Superordinate Attribute</title>
<consumer>AttributeChildren</consumer>
<linkedContext>Attribute</linkedContext>
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
@@ -56,6 +57,11 @@
<triggerRecalculation v="true" />
<mandatory v="false" />
</entityParameter>
+ <entityParameter>
+ <name>attrParentType_param</name>
+ <code>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
</children>
</entityConsumer>
<entityProvider>
@@ -128,12 +134,6 @@
<state>INVISIBLE</state>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js</valueProcess>
</entityField>
- <entityActionField>
- <name>test</name>
- <fieldType>ACTION</fieldType>
- <title>test</title>
- <onActionProcess>%aditoprj%/entity/Attribute_entity/entityfields/test/onActionProcess.js</onActionProcess>
- </entityActionField>
<entityField>
<name>KEYWORD_CONTAINER</name>
<title>Keyword</title>
@@ -141,6 +141,48 @@
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js</stateProcess>
</entityField>
+ <entityParameter>
+ <name>attrParentType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>objectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>SpecificAttribute</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <lookupIdfield>AB_ATTRIBUTEID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>342e8ba6-db61-411b-9f79-e9271335b00f</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>objectType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>filteredAttributeIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>FULL_ATTRIBUTE_NAME</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>filteredAttributeIds_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js b/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
index bb5f44d124ef66e4da13d4e661679b6e1b003a11..e55588aa4fb9dea4ee26b065951ab47b1ad43256 100644
--- a/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
@@ -1,5 +1,4 @@
import("system.vars");
import("system.result");
-import("Attribute_lib");
-result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTEID")));
+result.string(vars.get("$field.FULL_ATTRIBUTE_NAME"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js b/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js
index b63cf032dd51caa4b6896e89b5bdaafcf4d01a07..b0b8a8a60f836bf10861191025d415dcd27122b8 100644
--- a/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js
@@ -1,9 +1,4 @@
import("system.vars");
import("system.result");
-import("Attribute_lib");
-var type = vars.getString("$field.ATTRIBUTE_TYPE").trim();
-if (type == $AttributeTypes.GROUP || type == $AttributeTypes.COMBO)
- result.string(vars.getString("$field.AB_ATTRIBUTEID"));
-else
- result.string("");
+result.string(vars.getString("$field.AB_ATTRIBUTEID"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/code.js b/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..02325c0aed817d64f9952c77b405e83bece3c758
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/attrparenttype_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.getString("$field.ATTRIBUTE_TYPE").trim());
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js b/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..40820d463337ab8ae4c656ed49bc07256a59c571
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTEID")));
diff --git a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
index 42c609201e61f3a4cf3974964f6f929a2881e7cd..beaaa08c35beeb077df7f67ebf1671858d2daf15 100644
--- a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
@@ -9,4 +9,5 @@ if (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.KEYWORD)
else
fieldState = neon.COMPONENTSTATE_INVISIBLE;
+//TODO result the correct state here when updating the state is possible
result.string(neon.COMPONENTSTATE_AUTO);//result.string(fieldState);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/test/onActionProcess.js b/entity/Attribute_entity/entityfields/test/onActionProcess.js
deleted file mode 100644
index 2fcdd32dea2394891771151026565786fde2ba68..0000000000000000000000000000000000000000
--- a/entity/Attribute_entity/entityfields/test/onActionProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.logging");
-import("Attribute_lib");
-logging.log(AttributeRelationUtils.getSqlUtil().toSource());
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
index bdd0ea7449ed0bd35470a8ac8dffb388034951c6..3ed5587eb64e97091d33e3297dc1eb785b7d0c6a 100644
--- a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
@@ -4,11 +4,37 @@ import("system.result");
import("Sql_lib");
import("Attribute_lib");
-var condition = "AB_ATTRIBUTE.ATTRIBUTE_TYPE = '" + $AttributeTypes.GROUP + "'";
+var condition = "1 = 2";
-if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
- condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
-else if (vars.get("$param.attrParentId_param") !== "")
- condition = "";
+var objectType = vars.exists("$param.objectType_param") && vars.get("$param.objectType_param");
+if (objectType) //if there's an objectType, it comes from the AttributeRelation entity
+{
+ var filteredAttributes = [];
+ if (vars.exists("$param.filteredAttributeIds_param") && vars.get("$param.filteredAttributeIds_param"))
+ filteredAttributes = JSON.parse(vars.get("$param.filteredAttributeIds_param"));
+
+ var ids = AttributeUtil.getPossibleAttributes(objectType, false, filteredAttributes);
+ condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + ids.join("','") + "')";
+}
+else
+{
+ var type = vars.exists("$param.attrParentType_param") && vars.get("$param.attrParentType_param");
+ if (type != $AttributeTypes.COMBOVALUE)
+ condition = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP)
+ .build();
+
+ if (type == $AttributeTypes.COMBO)
+ condition = SqlCondition.begin()
+ .andPrepareVars("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", "$param.attrParentId_param")
+ .build();
+
+ var parentId = vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param");
+ if (parentId)
+ condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
+ else if (!type)
+ condition = "";
+
+}
result.string(condition);
diff --git a/entity/Attribute_entity/titleProcess.js b/entity/Attribute_entity/titleProcess.js
index bbb15f2a7f35c157449854b9c7fbeecd7550756d..e55588aa4fb9dea4ee26b065951ab47b1ad43256 100644
--- a/entity/Attribute_entity/titleProcess.js
+++ b/entity/Attribute_entity/titleProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.ATTRIBUTE_NAME"));
\ No newline at end of file
+result.string(vars.get("$field.FULL_ATTRIBUTE_NAME"));
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 4dc0032ecf2a58040f2c365dd8a4ee43a8e3d842..366d5e798f081f072d9940cf4f628a1ee1e05100 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -71,9 +71,10 @@
<name>CONTACT_ID</name>
<documentation>%aditoprj%/entity/Contract_entity/entityfields/contact_id/documentation.adoc</documentation>
<title>Connection</title>
- <consumer>Relations</consumer>
+ <consumer>AnyContacts</consumer>
<linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -269,6 +270,29 @@
<onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
+ <entityConsumer>
+ <name>Attributes</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>objectType_param</name>
+ <code>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objecttype_param/code.js</code>
+ <expose v="false" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>objectRowId_param</name>
+ <code>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/code.js b/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a986948950be876fd394dc2b62dcf465308140a
--- /dev/null
+++ b/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTRACTID"));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/attributes/children/objecttype_param/code.js b/entity/Contract_entity/entityfields/attributes/children/objecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Contract_entity/entityfields/attributes/children/objecttype_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contact_id/valueProcess.js b/entity/Contract_entity/entityfields/contact_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1127220726ee436e1f878c4467fa29d976d6af80
--- /dev/null
+++ b/entity/Contract_entity/entityfields/contact_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.ContactId_param"))
+{
+ result.string(vars.get("$param.ContactId_param"));
+}
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js b/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
index f17d453fcdc0a4cdd0830eac47ba7d7db0fea3db..8c1535d18c3a1b71fae6cd2c37224a17f9016ba4 100644
--- a/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
+++ b/entity/Contract_entity/entityfields/contractstates/children/containername_param/code.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.contractPayment());
\ No newline at end of file
+result.string($KeywordRegistry.contractStatus());
\ No newline at end of file
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index eed8b7c29535303c3807c7a53a8e4487d4f84271..105481d336111a3f1f0ede9f9a95a38591c92d37 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -56,42 +56,52 @@
<entityField>
<name>ISO2</name>
<title>ISO 3166-1 alpha-2</title>
+ <searchable v="false" />
</entityField>
<entityField>
<name>ISO3</name>
<title>ISO 3166-1 alpha-3</title>
+ <searchable v="false" />
</entityField>
<entityField>
<name>ADDR_FORMAT</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>ZIP_REGEX</name>
<documentation>%aditoprj%/entity/Countries_Entity/entityfields/zip_regex/documentation.adoc</documentation>
+ <searchable v="false" />
</entityField>
<entityField>
<name>NAME</name>
+ <searchable v="true" />
</entityField>
<entityField>
<name>REQUIRED_FIELDS</name>
<documentation>%aditoprj%/entity/Countries_Entity/entityfields/required_fields/documentation.adoc</documentation>
+ <searchable v="false" />
</entityField>
<entityField>
<name>NAME_TRANSLATED</name>
<title>Latin Name</title>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/name_translated/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>FLAG</name>
<contentType>IMAGE</contentType>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/flag/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>FLAG_RAW</name>
<description>//todo: move flags to binaries (asys_binaries)</description>
+ <searchable v="false" />
</entityField>
<entityField>
<name>NAME_ORIGIN</name>
<title>Native Name</title>
+ <searchable v="false" />
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 984935583c5811894d7e1e027586f4a1786d543f..210404deb6e4c33919febb3b8d565869f6887468 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -39,6 +39,7 @@
<name>DATE_EDIT</name>
<title>Date</title>
<contentType>DATE</contentType>
+ <resolution>MINUTE</resolution>
<outputFormat>dd.MM.yyyy HH:mm:ss</outputFormat>
<state>READONLY</state>
</entityField>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 4ca857a7c8dec52f7cb7a2ff3b4af4a20426e478..de0bacc7b2ce10ec457028c7be050fd9c5d87e09 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -252,12 +252,6 @@
<fieldName>KeywordProbabilties</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>49156847-1f96-462c-b914-e3c22f10ba18</name>
- <entityName>ObjectRelation_entity</entityName>
- <fieldName>KeywordObjectRelationType</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
<entityName>Activity_entity</entityName>
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 4ea612737b1477d8e10af5778db15db7348729c2..fa23a511ee836e370a14f3d985bc11b5cfe5673b 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -86,15 +86,11 @@
<entityField>
<name>OtherObjectRowid</name>
<title>Object</title>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OtherObjectType</name>
<title>Object type</title>
<groupable v="true" />
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/otherobjecttype/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>RELATION_TYPE</name>
@@ -123,24 +119,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>ProviderType_param</name>
- <code>%aditoprj%/entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/code.js</code>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>ProviderType_param</name>
@@ -154,8 +132,6 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
@@ -180,7 +156,6 @@
</entityParameter>
<entityField>
<name>CurrentObjectNumber</name>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/currentobjectnumber/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
@@ -235,10 +210,6 @@
<name>OBJECT1_ROWID.displayValue</name>
<expression>%aditoprj%/entity/ObjectRelation_entity/recordcontainers/db/recordfieldmappings/object1_rowid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>RELATION_TYPE.value</name>
- <recordfield>AB_OBJECTRELATION.RELATION_TYPE</recordfield>
- </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/ObjectRelation_entity/entityfields/currentobjectnumber/valueProcess.js b/entity/ObjectRelation_entity/entityfields/currentobjectnumber/valueProcess.js
deleted file mode 100644
index 8df1445a9bceed11f2ea0643cb5f75f04b5f6257..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/currentobjectnumber/valueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.result");
-import("ObjectRelation_lib");
-
-result.string(ObjectRelationUtils.getCurrentObjectNum(
- "$param.ObjectType_param",
- "$param.ObjectRowid_param",
- "$field.OBJECT1_TYPE",
- "$field.OBJECT1_ROWID",
- "$field.OBJECT2_TYPE",
- "$field.OBJECT2_ROWID"));
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/code.js b/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/code.js
deleted file mode 100644
index 48379a6374dacddb9ccbcaa323c9a24e96e105c1..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/keywordobjectrelationtype/children/containername_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("ObjectRelationType");
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/code.js b/entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/code.js
deleted file mode 100644
index 4a2d2e1c96782b8407f30181246efb90a9efd35a..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/objectrelations/children/providertype_param/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("tree");
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js
deleted file mode 100644
index dbd64f0ccc27bc7902948dc271790de92717a9c1..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/otherobjectrowid/displayValueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Context_lib");
-
-if (vars.exists("$field.OtherObjectType") && vars.get("$field.OtherObjectType") && (vars.exists("$field.OtherObjectRowid") && vars.get("$field.OtherObjectRowid")))
- result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OtherObjectType"), vars.get("$field.OtherObjectRowid"))));
diff --git a/entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js
deleted file mode 100644
index 926cb573d8e4f18eb116616164664813e314d684..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/otherobjectrowid/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.result");
-import("system.vars");
-
-var currentNum = vars.get("$field.CurrentObjectNumber");
-if (currentNum == "1")
-{
- result.string(vars.get("$field.OBJECT2_ROWID"));
-}
-else if (currentNum == "2")
-{
- result.string(vars.get("$field.OBJECT1_ROWID"));
-}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/otherobjecttype/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/otherobjecttype/displayValueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js b/entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js
deleted file mode 100644
index 2633a8804cecc2165d00ad13c9e334d887404830..0000000000000000000000000000000000000000
--- a/entity/ObjectRelation_entity/entityfields/otherobjecttype/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.result");
-import("system.vars");
-
-var currentNum = vars.get("$field.CurrentObjectNumber");
-if (currentNum == "1")
-{
- result.string(vars.get("$field.OBJECT2_TYPE"));
-}
-else if (currentNum == "2")
-{
- result.string(vars.get("$field.OBJECT1_TYPE"));
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 04183782f18a8b2e868a79f29c15aedcc58f0186..f6f21582c8d3a20e7a4c19e40bae8ff182494fc7 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -49,7 +49,7 @@
<name>CONTACT_ID</name>
<documentation>%aditoprj%/entity/Offer_entity/entityfields/contact_id/documentation.adoc</documentation>
<title>Connection</title>
- <consumer>Relations</consumer>
+ <consumer>AnyContacts</consumer>
<linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/valueProcess.js</valueProcess>
@@ -79,6 +79,8 @@
<entityField>
<name>VAT</name>
<title>Total VAT</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
</entityField>
<entityField>
@@ -141,12 +143,16 @@
<entityField>
<name>NET</name>
<title>Total net</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
</entityField>
<entityField>
<name>TotalGross</name>
<documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
<title>Total gross</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js
index c1dd2bbc6e368ccd25f363f47e8e86f6abceaa55..218011cdd8d2cb0d4ca85e11271a73152622074f 100644
--- a/entity/Offer_entity/entityfields/header/valueProcess.js
+++ b/entity/Offer_entity/entityfields/header/valueProcess.js
@@ -1,7 +1,13 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param"))
-{
- result.string(vars.get("$param.OfferHeader_param"));
-}
\ No newline at end of file
+import("system.logging");
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if(vars.exists("$param.OfferHeader_param") && vars.get("$param.OfferHeader_param"))
+ result.string(vars.get("$param.OfferHeader_param"));
+
+else if(vars.get("$this.value"))
+ result.string(vars.get("$this.value"));
+
+else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string("gerne bieten wir Ihnen wie folgt an:")
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 7ff04b18aabc3d337da88b7f8b9681f23fd35b37..3a7654eeaf40b5f2b89f33cd6514504f88496748 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -15,7 +15,9 @@
</entityField>
<entityField>
<name>DISCOUNT</name>
- <title>Discount</title>
+ <title>Discount %</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0</outputFormat>
</entityField>
<entityField>
<name>GROUPCODEID</name>
@@ -57,6 +59,8 @@
<entityField>
<name>PRICE</name>
<title>Unit price</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
@@ -74,6 +78,8 @@
<name>QUANTITY</name>
<documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
<title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0</outputFormat>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
<onValueChangeTypes>
@@ -85,10 +91,13 @@
<title>Unit</title>
<consumer>KeywordQuantityUnits</consumer>
<state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VAT</name>
<title>VAT</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
<state>READONLY</state>
</entityField>
<entityParameter>
@@ -166,7 +175,7 @@
<documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
<title>Note</title>
<contentType>LONG_TEXT</contentType>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/info/valueProcess.js</valueProcess>
+ <state>READONLY</state>
</entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
diff --git a/entity/Offeritem_entity/entityfields/info/valueProcess.js b/entity/Offeritem_entity/entityfields/info/valueProcess.js
deleted file mode 100644
index 199fc1e677e27d82f50e7728d4e6d9b66cb22c69..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/info/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.db");
-import("system.result");
-import("system.vars");
-import("system.neon");
-import("Sql_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- // TODO: loading from db until loading from Consumer is possible.
- var productId = vars.get("$field.PRODUCT_ID");
- result.string(db.cell(SqlCondition.begin().andPrepareVars("PRODUCT.PRODUCTID", "$field.PRODUCT_ID").buildSql("select INFO from PRODUCT", "1=2")));
-}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/optional/valueProcess.js b/entity/Offeritem_entity/entityfields/optional/valueProcess.js
index 31b2531af1ad332b9ab67942d5a89d742c9ab368..58162120400747dada1e4c1e2da49ecd5475054c 100644
--- a/entity/Offeritem_entity/entityfields/optional/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/optional/valueProcess.js
@@ -2,5 +2,5 @@ import("system.vars");
import("system.result");
import("system.neon");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && (vars.get("$this.value") == null || vars.get("$this.value") == ""))
result.string("0");
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
index 8397a374758cf6eeef923ff6a17b1ec61a2b984e..da456d1c4697abd9410468f34f66713f3a2202b7 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -12,13 +12,15 @@ if(pid != "")
var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: contactid };
- var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
+ //TODO: loading from db until loading from Consumer is possible.
+ var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
if(ProductDetails.productId != undefined)
{
neon.setFieldValue("$field.GROUPCODEID", ProductDetails.groupCode);
neon.setFieldValue("$field.UNIT", ProductDetails.unit);
neon.setFieldValue("$field.ITEMNAME", ProductDetails.productName);
+ neon.setFieldValue("$field.INFO", ProductDetails.INFO);
if(ProductDetails.PriceListToUse != null)
{
diff --git a/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js b/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..72cb60d083cf7a2ef7a78d11a5fcd7dbcb0c6e6a
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var unit = vars.get("$field.UNIT");
+var viewValue = "";
+
+if (unit)
+ viewValue = KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), unit);
+
+result.string(viewValue);
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 4b17e9af6aae9d2f5e48884b0d37b766ab28016e..7f15d48fa9d854c7fb7d10315dae9aa55e2d4a26 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -386,6 +386,14 @@
<onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
+ <entityField>
+ <name>OFFER_ID</name>
+ <title>Offer</title>
+ <linkedContext>Offer</linkedContext>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/offer_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -503,6 +511,10 @@
<name>LANGUAGE.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFER_ID.value</name>
+ <recordfield>SALESORDER.OFFER_ID</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Order_entity/entityfields/offer_id/displayValueProcess.js b/entity/Order_entity/entityfields/offer_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cde400be01b43a5033045030aded015ecc2060b8
--- /dev/null
+++ b/entity/Order_entity/entityfields/offer_id/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Offer_lib");
+
+result.string(OfferUtils.getOfferTitleById(vars.get("$field.OFFER_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/offer_id/valueProcess.js b/entity/Order_entity/entityfields/offer_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..aed6796329941efdf70888e87e642c9bfffb0154
--- /dev/null
+++ b/entity/Order_entity/entityfields/offer_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferId_param"))
+{
+ result.string(vars.get("$param.OfferId_param"));
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index d14a375a5fd4bfa52d59f2f824c3bb0fbf57300b..8b81dfb0873a6a0f8d58ac888f7ff87641e709a6 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -50,13 +50,12 @@
<name>STATUS</name>
<title>Status</title>
<consumer>KeywordContactStates</consumer>
- <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/status/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>TYPE</name>
<title>Type</title>
<consumer>KeywordOrganisationTypes</consumer>
- <searchable v="false" />
</entityField>
<entityConsumer>
<name>Activities</name>
@@ -306,24 +305,6 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CART</iconId>
</entityActionField>
- <entityField>
- <name>PRICE_POLITICS</name>
- <title>Price politics</title>
- <consumer>KeywordPrice_Politics</consumer>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>STRENGTH</name>
- <title>Strength</title>
- <consumer>KeywordStrenght</consumer>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>WEAKNESS</name>
- <title>Weakness</title>
- <consumer>KeywordWeakness</consumer>
- <searchable v="false" />
- </entityField>
<entityField>
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>standard email</title>
diff --git a/entity/Organisation_entity/entityfields/status/valueProcess.js b/entity/Organisation_entity/entityfields/status/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..13218c16514d81765c7e5dfd47c099996adfe063
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/status/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("KeywordRegistry_basic");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+ result.string($KeywordRegistry.contactStatus$active());
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 5f47e4a1f7a2b22cc331c308ebcebd18387e507c..bd05c9fadc079133368f2a9e8f0b3c55b8bf0cbc 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -55,11 +55,6 @@
<name>TITLESUFFIX</name>
<searchable v="false" />
</entityField>
- <entityField>
- <name>PREVIEWTITLE</name>
- <title></title>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/previewtitle/valueProcess.js</valueProcess>
- </entityField>
<entityParameter>
<name>OrgId_param</name>
<expose v="true" />
@@ -389,6 +384,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
<contentType>NUMBER</contentType>
<mandatory v="false" />
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
</entityField>
<entityActionField>
@@ -409,12 +405,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>E-Mail</title>
<consumer>EmailCommunications</consumer>
+ <searchable v="false" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
<title>Phone</title>
<consumer>PhoneCommunications</consumer>
+ <searchable v="false" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
@@ -459,6 +457,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ADDRESS_ID</name>
<title>standard address</title>
<consumer>PersAddresses</consumer>
+ <searchable v="false" />
<displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
@@ -514,7 +513,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityConsumer>
<entityConsumer>
<name>Offers</name>
- <title>Offer</title>
+ <title>Offers</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index d2902bb8988c83b2ea5721dabfdf8350f3a422b2..ab14630e7b739493e1533938f71e551befd0b599 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -62,18 +62,18 @@
<mandatory v="true" />
</entityField>
<entityField>
- <name>currentPurchasePriceId</name>
+ <name>currentPurchasePrice</name>
<title>Curr. purchase price</title>
+ <contentType>TEXT</contentType>
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentpurchasepriceid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>currentSalesPriceId</name>
+ <name>currentSalesPrice</name>
<title>Curr. sales price</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00 €</outputFormat>
+ <contentType>TEXT</contentType>
<state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentsalespriceid/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>Organisations</name>
@@ -86,7 +86,7 @@
</entityConsumer>
<entityConsumer>
<name>Productprices</name>
- <title>Price list</title>
+ <title>Prices</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -184,7 +184,7 @@
<name>CONTACT_ID</name>
<title>Developer</title>
<consumer>Organisations</consumer>
- <linkedContextProcess>%aditoprj%/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+ <linkedContext>Organisation</linkedContext>
<displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
@@ -243,9 +243,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>ORG_NAME</name>
- </entityField>
<entityConsumer>
<name>KeywordProductGroupcodes</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -317,6 +314,26 @@
<onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
</entityActionField>
+ <entityConsumer>
+ <name>Attributes</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>objectType_param</name>
+ <code>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objecttype_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>objectRowId_param</name>
+ <code>%aditoprj%/entity/Product_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -328,26 +345,12 @@
<onDBDelete>%aditoprj%/entity/Product_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
- <name>ce4af12f-66c7-43d2-aefe-512260f3b24b</name>
+ <name>67ca4a6c-a613-4ee7-bd9d-6ebc17c43944</name>
<tableName>PRODUCT</tableName>
<primaryKey>PRODUCTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
- <linkInformation>
- <name>774f098d-8c86-4f0a-8eab-de79a43b8609</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>2120f83c-6e14-4683-a5ad-9d0c88970d57</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
@@ -386,30 +389,10 @@
<name>UNIT.value</name>
<recordfield>PRODUCT.UNIT</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ORG_ID.value</name>
- <recordfield>CONTACT.ORGANISATION_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_PERSON_ID.value</name>
- <recordfield>CONTACT.PERSON_ID</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>PRODUCT.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_NAME.value</name>
- <recordfield>ORGANISATION.NAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_FIRSTNAME.value</name>
- <recordfield>PERSON.FIRSTNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_LASTNAME.value</name>
- <recordfield>PERSON.LASTNAME</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
<recordfield>PRODUCT.INFO</recordfield>
diff --git a/entity/Product_entity/entityfields/attributes/children/objectrowid_param/code.js b/entity/Product_entity/entityfields/attributes/children/objectrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..9635e2f4c42188cc99b051125cf236560cffe564
--- /dev/null
+++ b/entity/Product_entity/entityfields/attributes/children/objectrowid_param/code.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/attributes/children/objecttype_param/code.js b/entity/Product_entity/entityfields/attributes/children/objecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Product_entity/entityfields/attributes/children/objecttype_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/contact_id/displayValueProcess.js b/entity/Product_entity/entityfields/contact_id/displayValueProcess.js
index 6ed363112cd305df2f803bb38ac863d9e7240741..660715572aed4cf5db65f233b769c2c9ffa2bdf4 100644
--- a/entity/Product_entity/entityfields/contact_id/displayValueProcess.js
+++ b/entity/Product_entity/entityfields/contact_id/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
+import("system.db");
import("system.vars");
-import("Contact_lib");
-import("system.neon");
+import("system.result");
+import("Context_lib");
-result.string(vars.getString("$field.ORG_NAME"));
\ No newline at end of file
+result.string(db.cell(ContextUtils.getNameSql("Organisation", vars.get("$field.CONTACT_ID"))));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js b/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
deleted file mode 100644
index afd503496c5d5696769f88de130fb11781fe8889..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/contact_id/linkedContextProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("Contact_lib");
-
-if(vars.get("$field.CONTACT_ID"))
- result.string("Organisation");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js b/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e9ef972e437973279fcf9144c2504ab288b20df6
--- /dev/null
+++ b/entity/Product_entity/entityfields/currentpurchaseprice/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.text");
+import("system.result");
+import("system.vars");
+import("Product_lib");
+
+var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP");
+if (price.length > 0)
+ result.string(text.formatDouble(price[0], "#,##0.00", true) + " " + price[1]);
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/currentpurchasepriceid/valueProcess.js b/entity/Product_entity/entityfields/currentpurchasepriceid/valueProcess.js
deleted file mode 100644
index 67eac3b8220e51644ee450e4d74252cb89a3c8dc..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/currentpurchasepriceid/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Product_lib");
-
-result.string(ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js b/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..50bd3113611e859c5288cb2fe8a4851384a3a001
--- /dev/null
+++ b/entity/Product_entity/entityfields/currentsalesprice/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.text");
+import("system.result");
+import("system.vars");
+import("Product_lib");
+
+var price = ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "SP");
+if (price.length > 0)
+ result.string(text.formatDouble(price[0], "#,##0.00", true) + " " + price[1]);
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/currentsalespriceid/valueProcess.js b/entity/Product_entity/entityfields/currentsalespriceid/valueProcess.js
deleted file mode 100644
index dfac7a4979bc666a1b65a3609bc5e19a773a2021..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/currentsalespriceid/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Product_lib");
-
-result.string(ProductUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "SP"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index bbda770532a750cdbe05aa788035c867b9f2ae8c..5a38013798e0d3ee07dc4ffad661a4a803fb34cd 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
<name>Productprice_entity</name>
- <title>Price list</title>
+ <title>Prices</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
@@ -22,7 +22,7 @@
<entityField>
<name>FROMQUANTITY</name>
<title>From no. of units</title>
- <contentType>TEXT</contentType>
+ <contentType>NUMBER</contentType>
<outputFormat>#,##0</outputFormat>
<mandatory v="true" />
<state>AUTO</state>
@@ -31,7 +31,7 @@
<entityField>
<name>PRICE</name>
<title>Price</title>
- <contentType>TEXT</contentType>
+ <contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
<state>AUTO</state>
@@ -76,7 +76,7 @@
<entityField>
<name>VAT</name>
<title>VAT</title>
- <contentType>TEXT</contentType>
+ <contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<mandatory v="true" />
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/vat/onValidation.js</onValidation>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index a9ae672a3219b8648815998b5c330d07a2f97225..d7defd58150a99916a8751c000b8d1337b4e4c90 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -100,21 +100,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>ORG_PRICE_POLITICS</name>
- <title>Price politics</title>
- <consumer>KeywordPrice_Politics</consumer>
- </entityField>
- <entityField>
- <name>ORG_STRENGTH</name>
- <title>Strength</title>
- <consumer>KeywordStrenght</consumer>
- </entityField>
- <entityField>
- <name>ORG_WEAKNESS</name>
- <title>Weakness</title>
- <consumer>KeywordWeakness</consumer>
- </entityField>
<entityConsumer>
<name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -220,6 +205,30 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <title>Attributes</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>RelationsForSpecificObject</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>objectType_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>objectRowId_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>filteredAttributeIds_param</name>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -280,18 +289,6 @@
<name>STATUS.value</name>
<recordfield>SALESPROJECT_COMPETITION.STATUS</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_PRICE_POLITICS.value</name>
- <recordfield>ORGANISATION.PRICE_POLITICS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_STRENGTH.value</name>
- <recordfield>ORGANISATION.STRENGTH</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_WEAKNESS.value</name>
- <recordfield>ORGANISATION.WEAKNESS</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.displayValue</name>
<recordfield>ORGANISATION.NAME</recordfield>
@@ -304,18 +301,6 @@
<name>PHASE.value</name>
<recordfield>SALESPROJECT_COMPETITION.PHASE</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_PRICE_POLITICS.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_WEAKNESS.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORG_STRENGTH.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PHASE.displayValue</name>
<expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..76d502d1caf3f69fdc72c4fb9b90c4ce9631375f
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/filteredattributeids_param/code.js
@@ -0,0 +1,7 @@
+import("system.result");
+
+result.object([
+ '8af37871-d407-4414-98ad-e64dbaa5794a', // Price politics
+ '558419b2-6113-4060-b88d-cc6324754765', // Strength
+ '71226196-2812-4d70-b90f-c3e2c14fd4d1' // Weakness
+]);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef0d5bcac51027b862291e5abd61c0c05773a8df
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objectrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e359dfbd05a73d0010c8e90a0a645160e0087e4
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/attributes/children/objecttype_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Organisation");
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
deleted file mode 100644
index d352cbd476f1f9c7225a6d4e287f254d0478fb4b..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_price_politics.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPricePolitics(), "ORGANISATION.PRICE_POLITICS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
deleted file mode 100644
index 0071a532b7942b287c869f4eaef13c430b057297..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_strength.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectStrenght(), "ORGANISATION.STRENGTH");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
deleted file mode 100644
index 1f3ec844e7b00069d9f8bb49e3f1842402b71bdd..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/org_weakness.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectWeakness(), "ORGANISATION.WEAKNESS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 5c89373421944304a199c13facd3d402efb10089..ac4410f847cf7bf4dae8f02f88799ea7ddb3d476 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -24,10 +24,6 @@
<name>INFO</name>
<title>Info</title>
</entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <mandatory v="true" />
- </entityField>
<entityField>
<name>SALESPROJECT_FORECASTID</name>
<valueProcess>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/salesproject_forecastid/valueProcess.js</valueProcess>
@@ -114,10 +110,6 @@
<name>INFO.value</name>
<recordfield>SALESPROJECT_FORECAST.INFO</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.value</name>
- <recordfield>SALESPROJECT_FORECAST.CONTACT_ID</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>SALESPROJECT_FORECASTID.value</name>
<recordfield>SALESPROJECT_FORECAST.SALESPROJECT_FORECASTID</recordfield>
diff --git a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js b/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
index e8c2da35cd446c7b78eb3384dd01998dcf787450..dd25fd0e8ea4a00efb98164071eff5dbc65ee362 100644
--- a/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
+++ b/entity/SalesprojectForecast_entity/entityfields/volume/titleProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.translate");
-result.string(translate.text("${VOLUME_MONEY}") + translate.text("${THOUSAND_SHORT}") + translate.text("${EURO_SIGN}"));
\ No newline at end of file
+result.string(translate.text("${VOLUME_MONEY}") + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"));
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index a87a38eb3e03b674a654aba312f15dd7a3df82f1..31b0b9d4890d99472d88db00f2eac713b8988894 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -30,6 +30,8 @@
<entityProvider>
<name>SalesprojectMembers</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>TARGETCONTEXT</targetContextField>
+ <targetIdField>CONTACT_ID</targetIdField>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -158,14 +160,17 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<entityField>
<name>CONTACTROLE</name>
<title>Function</title>
+ <state>READONLY</state>
</entityField>
<entityField>
<name>DEPARTMENT</name>
<title>Department</title>
+ <state>READONLY</state>
</entityField>
<entityField>
<name>POSITION</name>
<title>Position</title>
+ <state>READONLY</state>
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 8de2b240e13a7fc9d67b675c0397fe8b19958963..550a25b68ca86e3248fe0d4ba3d30dd80f1d113e 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -85,7 +85,8 @@
<name>VOLUME</name>
<title>Volume</title>
<description>The displayValue from the recoord container adds T € (translated)</description>
- <contentTypeProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js</contentTypeProcess>
+ <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/Salesproject_entity/entityfields/volume/onValidation.js</onValidation>
</entityField>
<entityConsumer>
<name>Organisations</name>
@@ -503,10 +504,6 @@
<name>CONTACT_ID.displayValue</name>
<recordfield>ORGANISATION.NAME</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VOLUME.displayValue</name>
- <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PROBABILITY.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
diff --git a/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js b/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js
deleted file mode 100644
index ce76b0444f1f77a3b3c25eab41c4940feb10702f..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.neon");
-
-var recordState = vars.get("$sys.recordstate");
-if (recordState == neon.OPERATINGSTATE_EDIT || recordState == neon.OPERATINGSTATE_NEW)
-{
- result.string("NUMBER");
-}
-else
-{
- result.string("TEXT");
-}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js b/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..55d8076a7378a810484d3ce8390ff36034d4dba4
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volume/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+var volume = vars.get("$field.VOLUME");
+result.string(parseInt(volume) + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"))
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume/onValidation.js b/entity/Salesproject_entity/entityfields/volume/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..bf0a8f97253cff58d9188c390b044ecc2f1c26d5
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volume/onValidation.js
@@ -0,0 +1,15 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("PostalAddress_lib");
+import("Entity_lib");
+
+// TODO: displayValue + contentType number crashes so we use TEXT and validate ourselve
+// Workaround for 1035861
+
+var volume = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.VOLUME"));
+var message = "";
+if (!/^\d+\.?\d*$/.test(volume))
+ message = translate.text("Only numbers are allowed.");
+
+result.string(message);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js
deleted file mode 100644
index 542d45f41cf7db2349f5a6908b87813c5565f725..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.translate");
-import("system.result");
-import("Sql_lib");
-
-var maskingUtils = new SqlMaskingUtils();
-result.string(maskingUtils.concat(["char(SALESPROJECT.VOLUME)", "'" + translate.text("${THOUSAND_SHORT}") + "'", "'" + translate.text("${EURO_SIGN}") + "'"], " ", true))
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 1d879a819b4d0bef58f4afb1fb0481693281318d..a959133c142642f6c7df649fab3b589254e3df0d 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -18,6 +18,7 @@
<title>task number</title>
<contentType>NUMBER</contentType>
<outputFormat>0000000</outputFormat>
+ <searchable v="false" />
<state>DISABLED</state>
</entityField>
<entityField>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index e988c618d32042cb63e7a62095229957e1ab3e93..e4c846e28376cc90cabcc2f97b85e32f4929a6df 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -16,9 +16,10 @@
<entityField>
<name>MINUTES</name>
<title>Time</title>
- <contentType>NUMBER</contentType>
+ <contentType>TEXT</contentType>
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
</entityField>
<entityField>
<name>OBJECT_ID</name>
diff --git a/entity/Timetracking_entity/entityfields/minutes/onValidation.js b/entity/Timetracking_entity/entityfields/minutes/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..8080e185f4cc8a1f4b3a3dc07081b6b04cf036eb
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/minutes/onValidation.js
@@ -0,0 +1,15 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("PostalAddress_lib");
+import("Entity_lib");
+
+// TODO: displayValue + contentType number crashes so we use TEXT and validate ourselve
+// 1035861
+
+var minutes = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MINUTES"));
+var message = "";
+if (!/^\d+$/.test(minutes))
+ message = translate.text("Only numbers are allowed.");
+
+result.string(message);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 3e4cce4fb2e0b6d777e2c2ad3cddc7c07ecd0719..84ba642f70c11dcdddb2c7d132039f7f0ed297b5 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2502,6 +2502,45 @@
<entry>
<key>grandparents of</key>
</entry>
+ <entry>
+ <key>Entrydate (Month)</key>
+ </entry>
+ <entry>
+ <key>Entrydate (Day)</key>
+ </entry>
+ <entry>
+ <key>My Dashboard</key>
+ </entry>
+ <entry>
+ <key>Salesdashboard</key>
+ </entry>
+ <entry>
+ <key>Discount %</key>
+ </entry>
+ <entry>
+ <key>Memo</key>
+ </entry>
+ <entry>
+ <key>Function</key>
+ </entry>
+ <entry>
+ <key>Relational</key>
+ </entry>
+ <entry>
+ <key>test</key>
+ </entry>
+ <entry>
+ <key>Only numbers are allowed.</key>
+ </entry>
+ <entry>
+ <key>Superordinate Attribute</key>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_OFFER}</key>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_NEGOTIATION}</key>
+ </entry>
<entry>
<key>Filesize</key>
</entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e5deac6a7b591ea63c021fcec247cbd181493b65..572ab2905869eb16961b792377d5d537208e9227 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,10 @@
<key>Company</key>
<value>Firma</value>
</entry>
+ <entry>
+ <key>Entrydate (Day)</key>
+ <value>Eingangsdatum (Tag)</value>
+ </entry>
<entry>
<key>Turnover</key>
<value>Umsatz</value>
@@ -18,6 +22,10 @@
<key>Days</key>
<value>Tage</value>
</entry>
+ <entry>
+ <key>Discount %</key>
+ <value>Rabatt %</value>
+ </entry>
<entry>
<key>E-Mail</key>
<value>E-Mail</value>
@@ -50,6 +58,10 @@
<key>Communication data</key>
<value>Kommunikationsdaten</value>
</entry>
+ <entry>
+ <key>${SALESPROJECT_NEGOTIATION}</key>
+ <value>Negotiation</value>
+ </entry>
<entry>
<key>Filename</key>
<value>Dateiname</value>
@@ -82,6 +94,10 @@
<key>Time expenses</key>
<value>Aufwand</value>
</entry>
+ <entry>
+ <key>${SALESPROJECT_OFFER}</key>
+ <value>Offer</value>
+ </entry>
<entry>
<key>Status</key>
<value>Status</value>
@@ -369,6 +385,7 @@
</entry>
<entry>
<key>Key account</key>
+ <value>Großkunde</value>
</entry>
<entry>
<key>Cover letter</key>
@@ -408,7 +425,7 @@
</entry>
<entry>
<key>Payment method</key>
- <value>Zahlweise</value>
+ <value>Zahlungsweise</value>
</entry>
<entry>
<key>Price list / Company</key>
@@ -1570,6 +1587,7 @@
</entry>
<entry>
<key>Unit price</key>
+ <value>Einzelpreis</value>
</entry>
<entry>
<key>Firma</key>
@@ -1606,6 +1624,10 @@
<entry>
<key>Angebot</key>
</entry>
+ <entry>
+ <key>Salesdashboard</key>
+ <value>Vertriebsdashboard</value>
+ </entry>
<entry>
<key>details</key>
</entry>
@@ -1648,13 +1670,14 @@
<key>Title (original language)</key>
<value>Titel (ursprüngliche Sprache)</value>
</entry>
- <entry>
- <key>Parent Attribute</key>
- </entry>
<entry>
<key>Attribute Relation</key>
<value></value>
</entry>
+ <entry>
+ <key>My Dashboard</key>
+ <value>My Dashboard</value>
+ </entry>
<entry>
<key>Essential</key>
<value>Essenziell</value>
@@ -1706,6 +1729,7 @@
</entry>
<entry>
<key>Resigned</key>
+ <value>gekündigt</value>
</entry>
<entry>
<key>Customer</key>
@@ -1802,6 +1826,7 @@
</entry>
<entry>
<key>None, individual count</key>
+ <value>keiner, Einzelberechnung</value>
</entry>
<entry>
<key>French Polynesia</key>
@@ -1844,6 +1869,7 @@
</entry>
<entry>
<key>Semiannually</key>
+ <value>halbjährlich</value>
</entry>
<entry>
<key>Northern Mariana Islands</key>
@@ -1877,6 +1903,7 @@
</entry>
<entry>
<key>Maintenance contract</key>
+ <value>Wartungsvertrag</value>
</entry>
<entry>
<key>United States Minor Outlying Islands</key>
@@ -1910,6 +1937,10 @@
<entry>
<key>United States dollar</key>
</entry>
+ <entry>
+ <key>Superordinate Attribute</key>
+ <value>Ãœbergeordnetes Attribut</value>
+ </entry>
<entry>
<key>Kyrgyzstan</key>
</entry>
@@ -1980,6 +2011,7 @@
</entry>
<entry>
<key>Service contract</key>
+ <value>Werksvertrag</value>
</entry>
<entry>
<key>Taiwan</key>
@@ -2045,6 +2077,7 @@
</entry>
<entry>
<key>Not signed yet</key>
+ <value>noch nicht unterschrieben</value>
</entry>
<entry>
<key>Niue</key>
@@ -2138,6 +2171,7 @@
</entry>
<entry>
<key>${PRICELIST_SERVICE}</key>
+ <value>Service</value>
</entry>
<entry>
<key>English</key>
@@ -2226,6 +2260,7 @@
</entry>
<entry>
<key>Valid, unlimited</key>
+ <value>gültig, unbefristet</value>
</entry>
<entry>
<key>Svalbard and Jan Mayen</key>
@@ -2305,6 +2340,7 @@
</entry>
<entry>
<key>Annually</key>
+ <value>jährlich</value>
</entry>
<entry>
<key>Colombia</key>
@@ -2317,6 +2353,7 @@
</entry>
<entry>
<key>Valid, limited</key>
+ <value>gültig, befristet</value>
</entry>
<entry>
<key>Honduras</key>
@@ -2344,7 +2381,8 @@
<value>Stunden</value>
</entry>
<entry>
- <key>Special price list1</key>
+ <key>Special price list</key>
+ <value>Sonderpreisliste</value>
</entry>
<entry>
<key>Christmas Island</key>
@@ -2393,6 +2431,7 @@
</entry>
<entry>
<key>Quarterly</key>
+ <value>vierteljährlich</value>
</entry>
<entry>
<key>Indonesia</key>
@@ -2436,6 +2475,7 @@
</entry>
<entry>
<key>${PRICELIST_DEFAULT}</key>
+ <value>Standard</value>
</entry>
<entry>
<key>Customer recommendation</key>
@@ -2634,7 +2674,7 @@
</entry>
<entry>
<key>Framework contract</key>
- <value>Vertrag</value>
+ <value>Rahmenvertrag</value>
</entry>
<entry>
<key>Niger</key>
@@ -2931,6 +2971,25 @@
<key>supporter - supported</key>
<value>Unterstützt - Wird unterstützt von</value>
</entry>
+ <entry>
+ <key>Memo</key>
+ </entry>
+ <entry>
+ <key>Function</key>
+ </entry>
+ <entry>
+ <key>Relational</key>
+ </entry>
+ <entry>
+ <key>test</key>
+ </entry>
+ <entry>
+ <key>Only numbers are allowed.</key>
+ <value>Es sind nur Zahlen erlaubt.</value>
+ </entry>
+ <entry>
+ <key>Parent Attribute</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 aa06e94f8fd2519094eee03aa5b8c22a6385b897..c572b4d55ac4821daf82208c3acd7adf317cc25b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -1752,6 +1752,7 @@
</entry>
<entry>
<key>${PRICELIST_SERVICE}</key>
+ <value>Service</value>
</entry>
<entry>
<key>English</key>
@@ -1956,6 +1957,7 @@
</entry>
<entry>
<key>Special price list1</key>
+ <value>Special price list</value>
</entry>
<entry>
<key>Christmas Island</key>
@@ -2016,6 +2018,7 @@
</entry>
<entry>
<key>Key account</key>
+ <value></value>
</entry>
<entry>
<key>Brunei Darussalam</key>
@@ -2049,6 +2052,7 @@
</entry>
<entry>
<key>${PRICELIST_DEFAULT}</key>
+ <value>Standard</value>
</entry>
<entry>
<key>Customer recommendation</key>
@@ -2523,6 +2527,47 @@
<entry>
<key>grandparents of</key>
</entry>
+ <entry>
+ <key>Entrydate (Month)</key>
+ </entry>
+ <entry>
+ <key>Entrydate (Day)</key>
+ </entry>
+ <entry>
+ <key>My Dashboard</key>
+ </entry>
+ <entry>
+ <key>Salesdashboard</key>
+ </entry>
+ <entry>
+ <key>Discount %</key>
+ </entry>
+ <entry>
+ <key>Memo</key>
+ </entry>
+ <entry>
+ <key>Function</key>
+ </entry>
+ <entry>
+ <key>Relational</key>
+ </entry>
+ <entry>
+ <key>test</key>
+ </entry>
+ <entry>
+ <key>Only numbers are allowed.</key>
+ </entry>
+ <entry>
+ <key>Superordinate Attribute</key>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_OFFER}</key>
+ <value>Offer</value>
+ </entry>
+ <entry>
+ <key>${SALESPROJECT_NEGOTIATION}</key>
+ <value>Negotiation</value>
+ </entry>
<entry>
<key>Filesize</key>
</entry>
diff --git a/neonContext/Attribute/Attribute.aod b/neonContext/Attribute/Attribute.aod
index 3504918a02b55108b0a0b0d7985b65676c4551c4..490a8f162c38c09ff9745b63ddff2f9f3edb30d2 100644
--- a/neonContext/Attribute/Attribute.aod
+++ b/neonContext/Attribute/Attribute.aod
@@ -8,7 +8,6 @@
<filterview>AttributeFilter_view</filterview>
<editview>AttributeEdit_view</editview>
<preview>AttributePreview_view</preview>
- <lookupview>AttributeFilter_view</lookupview>
<entity>Attribute_entity</entity>
<references>
<neonViewReference>
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index 3d56373fb0ac8111c7d1df0efc29eee8f5c1b36f..d22d27e6d7bb6a4f4af9686983b4ebba55157301 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -14,5 +14,9 @@
<name>d2970ead-0da7-4fad-9f82-0c02fe85fe2c</name>
<view>AttributeRelationEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e23b445d-12eb-400c-9153-af6b026654e6</name>
+ <view>AttributeRelationPreviewList</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 26e9b98ce2551670cd108cf2ad6cc54f7486eed9..f6ed8390a1ccd3f99b71b5df881ca0cca5ccbc82 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -27,10 +27,6 @@
<name>68c233a5-ac5a-4aa7-b795-cd5aeb7af2e6</name>
<view>OrganisationEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>bb592f88-fa9f-4ecc-98cc-51a7903dc970</name>
- <view>OrganisationAttr_view</view>
- </neonViewReference>
<neonViewReference>
<name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
<view>OrganisationLookup_view</view>
diff --git a/neonDashboard/Home/Home.aod b/neonDashboard/Home/Home.aod
index c5f89ec119a76d74b445df7c34bf1b1c17df2951..beae892d0e6a0845711ed569185bca3d4a276061 100644
--- a/neonDashboard/Home/Home.aod
+++ b/neonDashboard/Home/Home.aod
@@ -3,6 +3,7 @@
<name>Home</name>
<title>My Dashboard</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:HOME</icon>
<dashboardType>PRIVATE</dashboardType>
<editRoles />
<defaultDashlets>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index 863bff4ad59e1225b8e0557eace0fe4e1d05078a..2b42818bb7d9df37fcd3656865c3a41450027e7f 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.0.0">
<name>Vertriebsdashboard</name>
- <title>Vertriebsdashboard</title>
+ <title>Salesdashboard</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>NEON:LOGO_A</icon>
+ <icon>VAADIN:CHART_GRID</icon>
<dashboardType>PUBLIC</dashboardType>
<editRoles>
<element>INTERNAL_ADMINISTRATOR</element>
diff --git a/neonView/AttributeFilter_view/AttributeFilter_view.aod b/neonView/AttributeFilter_view/AttributeFilter_view.aod
index 397239aacb52f57f539768356b12078993b2e19a..dcfb1f1c364d26321ea368be84bdb69a9c4f88ec 100644
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
@@ -11,11 +11,29 @@
</layout>
<children>
<treetableViewTemplate>
- <name>Treetable</name>
+ <name>Treetable_template</name>
<parentField>ATTRIBUTE_PARENT_ID</parentField>
<titleField>ATTRIBUTE_NAME</titleField>
<descriptionField>ATTRIBUTE_TYPE</descriptionField>
<entityField>#ENTITY</entityField>
</treetableViewTemplate>
+ <tableViewTemplate>
+ <name>Table_template</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>4dae1a23-8798-42ff-998c-7f5fedc7dcc5</name>
+ <entityField>ATTRIBUTE_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ed7598ea-c29c-4d04-9b28-27ee3b28a5b1</name>
+ <entityField>ATTRIBUTE_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>cc88ea53-2673-4c6e-ac2e-6766d2698453</name>
+ <entityField>ATTRIBUTE_ACTIVE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
</children>
</neonView>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index f3e5d5fa9e51b0d3fedf0e8f0b07f37f8c561472..4ebba8e503f92b6b617857ec1904bcb729c47d19 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -24,6 +24,10 @@
<name>5f20a5d4-0343-4b8c-92bf-15eeb2483ba9</name>
<entityField>ATTRIBUTE_PARENT_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>7e64cd02-e91e-4845-bc77-256a4945670e</name>
+ <entityField>KEYWORD_CONTAINER</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>e00bfeb1-7003-4d5a-b71a-c6921e255c9d</name>
<entityField>ATTRIBUTE_ACTIVE</entityField>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
new file mode 100644
index 0000000000000000000000000000000000000000..41ed1f745ebc495d92c4b4cc9c0006764e5e90de
--- /dev/null
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+ <name>AttributeRelationPreviewList</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>attributes</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>ca2fb22d-2987-443d-8e69-fccaba68e0c5</name>
+ <entityField>AB_ATTRIBUTE_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a4661c55-6e51-4884-b460-0ef1dca7c5f7</name>
+ <entityField>ATTRIBUTERELATION_VALUE</entityField>
+ </neonTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ContractMain_view/ContractMain_view.aod b/neonView/ContractMain_view/ContractMain_view.aod
index 5c26043cd5396a93387e3ff18425f156aec643f4..d7e55e01c53d8437aa72fdab66564821ebc6832e 100644
--- a/neonView/ContractMain_view/ContractMain_view.aod
+++ b/neonView/ContractMain_view/ContractMain_view.aod
@@ -24,5 +24,10 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>5539ca52-abbc-4f47-a4b5-c13c9628a16b</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index a943ec10b2d380d441fa19d88d57eaaaed65c8c8..804d7114af9bfbdbe0d8dd1930c10bc87c2eb7c3 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -18,6 +18,7 @@
<genericViewTemplate>
<name>ContractInfo_template</name>
<showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
@@ -40,8 +41,16 @@
<name>6529a64b-4249-434a-8692-45daad5264e3</name>
<entityField>CONTRACTDUE</entityField>
</entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>ContractDescription_template</name>
+ <showDrawer v="true" />
+ <drawerCaption>Further informations</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
<entityFieldLink>
- <name>bb0d44ca-671e-4a0f-87dc-a94e214bca54</name>
+ <name>546ff394-e0bd-4dce-82a4-8341bcd92243</name>
<entityField>REMARK</entityField>
</entityFieldLink>
</fields>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 64b69fb6a161632d7b213c79daac399caadce6bc..f3a585b3433614f9587f9a282101862ffeaa3062 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -69,6 +69,10 @@
<name>3317b73e-68e8-41a8-a678-89c7c7c8513e</name>
<entityField>SALESPROJECT_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>ca9602d9-03fe-450b-9349-949bf206b4bf</name>
+ <entityField>OFFER_ID</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
diff --git a/neonView/OrganisationAttr_view/OrganisationAttr_view.aod b/neonView/OrganisationAttr_view/OrganisationAttr_view.aod
deleted file mode 100644
index 776e229c1ed02a1c41f2600c4f1928dbb5974117..0000000000000000000000000000000000000000
--- a/neonView/OrganisationAttr_view/OrganisationAttr_view.aod
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>OrganisationAttr_view</name>
- <description>TODO: View verknüpfung von generics momentan nicht möglich! Desshalb habe ich die Felder nochmal direkt verknüpft, damit es zumindest nutzbar ist.
-TODO: diese Felder werden später als Attribute implementiert</description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>OrgAttributes</name>
- <showDrawer v="true" />
- <drawerCaption>Attributes</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>504f38a1-5642-42c5-9f43-cc20897330ec</name>
- <entityField>PRICE_POLITICS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>1c7a75d0-9032-4f63-8128-410d0c80dc0e</name>
- <entityField>STRENGTH</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8719c99b-89bb-472d-9596-109d921a1cf2</name>
- <entityField>WEAKNESS</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/ProductFilter_view/ProductFilter_view.aod b/neonView/ProductFilter_view/ProductFilter_view.aod
index d6837afcc054291cfe4c0f8f0395a0c64efde898..487ef7184828122708d3da3af001bff987dc0535 100644
--- a/neonView/ProductFilter_view/ProductFilter_view.aod
+++ b/neonView/ProductFilter_view/ProductFilter_view.aod
@@ -50,12 +50,6 @@
<name>346eab87-8fea-4828-8ea6-86af61f973ce</name>
<entityField>GROUPCODEID</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>9cfc7b76-3d75-4a26-a21f-3b2b1a2faac5</name>
- <entityField>UNIT</entityField>
- <width v="75" />
- <expandRatio v="100" />
- </neonTableColumn>
<neonTableColumn>
<name>3e774e1c-0998-4b2c-b876-22e99a79cb55</name>
<entityField>STATUS</entityField>
@@ -66,6 +60,12 @@
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
+ <neonTableColumn>
+ <name>9cfc7b76-3d75-4a26-a21f-3b2b1a2faac5</name>
+ <entityField>UNIT</entityField>
+ <width v="75" />
+ <expandRatio v="100" />
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index 68c00aaceec3ba5a2590cb09dd787ce1f8aeddb4..25005dcfa6938e48918f89633e84960d21ca7a51 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -39,5 +39,10 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b069dbb1-fa32-41a7-a40c-918d3d50dd26</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 75bf77deb25d3d8b33e094d93a233772eab28cc3..ec357f90b38dd8275058f1310dedab536c091ed7 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -18,6 +18,7 @@
<genericViewTemplate>
<name>ProductInfo_template</name>
<showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
@@ -53,12 +54,12 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>b93cd0c5-7028-496b-9709-ed57ba53ab47</name>
- <entityField>currentPurchasePriceId</entityField>
+ <name>e47628f5-dd89-4a5d-bb39-8edf8dba9e73</name>
+ <entityField>currentPurchasePrice</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>6e4db325-6546-47f8-8dfa-ae60e8c37a13</name>
- <entityField>currentSalesPriceId</entityField>
+ <name>da93c159-d0b2-41d4-8ebe-7f28f623356c</name>
+ <entityField>currentSalesPrice</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index 4d5f8da9ec87ed5acd40a327d0eeebc1769c2346..a75b6dbedd4669e0e74988874158a0b115adb5c2 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -36,25 +36,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <genericViewTemplate>
- <name>OrgAttrWorkaround_template</name>
- <showDrawer v="true" />
- <drawerCaption>Attributes</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9cf17ad8-d91f-4445-b66c-9227bc237787</name>
- <entityField>ORG_PRICE_POLITICS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e9d9fefd-3493-458e-b9aa-a0300de4f771</name>
- <entityField>ORG_STRENGTH</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>032e932c-038c-4a74-94e8-39e0be31fbae</name>
- <entityField>ORG_WEAKNESS</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
+ <neonViewReference>
+ <name>a0ff837d-f2f8-4e14-8246-3acdd6653be0</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationPreviewList</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 29c93d4f39c080379433f65949323e2d101c1c11..2181c73016332558c0b0bd74e3f74f0cf09592b0 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -54,6 +54,10 @@
<entityField>#ENTITY</entityField>
<title></title>
<columns>
+ <neonTableColumn>
+ <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
<entityField>CONTACT_ID</entityField>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 86f931d7521318c8f855c0602cfed8fe337205b2..ac2bea3a9905982d4254ae0c7e33426a74f7d04e 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -20,9 +20,9 @@
<view>ActivityFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>b0302dd4-fd72-4d34-8c22-70d3a721347f</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectCycle_view</view>
+ <name>9dbe03b3-e5d3-4db8-b542-506b13322d4f</name>
+ <entityField>SalesprojectForecasts</entityField>
+ <view>SalesprojectForecastFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>5d7248e8-3f3e-4262-8f13-6d5eff7165c1</name>
@@ -44,11 +44,6 @@
<entityField>SalesprojectMembers</entityField>
<view>SalesprojectMemberFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>a989abee-e88b-46b1-a78b-b16fa11de634</name>
- <entityField>SalesprojectClassifications</entityField>
- <view>SalesprojectClassificationFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>c0027b4d-c014-4053-a595-daad9a73ad5c</name>
<entityField>Timetrackings</entityField>
diff --git a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
index 94da8a83f6260b6d127edfca968580167262ab7e..dc494029004cf195eeb62b92d4b27b187d13c1e2 100644
--- a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
+++ b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
@@ -14,17 +14,5 @@
<descriptionField>SALESPROJECT_ROLE</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
- <genericViewTemplate>
- <name>SalesprojectMemberInfo_template</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9eafb9df-5b00-4e1f-aacf-04c62cfaddf0</name>
- <entityField>RELATIONSHIP</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
</children>
</neonView>
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
index b3d3d1c074c2e59fa64da7467af2ad0f982bf73a..3dc7188a6debc18f36c7cf02eb0e8630782a7137 100644
--- a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_AttributeType.xml
@@ -10,6 +10,15 @@
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="1"/>
</insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="1fa94dc3-b875-4e95-9ec1-8cb714f058fb"/>
+ <column name="KEYID" value="MEMO"/>
+ <column name="TITLE" value="Memo"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="SORTING" valueNumeric="8"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
<rollback>
<delete tableName="AB_KEYWORD_ENTRY">
<where>AB_KEYWORD_ENTRYID = ?</where>
@@ -17,6 +26,12 @@
<param value="9d2f9605-1a5e-47d3-8920-168f5637e37f"/>
</whereParams>
</delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="1fa94dc3-b875-4e95-9ec1-8cb714f058fb"/>
+ </whereParams>
+ </delete>
</rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml b/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml
index 4fe1d78f5b9c0f8025244a8000db944d82027bf8..9e0b5a7112973263fbffaa25761aa8e5b95f23b6 100644
--- a/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml
+++ b/others/db_changes/data_alias/basic/2019.2/AttributeKeyword.xml
@@ -4,5 +4,14 @@
<addColumn tableName="AB_ATTRIBUTE">
<column name="KEYWORD_CONTAINER" type="VARCHAR(80)"/>
</addColumn>
+ <addColumn tableName="AB_ATTRIBUTE">
+ <column name="ATTRIBUTE_INFO" type="NCLOB"/>
+ </addColumn>
+ <addColumn tableName="AB_ATTRIBUTE">
+ <column name="SORTING" type="INTEGER"/>
+ </addColumn>
+ <addColumn tableName="AB_ATTRIBUTERELATION">
+ <column name="MEMO_VALUE" type="NCLOB"/>
+ </addColumn>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/Product_remove_fk.xml b/others/db_changes/data_alias/basic/2019.2/Product_remove_fk.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a35133d715f83cb132057e7a915417e961773865
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/Product_remove_fk.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="0601eb26-fc5e-4b57-ad18-2b6a064f383f">
+ <dropForeignKeyConstraint baseTableName="PROD2PROD" constraintName="FK_PROD2PROD_SOURCE_ID"/>
+ <dropForeignKeyConstraint baseTableName="PROD2PROD" constraintName="FK_PROD2PROD_DEST_ID"/>
+ <dropForeignKeyConstraint baseTableName="OFFERITEM" constraintName="FK_OFFERITEM_PRODUCT_ID"/>
+ <dropForeignKeyConstraint baseTableName="SALESORDERITEM" constraintName="FK_SALESORDERITEM_PRODUCT_ID"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesOrder_source_offer.xml b/others/db_changes/data_alias/basic/2019.2/SalesOrder_source_offer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3c8b67ae2a64cb9c23468933b521a1d8c9c0a4d7
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/SalesOrder_source_offer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="1dda5c72-2c07-46ff-9fc4-00a364fa5c9f">
+ <addColumn tableName="SALESORDER">
+ <column name="OFFER_ID" type="CHAR(36)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 140a9af7beae114bb95376f10bbe0ac2b02efdd3..fa95b49dfa63c6cee06892da5f182aee773deeb3 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -40,6 +40,10 @@
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
+
+ <include relativeToChangelogFile="true" file="AttributeKeyword.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_attribute/Attribute.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_attribute/AttributeUsage.xml" context="example"/>
<include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
@@ -49,11 +53,11 @@
<include relativeToChangelogFile="true" file="task_add_parent.xml"/>
<include relativeToChangelogFile="true" file="drop_estimation_salesproject.xml"/>
-
+ <!--
<include relativeToChangelogFile="true" file="add_ObjectRelationKeyword.xml"/>
<include relativeToChangelogFile="true" file="ObjectRelation_add_type.xml"/>
<include relativeToChangelogFile="true" file="ObjectRelation_add_type_exampleData.xml" context="example"/>
-
+ -->
<!--References to the Keyword Values-->
<include relativeToChangelogFile="true" file="OfferProbability.xml"/>
<include relativeToChangelogFile="true" file="ActivityCategory.xml"/>
@@ -78,6 +82,16 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectCompetitionState.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_AttributeType.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectCompetitionPhase.xml"/>
- <include relativeToChangelogFile="true" file="AttributeKeyword.xml"/>
<include relativeToChangelogFile="true" file="Contact_add_columns.xml"/>
+ <include relativeToChangelogFile="true" file="SalesOrder_source_offer.xml"/>
+
+ <include relativeToChangelogFile="true" file="Product_remove_fk.xml"/>
+
+ <include relativeToChangelogFile="true" file="drop_contact_id_sp_forecast.xml"/>
+
+ <include relativeToChangelogFile="true" file="fix_sp_phases.xml"/>
+
+ <include relativeToChangelogFile="true" file="drop_pricePolitics-weakness-strength.xml"/>
+
+ <include relativeToChangelogFile="true" file="update_pricelist_keyword.xml"/>
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89ae81c3850fcf27d14b01248cbd9f3d3bdbb27e
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -0,0 +1,1504 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="f1b149fb-bd9d-44b7-a334-8f6d77261b95">
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+ <column name="ATTRIBUTE_NAME" value="Mitbewerber"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+ <column name="ATTRIBUTE_NAME" value="Preispolitik"/>
+ <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+ <column name="KEYWORD_CONTAINER" value="SalesprojectPricePolitics"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+ <column name="ATTRIBUTE_NAME" value="Stärke"/>
+ <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+ <column name="KEYWORD_CONTAINER" value="SalesprojectStrength"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+ <column name="ATTRIBUTE_NAME" value="Schwäche"/>
+ <column name="ATTRIBUTE_TYPE" value="KEYWORD"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+ <column name="KEYWORD_CONTAINER" value="SalesprojectWeakness"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+ <column name="ATTRIBUTE_NAME" value="Interessen"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
+ <column name="ATTRIBUTE_NAME" value="Kulanz"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+ <column name="ATTRIBUTE_NAME" value="Schadensart"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+ <column name="ATTRIBUTE_NAME" value="Regulierung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+ <column name="ATTRIBUTE_NAME" value="Technische Merkmale"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
+ <column name="ATTRIBUTE_NAME" value="B"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
+ <column name="ATTRIBUTE_NAME" value="0 gering"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="6266b41c-fa20-47b9-bd71-5633015d0796"/>
+ <column name="ATTRIBUTE_NAME" value="gut"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+ <column name="ATTRIBUTE_NAME" value="Stimmung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ <column name="ATTRIBUTE_NAME" value="Risiko"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="54018b5e-0e02-48d1-873c-1c934d2e97ed"/>
+ <column name="ATTRIBUTE_NAME" value="Rennrad"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
+ <column name="ATTRIBUTE_NAME" value="A"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="4fcd8bb8-72fd-48d0-9e64-4c80e5177c36"/>
+ <column name="ATTRIBUTE_NAME" value="NPO"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+ <column name="ATTRIBUTE_NAME" value="Doku Vorlagen Verwendung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+ <column name="ATTRIBUTE_INFO" value="Als Attribut ist der Name aus lib_frame z.B. 'ORG' 'PERS' 'OFFER' etc. zu verwenden."/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="2b6e3225-9447-4706-9313-62c9463d6671"/>
+ <column name="ATTRIBUTE_NAME" value="Handwerk"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="be60e4b3-19b1-48a9-ad5c-c7d38698b4a1"/>
+ <column name="ATTRIBUTE_NAME" value="Dumpingpreis Wettbewerb"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="6d15f683-389e-4915-9043-c4cfdf188095"/>
+ <column name="ATTRIBUTE_NAME" value="Vollberechnung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+ <column name="ATTRIBUTE_NAME" value="Konditionen"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+ <column name="ATTRIBUTE_INFO" value="Konditionen die bei Angebotserstellung übernommen werden"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+ <column name="ATTRIBUTE_NAME" value="Sonstiges"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+ <column name="ATTRIBUTE_NAME" value="Produkttyp"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="b1c552a0-eab9-417d-9f12-039d41603f6d"/>
+ <column name="ATTRIBUTE_NAME" value="mittel"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
+ <column name="ATTRIBUTE_NAME" value="D"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
+ <column name="ATTRIBUTE_NAME" value="1 mittel"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="32612c75-b32c-4043-88c4-e8237acf8d5c"/>
+ <column name="ATTRIBUTE_NAME" value="liebt Geselligkeit"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="6db07a20-86bc-48da-8b27-b39bdd73b86b"/>
+ <column name="ATTRIBUTE_NAME" value="Projektverschiebung Kunde"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="85c9cdd8-f7a6-4210-840e-fab8628f4dbe"/>
+ <column name="ATTRIBUTE_NAME" value="Qualitätsproblem Kunde"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="7c39913b-a07c-4332-96ff-7b34b566ff49"/>
+ <column name="ATTRIBUTE_NAME" value="Wein"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="07fc6730-6c83-4996-bfd9-41c18765a10a"/>
+ <column name="ATTRIBUTE_NAME" value="Wechsel Entscheidungsträger"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
+ <column name="ATTRIBUTE_NAME" value="Finanzdienstleistung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+ <column name="ATTRIBUTE_NAME" value="Sport"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="7f01bfa6-ce9d-4964-b1e2-3cd5464d076a"/>
+ <column name="ATTRIBUTE_NAME" value="Gerät/Maschine"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
+ <column name="ATTRIBUTE_NAME" value="Jahresurlaub"/>
+ <column name="ATTRIBUTE_TYPE" value="NUMBER"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
+ <column name="ATTRIBUTE_NAME" value="Fernreisen"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="4dce5406-9a91-4a92-b55e-d1313c18f9c6"/>
+ <column name="ATTRIBUTE_NAME" value="Teilberechnung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9cfa5ce3-f1ae-4d18-9a65-0571f5ffb786"/>
+ <column name="ATTRIBUTE_NAME" value="PERS"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ <column name="ATTRIBUTE_NAME" value="Beurteilung"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_NAME" value="Branche"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+ <column name="ATTRIBUTE_NAME" value="Zielgruppe"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
+ <column name="ATTRIBUTE_NAME" value="Dienstleistung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
+ <column name="ATTRIBUTE_NAME" value="Kunde"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
+ <column name="ATTRIBUTE_NAME" value="Interessent"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
+ <column name="ATTRIBUTE_NAME" value="Hersteller"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
+ <column name="ATTRIBUTE_NAME" value="Wettbewerber"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ <column name="ATTRIBUTE_NAME" value="Betreuung"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+ <column name="ATTRIBUTE_NAME" value="Kontaktierung"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
+ <column name="ATTRIBUTE_NAME" value="Signatur"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
+ <column name="ATTRIBUTE_NAME" value="Bier"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+ <column name="ATTRIBUTE_NAME" value="Genuss"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
+ <column name="ATTRIBUTE_NAME" value="Motorrad"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
+ <column name="ATTRIBUTE_NAME" value="Drehzahl (rpm)"/>
+ <column name="ATTRIBUTE_TYPE" value="NUMBER"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="4c28a67b-dbc5-4399-bf33-b52e4cf82ffd"/>
+ <column name="ATTRIBUTE_NAME" value="ORG"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="2318607b-556a-4537-92f0-9870ee9a9201"/>
+ <column name="ATTRIBUTE_NAME" value="Zigarren"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="43321e69-c8aa-4b0e-9c4e-8cde74f5c0fc"/>
+ <column name="ATTRIBUTE_NAME" value="Verschleißteil"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
+ <column name="ATTRIBUTE_NAME" value="Maschinenbau"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ <column name="ATTRIBUTE_NAME" value="Loyalität"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
+ <column name="ATTRIBUTE_NAME" value="Tabellen Daten"/>
+ <column name="ATTRIBUTE_TYPE" value="TEXT"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
+ <column name="ATTRIBUTE_NAME" value="Liefersperre"/>
+ <column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
+ <column name="ATTRIBUTE_NAME" value="Partner"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ <column name="ATTRIBUTE_NAME" value="Geburtstagsliste"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="10"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="62b43c0f-9afb-4b57-8b7d-de38d43a9d47"/>
+ <column name="ATTRIBUTE_NAME" value="Nein"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="ddf607c0-a45b-4255-bf4e-b2d515df4b86"/>
+ <column name="ATTRIBUTE_NAME" value="Ja"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+ <column name="ATTRIBUTE_NAME" value="Projektart"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
+ <column name="ATTRIBUTE_NAME" value="Intern"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="615d3850-ef32-4988-9a8d-7b702b489194"/>
+ <column name="ATTRIBUTE_NAME" value="Partner"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
+ <column name="ATTRIBUTE_NAME" value="Bestandskunde"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
+ <column name="ATTRIBUTE_NAME" value="Interessent"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="4a9625ed-0cd9-445f-ae13-5bdbfdf3f38c"/>
+ <column name="ATTRIBUTE_NAME" value="Fussball"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
+ <column name="ATTRIBUTE_NAME" value="Förderband"/>
+ <column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
+ <column name="ATTRIBUTE_NAME" value="weitere Daten"/>
+ <column name="ATTRIBUTE_TYPE" value="TEXT"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="974bbd28-08b3-41a4-bd74-7d9c3c778249"/>
+ <column name="ATTRIBUTE_NAME" value="kein Risiko"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9350afa2-7181-4eb4-b731-3699fe71b0f6"/>
+ <column name="ATTRIBUTE_NAME" value="schlecht"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="d8949d8f-051b-4f5b-ba61-5af49e9499cc"/>
+ <column name="ATTRIBUTE_NAME" value="Ersatzteil"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="23a4d394-9fae-4205-a811-730d5109c115"/>
+ <column name="ATTRIBUTE_NAME" value="Segeln"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
+ <column name="ATTRIBUTE_NAME" value="Werkzeugwechsler"/>
+ <column name="ATTRIBUTE_TYPE" value="BOOLEAN"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
+ <column name="ATTRIBUTE_NAME" value="Logistik"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="7"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="1a3c1c77-e57c-4481-a67f-adf7e084ea90"/>
+ <column name="ATTRIBUTE_NAME" value="IT"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="953e3b5e-0ca7-4215-8dee-b0ba28ef1bf9"/>
+ <column name="ATTRIBUTE_NAME" value="Zahlungsproblem Kunde"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="2bdb04cb-4cd3-4454-802c-8e2b4a5e2e36"/>
+ <column name="ATTRIBUTE_NAME" value="Behörde"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="6"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="30be2556-e09b-4169-be32-d4bafeb89a2f"/>
+ <column name="ATTRIBUTE_NAME" value="Tourismus"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
+ <column name="ATTRIBUTE_NAME" value="Handel"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="79378933-9f74-4391-b876-4528b582661f"/>
+ <column name="ATTRIBUTE_NAME" value="Bauwesen"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
+ <column name="ATTRIBUTE_NAME" value="2 gross"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
+ <column name="ATTRIBUTE_NAME" value="Gewicht (kg)"/>
+ <column name="ATTRIBUTE_TYPE" value="NUMBER"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+ <column name="ATTRIBUTE_NAME" value="Bonität"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+ <column name="ATTRIBUTE_NAME" value="Beruf"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
+ <column name="ATTRIBUTE_NAME" value="Personal"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
+ <column name="ATTRIBUTE_NAME" value="C"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+ <column name="ATTRIBUTE_NAME" value="zusätzliche Daten"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
+ <column name="ATTRIBUTE_NAME" value="Wirtschaft"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="bb62ae03-be34-4d34-885c-27591c5bf1b4"/>
+ <column name="ATTRIBUTE_NAME" value="Golf"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="0afb463f-6ce4-4dfb-b093-09a8fcd925a3"/>
+ <column name="ATTRIBUTE_NAME" value="Bauteil"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="2"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
+ <column name="ATTRIBUTE_NAME" value="Mitarbeiterkonto"/>
+ <column name="ATTRIBUTE_TYPE" value="GROUP"/>
+ <column name="ATTRIBUTE_PARENT_ID" value=""/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
+ <column name="ATTRIBUTE_NAME" value="DOCUMENT"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="fffbb6b5-05ea-4f76-83c6-cf2cb29ef576"/>
+ <column name="ATTRIBUTE_NAME" value="unvollständige Lieferung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="5c188c8c-14b2-4c66-ad48-65b750e05353"/>
+ <column name="ATTRIBUTE_NAME" value="Qualitätsbeanstandung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="3600aba4-01d4-4ca3-a3e7-79e0b946a2b1"/>
+ <column name="ATTRIBUTE_NAME" value="fehlerhafte Lieferung"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="2"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="66b64741-a896-4404-874a-b83b3525fcff"/>
+ <column name="ATTRIBUTE_NAME" value="Transportschaden"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="c0fb9a3a-89a5-46a4-9b95-f48c9481375e"/>
+ <column name="ATTRIBUTE_NAME" value="EVENT"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
+ <column name="SORTING" valueNumeric="3"/>
+</insert>
+
+ <rollback>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="6266b41c-fa20-47b9-bd71-5633015d0796"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="54018b5e-0e02-48d1-873c-1c934d2e97ed"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="4fcd8bb8-72fd-48d0-9e64-4c80e5177c36"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="2b6e3225-9447-4706-9313-62c9463d6671"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="be60e4b3-19b1-48a9-ad5c-c7d38698b4a1"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="6d15f683-389e-4915-9043-c4cfdf188095"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="ab545654-1fce-4993-b763-0ec469781302"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="b1c552a0-eab9-417d-9f12-039d41603f6d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="32612c75-b32c-4043-88c4-e8237acf8d5c"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="6db07a20-86bc-48da-8b27-b39bdd73b86b"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="85c9cdd8-f7a6-4210-840e-fab8628f4dbe"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="7c39913b-a07c-4332-96ff-7b34b566ff49"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="07fc6730-6c83-4996-bfd9-41c18765a10a"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="7f01bfa6-ce9d-4964-b1e2-3cd5464d076a"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="4dce5406-9a91-4a92-b55e-d1313c18f9c6"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="9cfa5ce3-f1ae-4d18-9a65-0571f5ffb786"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="4c28a67b-dbc5-4399-bf33-b52e4cf82ffd"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="2318607b-556a-4537-92f0-9870ee9a9201"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="43321e69-c8aa-4b0e-9c4e-8cde74f5c0fc"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="915d566f-acbe-448c-a7b6-11898adc3880"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="62b43c0f-9afb-4b57-8b7d-de38d43a9d47"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="ddf607c0-a45b-4255-bf4e-b2d515df4b86"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="615d3850-ef32-4988-9a8d-7b702b489194"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="4a9625ed-0cd9-445f-ae13-5bdbfdf3f38c"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="974bbd28-08b3-41a4-bd74-7d9c3c778249"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="9350afa2-7181-4eb4-b731-3699fe71b0f6"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="d8949d8f-051b-4f5b-ba61-5af49e9499cc"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="23a4d394-9fae-4205-a811-730d5109c115"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="1a3c1c77-e57c-4481-a67f-adf7e084ea90"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="953e3b5e-0ca7-4215-8dee-b0ba28ef1bf9"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="2bdb04cb-4cd3-4454-802c-8e2b4a5e2e36"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="30be2556-e09b-4169-be32-d4bafeb89a2f"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="79378933-9f74-4391-b876-4528b582661f"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="bb62ae03-be34-4d34-885c-27591c5bf1b4"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="0afb463f-6ce4-4dfb-b093-09a8fcd925a3"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="fffbb6b5-05ea-4f76-83c6-cf2cb29ef576"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="5c188c8c-14b2-4c66-ad48-65b750e05353"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="3600aba4-01d4-4ca3-a3e7-79e0b946a2b1"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="66b64741-a896-4404-874a-b83b3525fcff"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="c0fb9a3a-89a5-46a4-9b95-f48c9481375e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="558419b2-6113-4060-b88d-cc6324754765"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTE">
+ <where>AB_ATTRIBUTEID = ?</where>
+ <whereParams>
+ <param value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+ </whereParams>
+</delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
new file mode 100644
index 0000000000000000000000000000000000000000..30e5cac58d680c19e70f29d3449c92566a330662
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/AttributeUsage.xml
@@ -0,0 +1,524 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="33bfbf9d-e3b9-4dd0-94e5-f22c74bc3014">
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="5b9d5f38-4486-4586-8de0-9c607d51e698"/>
+ <column name="OBJECT_TYPE" value="Document_entity"/>
+ <column name="AB_ATTRIBUTE_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="f06dd320-4757-4261-aace-cb827a313d28"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="8adfbc93-2daa-4e6b-a3ce-76110b46e458"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+ <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
+ <column name="OBJECT_TYPE" value="Contract"/>
+ <column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="31b6b6f1-b980-4b14-a382-a718be560009"/>
+ <column name="OBJECT_TYPE" value="Document_entity"/>
+ <column name="AB_ATTRIBUTE_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="AB_ATTRIBUTE_ID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="AB_ATTRIBUTE_ID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="AB_ATTRIBUTE_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="89be2b44-2766-4dea-9a73-725b84a20d6d"/>
+ <column name="OBJECT_TYPE" value="Contact"/>
+ <column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="0766ff88-304d-41a7-8224-642a0aee5587"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="ef63620d-f247-4ca0-bd92-9efa0b14676e"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="512ef5be-3381-42ac-860a-b1fbb9be665b"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+ <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="dbb70409-43b2-4a94-b7f7-bbb4e4ba101d"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="f579e0d5-42f4-4682-99b5-358e06ffe4a1"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
+ <column name="OBJECT_TYPE" value="Salesproject"/>
+ <column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="AB_ATTRIBUTE_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="9a145e7f-bb66-4541-bb99-28c2dd944f3d"/>
+ <column name="OBJECT_TYPE" value="Document_entity"/>
+ <column name="AB_ATTRIBUTE_ID" value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="AB_ATTRIBUTE_ID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="fade7115-40fb-41a2-8f71-dbb6905176e9"/>
+ <column name="OBJECT_TYPE" value="Document_entity"/>
+ <column name="AB_ATTRIBUTE_ID" value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="05576033-1bee-4547-ab82-fdfcdd039642"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
+ <column name="MIN_COUNT" valueNumeric="2"/>
+ <column name="MAX_COUNT" valueNumeric="0"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="6fd80f33-6d9a-4b95-b420-c3c5b249caf9"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="ebb3b2a2-0fd2-4307-8f21-c118e7ad7b8e"/>
+ <column name="OBJECT_TYPE" value="Contact"/>
+ <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="755239d0-7fe3-46bc-8ec4-923977148455"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
+ <column name="OBJECT_TYPE" value="Person"/>
+ <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="0826cf13-f379-417d-9fed-302fe44a618e"/>
+ <column name="OBJECT_TYPE" value="Activity"/>
+ <column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
+ <column name="MIN_COUNT" valueNumeric="1"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="AB_ATTRIBUTE_ID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
+</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
+</insert>
+
+ <rollback>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="5b9d5f38-4486-4586-8de0-9c607d51e698"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="f06dd320-4757-4261-aace-cb827a313d28"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="8adfbc93-2daa-4e6b-a3ce-76110b46e458"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="31b6b6f1-b980-4b14-a382-a718be560009"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="89be2b44-2766-4dea-9a73-725b84a20d6d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="0766ff88-304d-41a7-8224-642a0aee5587"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="ef63620d-f247-4ca0-bd92-9efa0b14676e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="512ef5be-3381-42ac-860a-b1fbb9be665b"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="dbb70409-43b2-4a94-b7f7-bbb4e4ba101d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="f579e0d5-42f4-4682-99b5-358e06ffe4a1"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="9a145e7f-bb66-4541-bb99-28c2dd944f3d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="fade7115-40fb-41a2-8f71-dbb6905176e9"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="05576033-1bee-4547-ab82-fdfcdd039642"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="6fd80f33-6d9a-4b95-b420-c3c5b249caf9"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="ebb3b2a2-0fd2-4307-8f21-c118e7ad7b8e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="755239d0-7fe3-46bc-8ec4-923977148455"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="0826cf13-f379-417d-9fed-302fe44a618e"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
+ </whereParams>
+</delete>
+<delete tableName="AB_ATTRIBUTEUSAGE">
+ <where>AB_ATTRIBUTEUSAGEID = ?</where>
+ <whereParams>
+ <param value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
+ </whereParams>
+</delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml b/others/db_changes/data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f6430b6e1fd2a7fa0a74e918157b2fc30c33b28
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/drop_contact_id_sp_forecast.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="0601eb26-fc5e-4b57-ad18-2b6a064f383f">
+ <dropColumn tableName="SALESPROJECT_FORECAST" columnName="CONTACT_ID"/>
+
+ <rollback>
+ <addColumn tableName="SALESPROJECT">
+ <column name="CONTACT_ID" type="CHAR(36)">
+ <constraints nullable="false"/>
+ </column>
+ </addColumn>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml b/others/db_changes/data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
new file mode 100644
index 0000000000000000000000000000000000000000..59d462631e8c07712b7edd59b82de439d4e6399a
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/drop_pricePolitics-weakness-strength.xml
@@ -0,0 +1,20 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="4aae69ae-85ca-4bdf-a13d-e7e6db13172c">
+ <dropColumn tableName="ORGANISATION" columnName="WEAKNESS"/>
+ <dropColumn tableName="ORGANISATION" columnName="STRENGTH"/>
+ <dropColumn tableName="ORGANISATION" columnName="PRICE_POLITICS"/>
+
+ <rollback>
+ <addColumn tableName="ORGANISATION">
+ <column name="WEAKNESS" type="CHAR(36)"/>
+ </addColumn>
+ <addColumn tableName="ORGANISATION">
+ <column name="STRENGTH" type="CHAR(36)"/>
+ </addColumn>
+ <addColumn tableName="ORGANISATION">
+ <column name="PRICE_POLITICS" type="CHAR(36)"/>
+ </addColumn>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/fix_sp_phases.xml b/others/db_changes/data_alias/basic/2019.2/fix_sp_phases.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0e36cda05c7f4a9b8437307a4baa25356b31aa66
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/fix_sp_phases.xml
@@ -0,0 +1,53 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="3e7869e8-5cc1-4db8-bc3b-d2d719722cb0">
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID in(?,?,?,?,?,?,?,?,?)</where>
+ <whereParams>
+ <param value="f630f573-baae-4041-aeb0-41ff30ad188a"/>
+ <param value="4895c091-f810-4c64-9bba-698c07a59c5e"/>
+ <param value="b255450e-418c-41dd-be47-26c69aedbffa"/>
+ <param value="de2e8c2a-ef34-4d62-8d65-a4ca530e7236"/>
+ <param value="58f6b20b-0cae-4a1c-bb47-d2bfaab58df5"/>
+ <param value="4f957f7d-173d-4450-8502-ba8dc3351db3"/>
+ <param value="ee7de36d-b33b-4e5c-b750-5ec2798d2964"/>
+ <param value="1991320a-3e15-4ed3-867a-5c7c39a4cf4a"/>
+ <param value="adb3d122-992c-4d00-88a8-c04ec6e15cd3"/>
+ </whereParams>
+ </delete>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="028af5dd-1071-4108-8685-ed7124376706"/>
+ <column name="KEYID" value="4814b51b-40f5-49bc-897b-f0933b9fc12c"/>
+ <column name="TITLE" value="MQC"/>
+ <column name="CONTAINER" value="SalesprojectPhase"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="${SALESPROJECT_OFFER}"/>
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="0e8eab64-4c79-4eed-9746-0ac6fc397620"/>
+ </whereParams>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="${SALESPROJECT_NEGOTIATION}"/>
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="405e2b7b-20c2-4824-a8b5-c7a533784ef3"/>
+ </whereParams>
+ </update>
+
+ <sql>update AB_KEYWORD_ENTRY set SORTING = SORTING+1 where AB_KEYWORD_ENTRYID in (
+ '8a2d19c9-bc32-437e-9261-78ed30110e92',
+ '46f55a58-dbe4-40ae-9306-481df9095088',
+ 'afa8cf58-07e8-4ee9-b24e-96cb6fa76aec',
+ 'c9483fb9-c295-43d2-94e0-8c949cf6dc47',
+ '0e8eab64-4c79-4eed-9746-0ac6fc397620',
+ '405e2b7b-20c2-4824-a8b5-c7a533784ef3')
+ </sql>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/update_pricelist_keyword.xml b/others/db_changes/data_alias/basic/2019.2/update_pricelist_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d0d5bc9de47f081e3fbb0c66bdd8982831ce2004
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/update_pricelist_keyword.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="dcb90106-a55a-4506-94e3-af4d15d5b587">
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Special price list"/>
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="b47478a1-1fac-4e74-921f-b47c146e034d" />
+ </whereParams>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index b961c693309c33cd1b67307c9f411367ad6fb351..010f064aef2e1a8bfc867c756aae7b2065b5b58a 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -14,15 +14,16 @@ import("Sql_lib");
function AttributeUtil () {}
/**
- * Gives a list of all available attributes for a context. This is used in the possibleItems
+ * Gives an array of all available attributes for a context. This is used in the possibleItems
* process for the attribute id in AttributeRelation
*
* @param {String} pObjectType the object type (= context)
- * @param {boolean} pIncludeGroups
+ * @param {boolean} [pIncludeGroups=false]
+ * @param {String[]} [pFilteredAttributeIds=[]] Whitleist of attribute ids
*
- * @return {String[][]} two-dimensional array of attributeIds and names
+ * @return {String[]} array of attributeIds
*/
-AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups)
+AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFilteredAttributeIds)
{
if (pObjectType == null)
return [];
@@ -31,16 +32,26 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups)
+ " join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID";
attrCond = SqlCondition.begin()
.andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
- .and("ATTRIBUTE_TYPE != '" + $AttributeTypes.COMBOVALUE + "'")
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# <> ?")
.and("ATTRIBUTE_ACTIVE = 1");
+ if (pFilteredAttributeIds != undefined && pFilteredAttributeIds.length > 0)
+ {
+ var filteredIdsCondition = new SqlCondition();
+
+ pFilteredAttributeIds.forEach(function(id)
+ {
+ this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
+ }, filteredIdsCondition);
+
+ attrCond.andSqlCondition(filteredIdsCondition);
+ }
+
if (!pIncludeGroups)
attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
- var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql)).map(function (id)
- {
- return [id, AttributeUtil.getFullAttributeName(id)];
- });
+ var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql));
+
return attributes;
}
@@ -125,18 +136,29 @@ function AttributeRelationUtils () {}
/**
* gets the value of an attributeRelation for one dataset (e. g. a person)
+ *
+ * @param {String} pAttributeId attribute-id
+ * @param {String} pObjectRowId row-id of the dataset
+ * @param {String} [pObjectType=null] object-type
+ *
+ * @return {String|null} the value of the attribute
*/
AttributeRelationUtils.getAttribute = function (pAttributeId, pObjectRowId, pObjectType)
{
- var attrCond = SqlCondition().begin()
+ var attrCond = SqlCondition.begin()
.andPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", pAttributeId)
.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", pObjectRowId);
if (pObjectType != null)
attrCond.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", pAttributeId);
- var attrSql = AttributeRelationUtils.getSqlUtil();
- var attributeValues = db.array(db.ROW, attrCond.buildSql(attrSql.sqlSelect));
- return attrSql.getFieldFromType(attributeValues);
+ var attributeSql = attrCond.buildSql("select ATTRIBUTE_TYPE, " + AttributeTypeUtil.getAllDatabaseFields()
+ + " from AB_ATTRIBUTERELATION join AB_ATTRIBUTE on AB_ATTRIBUTE_ID = AB_ATTRIBUTEID");
+ var attributeValues = db.array(db.ROW, attributeSql);
+ if (attributeValues.length == 0)
+ return null;
+
+ var valueIndex = AttributeTypeUtil.getTypeColumnIndex(attributeValues[0]) + 1;
+ return attributeValues[valueIndex];
}
AttributeRelationUtils.getAttributes = function ()
@@ -152,59 +174,6 @@ AttributeRelationUtils.setAttribute = function ()
//TODO: implement
}
-/**
- * Builds an object for the work with the values of attributeRelations. This should make
- * the attribute type definition more flexible, the returned object has the following properties
- * and methods:
- *
- * columns = array of all database columns in AB_ATTRIBUTERELATION that hold attribute values
- * typeColMap = object with the attribute type as key and the index in the columns-array with the column holding
- * the value for that attribute type as value
- * sqlSelect = an sql-select string where the columns are the type of the attribute plus the value columns
- * getFieldFromType = a method that takes a one-dimensional array that has been created with a query using the 'sqlSelect' property
- * and returns the value at the right position of that array depending on the type. For example:
- * //type, values
- * vals = ["TEXT", "abcdef", "", "", "", ""];
- * the method would return "abcdef", because it looks at the first position where the type is, e. g. "TEXT"
- * and then it gets the value at, for example, index 1 because the typeColMap object says that the value for type "TEXT"
- * is at position 1.
- *
- */
-AttributeRelationUtils.getSqlUtil = function ()
-{
- var sqlMap = {
- columns : [],
- typeColMap : {}
- };
- for (let type in $AttributeTypes)
- {
- type = $AttributeTypes[type];
- if (type.databaseField)
- {
- var typeKey = type.toString();
- var colIndex = sqlMap.columns.indexOf(type.databaseField);
- if (colIndex == -1)
- {
- colIndex = sqlMap.columns.length;
- sqlMap.columns.push(type.databaseField);
- }
- sqlMap.typeColMap[typeKey] = colIndex;
- }
- }
-
- sqlMap.sqlSelect = "select ATTRIBUTE_TYPE, " + sqlMap.columns.join(", ") + " from AB_ATTRIBUTERELATION "
- + " join AB_ATTRIBUTE on AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID ";
-
- sqlMap.getFieldFromType = function (pTypeAndValues)
- {
- if (pTypeAndValues.length > 0)
- return pTypeAndValues[this.typeColMap[pTypeAndValues[0]] + 1];
- return null;
- }
-
- return sqlMap;
-}
-
/*********************************************************************************************************************/
/**
@@ -255,7 +224,7 @@ AttributeHandler.prototype.getAttributeType = function () //TODO: maybe the type
*/
AttributeHandler.prototype.getAttributeField = function ()
{
- return $AttributeTypes.getEntityField(this.getAttributeType());
+ return AttributeTypeUtil.getEntityField(this.getAttributeType());
}
/**
@@ -265,7 +234,7 @@ AttributeHandler.prototype.getAttributeField = function ()
*/
AttributeHandler.prototype.getAttributeContentType = function ()
{
- return $AttributeTypes.getContentType(this.getAttributeType());
+ return AttributeTypeUtil.getContentType(this.getAttributeType());
}
/**
@@ -355,8 +324,18 @@ $AttributeTypes.KEYWORD = {
databaseField : "ID_VALUE",
entityField : "ID_VALUE"
};
+$AttributeTypes.MEMO = {
+ toString : function () {return this.keyword},
+ keyword : "MEMO",
+ contentType : "TEXT",
+ databaseField : "MEMO_VALUE",
+ entityField : "MEMO_VALUE"
+};
+
+function AttributeTypeUtil () {}
+
/**
* returns the required contentType for the given attribute type
*
@@ -364,7 +343,7 @@ $AttributeTypes.KEYWORD = {
* (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
* @return {String} the contentType for the attribute
*/
-$AttributeTypes.getContentType = function (pAttributeType)
+AttributeTypeUtil.getContentType = function (pAttributeType)
{
if (pAttributeType in $AttributeTypes)
return $AttributeTypes[pAttributeType].contentType;
@@ -378,7 +357,7 @@ $AttributeTypes.getContentType = function (pAttributeType)
* (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
* @return {String} the field for the attribute
*/
-$AttributeTypes.getEntityField = function (pAttributeType)
+AttributeTypeUtil.getEntityField = function (pAttributeType)
{
if (pAttributeType in $AttributeTypes)
return $AttributeTypes[pAttributeType].entityField;
@@ -392,7 +371,7 @@ $AttributeTypes.getEntityField = function (pAttributeType)
* (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
* @return {String} the database field for the attribute
*/
-$AttributeTypes.getDatabaseField = function (pAttributeType)
+AttributeTypeUtil.getDatabaseField = function (pAttributeType)
{
if (pAttributeType in $AttributeTypes)
return $AttributeTypes[pAttributeType].databaseField;
@@ -406,9 +385,46 @@ $AttributeTypes.getDatabaseField = function (pAttributeType)
* (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
* @return {String} the name the attribute
*/
-$AttributeTypes.getName = function (pAttributeType)
+AttributeTypeUtil.getName = function (pAttributeType)
{
if (pAttributeType in $AttributeTypes)
return translate.text($AttributeTypes[pAttributeType].displayName);
return null;
}
+
+AttributeTypeUtil._initTypeColumnData = function ()
+{
+ columns = [];
+ typeColumnMap = {};
+ for (let type in $AttributeTypes)
+ {
+ type = $AttributeTypes[type];
+ if (type.databaseField)
+ {
+ var typeKey = type.toString();
+ var colIndex = columns.indexOf(type.databaseField);
+ if (colIndex == -1)
+ {
+ colIndex = columns.length;
+ columns.push(type.databaseField);
+ }
+ typeColumnMap[typeKey] = colIndex;
+ }
+ }
+ this._allDBColumns = columns;
+ this._typeColumnMap = typeColumnMap;
+}
+
+AttributeTypeUtil.getAllDatabaseFields = function ()
+{
+ if (this._allDBColumns == undefined)
+ AttributeTypeUtil._initTypeColumnData();
+ return this._allDBColumns;
+}
+
+AttributeTypeUtil.getTypeColumnIndex = function (pAttributeType)
+{
+ if (this._typeColumnMap == undefined)
+ AttributeTypeUtil._initTypeColumnData();
+ return this._typeColumnMap[pAttributeType.trim()];
+}
diff --git a/process/Communication_lib/process.js b/process/Communication_lib/process.js
index 33a5d044fb16c09823f4abcb86688421c89ea2ab..b5b4799da1f558a508bca8c43b57f6c09e3c93bb 100644
--- a/process/Communication_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -187,7 +187,7 @@ CommValidationUtil.makeValidationFn = function (commCategory)
switch (commCategory) {
case "EMAIL":
callbackFn = function (addrValue){
- if (!mail.isValidMailAddress(addrValue)) //TODO: enable JDito-methods
+ if (!mail.isValidMailAddress(addrValue, true)) //TODO: enable JDito-methods
return translate.text("no valid mail-address format");
return null;
}
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 058f498fa6c9b9fbff0404cc52c957ee07fc974c..a2480fc3437ee723677644de79d322af03cdda1a 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.translate");
import("system.project");
import("system.vars");
diff --git a/process/Data_lib/process.js b/process/Data_lib/process.js
index 30578840a56c5a92b46b057ae63ec7affdb7cd29..f61e69c016b751cb6c849e090b1563efe5a9ee15 100644
--- a/process/Data_lib/process.js
+++ b/process/Data_lib/process.js
@@ -111,7 +111,7 @@ ReferencingData.prototype.addArray = function(pData)
*
* @param {String} pUid the id of the row
* @param {String} pParentId the parentId of the row
- * @param {String} pData the data
+ * @param {Array} pData the data
* @return {ReferencingData} this
*/
ReferencingData.prototype.add = function(pUid, pParentId, pData)
@@ -294,7 +294,7 @@ DataTree.prototype.getTreeObject = function()
*
* @param {String} pUid the id of the row
* @param {String} pParentId the parentId of the row
- * @param {String} pData the data
+ * @param {Array} pData the data
* @param {DataTree~manipulateNode} [pManipulateNodeFn=undefined] callback for manipulating the Node. Attention: Use with caution. You can corrupt the tree.
* @return {DataTree} this
*/
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 6cf2ac0f1641836470f3adc8b34c6306761ba91d..ef2ffc8cce809ab59037685c7007be611fc7cab6 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -348,6 +348,25 @@ OfferUtils.copyToOrder = function (pOfferId, pSalesprojectId, pContactId, pLangu
neon.openContext("Order", null, null, neon.OPERATINGSTATE_NEW, params);
}
+/**
+ * gets the title of an offer from the id
+ *
+ * @param pOfferId {String} offer-id
+ *
+ * @return {String} offer title
+ */
+OfferUtils.getOfferTitleById = function (pOfferId)
+{
+ if (!pOfferId)
+ return "";
+ var offerNumber = db.array(db.ROW, SqlCondition.begin()
+ .andPrepare("OFFER.OFFERID", pOfferId)
+ .buildSql("select OFFERCODE, VERSNR from OFFER"));
+ return offerNumber.length > 0
+ ? translate.text("Offer") + " " + offerNumber.join("-")
+ : "";
+}
+
/******************************************************************************/
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 33c29bed91e7e06274fb6acb36c78b445aa03ca3..99a29735c11b6866fa20079f8846c6fcaeded0d3 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -27,7 +27,7 @@ function ProductUtils() {}
*
* @example productUtils.getCurrentProductPrice(vars.get("$field.PRODUCTID"), "PP")
*
- * @return {String} currently valid product price
+ * @return {Array[]} currently valid product price with currency: [price, "CURRENCY"] or [] if no price found
*/
ProductUtils.getCurrentProductPrice = function(pid, buySell) {
if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
@@ -36,20 +36,19 @@ ProductUtils.getCurrentProductPrice = function(pid, buySell) {
var actualPriceCondition = SqlCondition.begin()
.andPrepare("PRODUCTPRICE.BUYSELL", buySell)
.andPrepare("PRODUCTPRICE.PRODUCT_ID", pid)
- .andPrepare("PRODUCTPRICE.CURRENCY", 1) // TODO: warum ist Currency hardgecoded auf 1?? --> Einheitliche Währungen einbauen (auch zeichen vor oder nach der zahel, etc.)
.andPrepare("PRODUCTPRICE.VALID_FROM", today, "# <= ?")
.andSqlCondition(SqlCondition.begin()
.orPrepare("PRODUCTPRICE.VALID_TO", today, "# >= ?")
.or("PRODUCTPRICE.VALID_TO is null"), "1 = 2");
var productPriceData = db.array(db.ROW, actualPriceCondition.buildSql("select PRICE, CURRENCY from PRODUCTPRICE", "1 = 2", "order by VALID_FROM desc"));
-
+
if (productPriceData[0] && productPriceData[1])
- return productPriceData[0] + " " + KeywordUtils.getViewValue($KeywordRegistry.currency(), productPriceData[1]);
+ return [productPriceData[0], KeywordUtils.getViewValue($KeywordRegistry.currency(), productPriceData[1])];
else
- return "";
+ return [];
} else {
- return "";
+ return [];
}
}
diff --git a/report/RPTJ_OFFER/reportData.jrxml b/report/RPTJ_OFFER/reportData.jrxml
index 5ec99598ff792d80e04f6bf6c47bbeaa33708d1a..eb3f94233e15c3ef7e83778cb2158003ea1b2a37 100644
--- a/report/RPTJ_OFFER/reportData.jrxml
+++ b/report/RPTJ_OFFER/reportData.jrxml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
- <property name="ireport.zoom" value="1.771561000000001"/>
+ <property name="ireport.zoom" value="1.4641000000000006"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="0"/>
+ <property name="ireport.y" value="75"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Pos" class="java.lang.String"/>
<parameter name="Artikelbezeichnung" class="java.lang.String"/>
@@ -24,7 +24,7 @@
<parameter name="OFFERDel" class="java.lang.String"/>
<parameter name="AD_Name" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\Users\\a.voegl\\Documents\\AditoProjects\\xRM-Basic 2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\Entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
@@ -125,7 +125,7 @@
</textField>
</band>
<band height="20">
- <textField>
+ <textField isStretchWithOverflow="true">
<reportElement x="20" y="0" width="535" height="20" uuid="8d10af04-82a4-4344-ae98-de42c82a674e"/>
<textElement>
<font fontName="Segoe UI" size="8"/>