diff --git a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
index 7d0ae33708ceeb3ebe7cb1d2abfba943e2ab862b..9e9a4d6125d879ef8fdae6a6a34b2549ab017f47 100644
--- a/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
+++ b/application/_____SYSTEM_APPLICATION/_____SYSTEM_APPLICATION.aod
@@ -1,17 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.1.8">
- <name>_____SYSTEM_APPLICATION</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode name="_____SYSTEM_COMPANY" kind="200">
- <node name="Group" kind="123" title="">
- <node name="Group2" kind="123" title="">
- <node name="Util_lib" kind="103" />
- <node name="INTERNAL_ADMINISTRATOR" kind="159" />
- </node>
- </node>
- </entityNode>
- <company>
- <name>company</name>
- <backgroundColor v="0xff83cbd8" />
- </company>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.1.8">
+ <name>_____SYSTEM_APPLICATION</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+ <company>
+ <name>company</name>
+ <backgroundColor v="0xff83cbd8" />
+ </company>
+</application>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index be409330d53def37793e2e0c360ff2aad8aa61c6..bf6bac7e1b76d842c6774c8da6d4540b43122a85 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -10,9 +10,11 @@
</entityProvider>
<entityField>
<name>ACTIVITYLINKID</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
+ <title>Object type</title>
<consumer>Contexts</consumer>
<linkedContext>Context</linkedContext>
<displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
@@ -22,22 +24,12 @@
<title>Beziehung</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+ <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ACTIVITY_ID</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js</valueProcess>
</entityField>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <triggerRecalculation v="true" />
- <description>PARAMETER</description>
- </entityParameter>
<entityProvider>
<name>Link</name>
<fieldType>DEPENDENCY_IN</fieldType>
@@ -54,11 +46,7 @@
</dependencies>
<children>
<entityParameter>
- <name>ObjectRowid_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
+ <name>ActivityId_param</name>
<expose v="true" />
</entityParameter>
</children>
@@ -88,6 +76,11 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityParameter>
+ <name>ActivityId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js b/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d7f987d124710e6e2987bac550e6c8b6eaaa119
--- /dev/null
+++ b/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.ActivityId_param"))
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js b/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..86ef789e064a4016f2d12c432498dc23474807aa
--- /dev/null
+++ b/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js b/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4bec272246cb114439a2de8479cbfa9c9feebfe7
--- /dev/null
+++ b/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Context_lib");
+
+if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
+ result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
index af5991c0cd552dd6b51fe8b99cf7e95139c84c5f..f5f56bc8bb2e41b4b3a1e60bba4cbde45f4a1e05 100644
--- a/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
@@ -1,10 +1,13 @@
+import("system.logging");
+import("system.vars");
import("system.db");
import("system.result");
import("Sql_lib");
+logging.log("GET: " + vars.get("$param.ActivityId_param"))
+
var cond = SqlCondition.begin()
- .andPrepareVars("ACTIVITYLINK.OBJECT_ROWID", "$param.ObjectRowid_param")
- .andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectType_param");
+ .andPrepareVars("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param");
//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
+result.string(db.translateCondition(cond.build("1 = 0")));
\ No newline at end of file
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 25ce4df92392e1a5e8c8847f16471593fb1baefd..828a597ae73aeafbac92a6672f086282ec65d4be 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -147,7 +147,6 @@
</entityField>
<entityParameter>
<name>ActivityId_param</name>
- <expose v="true" />
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
@@ -184,12 +183,9 @@
</dependency>
<children>
<entityParameter>
- <name>ObjectRowid_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objectrowid_param/code.js</code>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/objecttype_param/code.js</code>
+ <name>ActivityId_param</name>
+ <code>%aditoprj%/entity/Activity_entity/entityfields/links/children/activityid_param/code.js</code>
+ <expose v="true" />
</entityParameter>
</children>
</entityConsumer>
@@ -238,6 +234,24 @@
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>207920cd-b4b8-4f40-b6c4-6e25d4df9947</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b086fbf7-aa94-441f-a33c-e2ca8eda5dcd</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>00b4f354-5b82-4071-b70c-acab4780a2de</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Activity_entity/entityfields/links/children/activityid_param/code.js b/entity/Activity_entity/entityfields/links/children/activityid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..a8267b62060b4bd30cedaba4713f4421a6e6f9ff
--- /dev/null
+++ b/entity/Activity_entity/entityfields/links/children/activityid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index 54c6e810026576c01cf069b5170c47972ab83fa5..7cecd3b427054a5a7558dcc24adaf976c33bc034 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -2,8 +2,5 @@ import("system.vars");
import("system.result");
import("Keyword_lib");
-var histMedium;
-histMedium = vars.get("$field.CATEGORY");
-if (histMedium){
- result.string(vars.get("$field.SUBJECT") + " (" + LegacyKeywordUtils.getViewValue("ACTIVITY.CATEGORY", histMedium) + ")");
-}
\ No newline at end of file
+var histMedium = vars.get("$field.CATEGORY");
+result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + LegacyKeywordUtils.getViewValue("ACTIVITY.CATEGORY", histMedium) + ")" : ""));
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index f8ca95a041f3a052a2e375692dcaa0bdf90d52f3..9c8391b37c47aa5a3d88d8d58f8d5b59760f8470 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -9,6 +9,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
var activityLinkCond = SqlCondition.begin().andPrepareVars("ACTIVITYLINK.OBJECT_ROWID", "$param.RowId_param")
.andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
+ // TODO: more performant way than IN. Maybe a join??
cond.and(db.translateStatement(activityLinkCond.buildSql("ACTIVITY.ACTIVITYID in (select ACTIVITYLINK.ACTIVITY_ID from ACTIVITYLINK", "1=2", ")")))
}
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index d2e1ef75a8f1596e6efed00651911617de158eed..404193668657a52c874035b82c351e95ce13806b 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -115,16 +115,11 @@
</entityField>
<entityField>
<name>UID</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/uid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ATTENDEESLENGTH</name>
</entityField>
- <entityField>
- <name>LINKOBJECT</name>
- <title>Linkobject</title>
- <consumer>Objects</consumer>
- <linkedContext>Object</linkedContext>
- </entityField>
<entityField>
<name>ICON</name>
</entityField>
@@ -187,12 +182,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>LINKTYPE</name>
- <title>Linktype</title>
- <consumer>Contexts</consumer>
- <linkedContext>Context</linkedContext>
- </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Appointment_entity/entityfields/uid/valueProcess.js b/entity/Appointment_entity/entityfields/uid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..85c485a5e49ef24d8752fb4bc217ed12223c1ca3
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/uid/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.util");
+
+if(!(vars.get("$field.UID")))
+ result.string(util.getNewUUID());
+else
+ result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 3578214cbac67af0c73eefba164dd0f65b00e198..e014c096bd5a961e40db0b8f38e6fd74e664adaf 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -34,7 +34,9 @@
<title>Value</title>
<contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/contentTypeProcess.js</contentTypeProcess>
<resolution>DAY</resolution>
+ <possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js</onValueChange>
</entityField>
<entityField>
@@ -57,6 +59,12 @@
<fieldName>AttributeChildren</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>ba8046ba-f58c-48f1-9c35-fe897247534a</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Attributes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
index 2449074c9672b85ce7ddec1e78cfce6710a1e7fb..4a159dc81d7a388e26c6fe81aeb554be0707f34b 100644
--- a/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/attribute_parent_id/possibleItemsProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Attribute_lib");
-result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param")));
+result.object(AttributeUtil.getPossibleAttributes(vars.get("$param.objectType_param"), true));
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a740c792ce459f70fa42d619de7ef61148d5e405
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js
@@ -0,0 +1,11 @@
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeType();
+
+if (attrType == $AttributeTypes.COMBO)
+ result.string(AttributeUtil.getSimpleAttributeName(vars.get("$field.ID_VALUE")));
+else
+ result.string(vars.get("$field.ATTRIBUTERELATION_VALUE"));
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..41294703389058f527824cabc768946894055718
--- /dev/null
+++ b/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js
@@ -0,0 +1,18 @@
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+import("Sql_lib");
+
+var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
+var attrType = AttributeHandler.begin(attributeId).getAttributeType();
+
+if (attrType == $AttributeTypes.COMBO)
+{
+ var valueSql = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId)
+ .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
+ .buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE");
+ var valueList = db.table(valueSql);
+ result.object(valueList);
+}
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
index 334477e1aa56d1d19d6d61d6dcd1df3036a602b5..737c6e3a51228fc8f0e69135a0c87bd2e46cdbfe 100644
--- a/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
@@ -1,28 +1,28 @@
-import("system.result");
-import("system.vars");
-import("Attribute_lib");
-
-var attrField = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeField();
-
-if (attrField != null) //load the value from the correct field for the type
-{
- switch (attrField)
- {
- case "CHAR_VALUE":
- result.string(vars.get("$field.CHAR_VALUE"));
- break;
- case "DATE_VALUE":
- result.string(vars.get("$field.DATE_VALUE"));
- break;
- case "NUMBER_VALUE":
- result.string(vars.get("$field.NUMBER_VALUE"));
- break;
- case "BOOL_VALUE":
- result.string(vars.get("$field.BOOL_VALUE"));
- break;
- case "ID_VALUE":
- result.string(vars.get("$field.ID_VALUE"));
- break;
- }
-
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeType();
+
+if (attrType != null) //load the value from the correct field for the type
+{
+ switch (attrType)
+ {
+ case $AttributeTypes.TEXT.toString():
+ result.string(vars.get("$field.CHAR_VALUE"));
+ break;
+ case $AttributeTypes.DATE.toString():
+ result.string(vars.get("$field.DATE_VALUE"));
+ break;
+ case $AttributeTypes.NUMBER.toString():
+ result.string(vars.get("$field.NUMBER_VALUE"));
+ break;
+ case $AttributeTypes.BOOLEAN.toString():
+ result.string(vars.get("$field.BOOL_VALUE"));
+ break;
+ case $AttributeTypes.COMBO.toString():
+ result.string(vars.get("$field.ID_VALUE"));
+ break;
+ }
+
}
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 6a7b1297888bd82a331f6c1d6f8417112012f9ba..19200a77d9fa5e23d745fab789b98709c7f8c658 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -5,6 +5,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
<iconId>VAADIN:TAG</iconId>
+ <titleProcess>%aditoprj%/entity/Attribute_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
@@ -22,6 +23,9 @@
<title>Type</title>
<consumer>KeywordAttributeType</consumer>
<mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>AB_ATTRIBUTEID</name>
@@ -32,7 +36,6 @@
<title>Parent Attribute</title>
<consumer>AttributeChildren</consumer>
<linkedContext>Attribute</linkedContext>
- <groupable v="true" />
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js</displayValueProcess>
@@ -53,12 +56,6 @@
<triggerRecalculation v="true" />
<mandatory v="false" />
</entityParameter>
- <entityParameter>
- <name>attributeLevel_param</name>
- <code>%aditoprj%/entity/Attribute_entity/entityfields/attributechildren/children/attributelevel_param/code.js</code>
- <triggerRecalculation v="true" />
- <mandatory v="false" />
- </entityParameter>
</children>
</entityConsumer>
<entityProvider>
@@ -124,11 +121,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityParameter>
- <name>attributeLevel_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
<entityField>
<name>ATTRIBUTE_LEVEL</name>
<title>Level</title>
diff --git a/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
index 5098441456e49ebb7530ad34d47f27c41b925849..1c37c30f461e97c9b5efb040f290f762fefc2166 100644
--- a/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_level/valueProcess.js
@@ -1,10 +1,16 @@
+import("system.db");
import("system.neon");
import("system.result");
import("system.vars");
+import("Sql_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- if (vars.exists("$param.attributeLevel_param") && vars.get("$param.attributeLevel_param")
- && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
- result.string(parseInt(vars.get("$param.attributeLevel_param")) + 1);
+ if (vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+ {
+ var level = db.cell(SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", vars.get("$field.ATTRIBUTE_PARENT_ID"))
+ .buildSql("select ATTRIBUTE_LEVEL from AB_ATTRIBUTE"));
+ result.string(parseInt(level) + 1);
+ }
else
result.string("0");
diff --git a/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js b/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
index 25d46bcaae41773ca9f297c7dbad700b2298a7cc..bb5f44d124ef66e4da13d4e661679b6e1b003a11 100644
--- a/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_name/displayValueProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Attribute_lib");
-result.string(AttributeUtil.getAttributeNameById(vars.get("$field.AB_ATTRIBUTEID")));
\ No newline at end of file
+result.string(AttributeUtil.getFullAttributeName(vars.get("$field.AB_ATTRIBUTEID")));
diff --git a/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js b/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js
index 24c340a034a026f42e40928fa7713e86dac60cb8..1777b7dcc56af3c224587cb52fe84df5cadffa92 100644
--- a/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js
+++ b/entity/Attribute_entity/entityfields/attribute_parent_id/displayValueProcess.js
@@ -1,9 +1,5 @@
-import("system.neon");
import("system.result");
import("system.vars");
import("Attribute_lib");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
- result.string(AttributeUtil.getAttributeNameById(vars.get("$param.attrParentId_param")));
-else
- result.string(AttributeUtil.getAttributeNameById(vars.get("$field.ATTRIBUTE_PARENT_ID")))
\ No newline at end of file
+result.string(AttributeUtil.getSimpleAttributeName(vars.get("$field.ATTRIBUTE_PARENT_ID")))
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js b/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..619f63d8dcc79bb835afdf13e9704898dcae4d84
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js
@@ -0,0 +1,13 @@
+import("system.db");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+import("Keyword_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+{
+ var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
+ if (type == $AttributeTypes.COMBO)
+ result.string(KeywordUtils.getViewValue($KeywordRegistry.get.AttributeType, $AttributeTypes.COMBOVALUE));
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b768fb2fba7336e45a6e5c99d6224d9e623d4e5b
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.db");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+{
+ var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
+ if (type == $AttributeTypes.COMBO)
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js b/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..149d8d0591e67a669d9fc78572350775da9c1850
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.db");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.ATTRIBUTE_PARENT_ID") != "")
+{
+ var type = AttributeHandler.begin(vars.get("$field.ATTRIBUTE_PARENT_ID")).getAttributeType();
+ if (type == $AttributeTypes.COMBO)
+ result.string($AttributeTypes.COMBOVALUE);
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributechildren/children/attributelevel_param/code.js b/entity/Attribute_entity/entityfields/attributechildren/children/attributelevel_param/code.js
deleted file mode 100644
index 5790e0cc445659af95e472d70969cf8ac3d0394a..0000000000000000000000000000000000000000
--- a/entity/Attribute_entity/entityfields/attributechildren/children/attributelevel_param/code.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.getString("$field.ATTRIBUTE_LEVEL"));
\ 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 58f3a0fedf29dab04eb8575c9e82442d575b39fe..b63cf032dd51caa4b6896e89b5bdaafcf4d01a07 100644
--- a/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js
+++ b/entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/code.js
@@ -2,7 +2,8 @@ import("system.vars");
import("system.result");
import("Attribute_lib");
-if (vars.getString("$field.ATTRIBUTE_TYPE").trim() == AttributeTypes.GROUP)
+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("");
diff --git a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
index 8b53a13f9cfd7a1ff4f7e4cee0eba93aa551fb4e..bdd0ea7449ed0bd35470a8ac8dffb388034951c6 100644
--- a/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Attribute_entity/recordcontainers/db/conditionProcess.js
@@ -2,28 +2,13 @@ import("system.db");
import("system.vars");
import("system.result");
import("Sql_lib");
+import("Attribute_lib");
-var condition = "1=2";
+var condition = "AB_ATTRIBUTE.ATTRIBUTE_TYPE = '" + $AttributeTypes.GROUP + "'";
if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
- condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
+ condition = "AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + AttributeUtil.getAllChildren(vars.getString("$param.attrParentId_param")).join("','") + "')";
else if (vars.get("$param.attrParentId_param") !== "")
condition = "";
result.string(condition);
-
-function getAllChildren (pAttributeId)
-{
- var childIds = [];
- var attributes= [pAttributeId];
- while (attributes.length > 0)
- {
- attributes = db.array(db.COLUMN, SqlCondition.begin()
- .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
- .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
- );
- if (attributes.length > 0)
- childIds = childIds.concat(attributes);
- }
- return childIds;
-}
diff --git a/entity/Attribute_entity/recordcontainers/db/onDBDelete.js b/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
index 504e2d5e4f82c9ccbdeb7b380f546003c3f5f9a8..7d1eb8b477436101b8cacb2fa7aa00241708adae 100644
--- a/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Attribute_entity/recordcontainers/db/onDBDelete.js
@@ -1,11 +1,29 @@
import("system.vars");
import("system.db");
import("Sql_lib");
+import("Attribute_lib");
var attributeId = vars.get("$field.AB_ATTRIBUTEID");
-var usageCondition = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", attributeId)
+
+var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
+
+var condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
.build();
//delete all entries in AB_ATTRIBUTEUSAGE belonging to the attribute to avoid unrelated entries
-db.deleteData("AB_ATTRIBUTEUSAGE", usageCondition);
\ No newline at end of file
+db.deleteData("AB_ATTRIBUTEUSAGE", condition);
+
+condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
+ .build();
+
+//delete all entries in AB_ATTRIBUTERELATION for the attributes
+db.deleteData("AB_ATTRIBUTERELATION", condition);
+
+condition = SqlCondition.begin()
+ .and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + childIds.join("','") + "')")
+ .build();
+
+//delete all attribute children
+db.deleteData("AB_ATTRIBUTE", condition);
diff --git a/entity/Attribute_entity/titleProcess.js b/entity/Attribute_entity/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09b4ecb2cceec0f6d09f3b1bd72c2fe60aba970d
--- /dev/null
+++ b/entity/Attribute_entity/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ATTRIBUTE_NAME"));
\ No newline at end of file
diff --git a/entity/Communication_entity/entityfields/communicationid/valueProcess.js b/entity/Communication_entity/entityfields/communicationid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..86ef789e064a4016f2d12c432498dc23474807aa
--- /dev/null
+++ b/entity/Communication_entity/entityfields/communicationid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 63e27f36ce46b52a027faca288afabb2cb5ea5ab..028d790dd26fa08b59c9e9fcb010c6ebaf5745f7 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -138,6 +138,10 @@
<name>RowId_param</name>
<code>%aditoprj%/entity/Contract_entity/entityfields/activities/children/rowid_param/code.js</code>
</entityParameter>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <code>%aditoprj%/entity/Contract_entity/entityfields/activities/children/objectid_param/code.js</code>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -255,6 +259,13 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/activities/children/objectid_param/code.js b/entity/Contract_entity/entityfields/activities/children/objectid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Contract_entity/entityfields/activities/children/objectid_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/contractcode_display_fieldgroup/valueProcess.js b/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
index 3b3d5b96c09bae19240fbc0866f31943de579664..279ddaaf279e54233680dea48d9937503f0d530b 100644
--- a/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
+++ b/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js
@@ -1,8 +1,9 @@
+import("system.translate");
import("system.vars");
import("system.result");
import("Keyword_lib");
-var cType = vars.get("$field.CONTRACTTYPE");
-var cCode = vars.get("$field.CONTRACTCODE");
+var contractType = KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, vars.get("$field.CONTRACTTYPE"));
+var contractCode = vars.get("$field.CONTRACTCODE");
-result.string(KeywordUtils.getViewValue($KeywordRegistry.get.ContractType, cType) + " " + cCode);
\ No newline at end of file
+result.string((contractType || translate.text("Contract")) + " " + contractCode);
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/newactivity/onActionProcess.js b/entity/Contract_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5d64774798acd58cd8c536f765182b5e9e94b7ff
--- /dev/null
+++ b/entity/Contract_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.CONTRACTID"));
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index fdd488929f2c9efe1a5c92d4203b7dda93896f4d..a2760d94b9e9fa63f40d7530dc57c8ca2fc7a793 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -62,6 +62,7 @@
<fieldType>ACTION</fieldType>
<onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
+ <isSelectionAction v="true" />
<iconId>VAADIN:DOWNLOAD</iconId>
</entityActionField>
</children>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index 26a3cc11148f4c3ba051ee2c16769f3199f9af9c..e1079bb8c8e2765881abf59cddf9d4dcee1d8f8d 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -92,6 +92,7 @@
<name>db</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBDelete>%aditoprj%/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>bd113d67-34ab-4708-b0e5-60a44332e6b8</name>
diff --git a/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js b/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..106ba3d52cf62b33fe39087d4a893ea7821b9462
--- /dev/null
+++ b/entity/KeywordAttribute_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,5 @@
+import("Sql_lib");
+import("system.db");
+
+var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID", "$field.AB_KEYWORD_ATTRIBUTEID").build("1=2");
+db.deleteData("AB_KEYWORD_ATTRIBUTERELATION", cond);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 12810a620803ccce6baa9a5eaaea76321c083bd7..adb09f7075ebb0a12c7a89f7ee6808487ac126a7 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -22,6 +22,8 @@
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>AB_KEYWORD_ENTRYID</name>
@@ -30,10 +32,13 @@
</entityField>
<entityField>
<name>KEYID</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc</documentation>
<title>Key</title>
+ <mandatory v="true" />
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js</onValidation>
</entityField>
<entityField>
<name>TITLE</name>
@@ -44,7 +49,7 @@
<name>SORTING</name>
<documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc</documentation>
<title>Sorting</title>
- <mandatory v="true" />
+ <mandatory v="false" />
<state>AUTO</state>
</entityField>
<entityField>
@@ -384,7 +389,7 @@
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBUpdate>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>52acbfe0-57f4-4614-83af-9882e168f431</name>
diff --git a/entity/KeywordEntry_entity/entityfields/container/documentation.adoc b/entity/KeywordEntry_entity/entityfields/container/documentation.adoc
index b46aaac93ed420d5150d4d5202dc302a4898ca70..e1cfb215ac798637843c387c914479f4428e301a 100644
--- a/entity/KeywordEntry_entity/entityfields/container/documentation.adoc
+++ b/entity/KeywordEntry_entity/entityfields/container/documentation.adoc
@@ -1 +1,2 @@
- `CONTAINER` is the a name and used for grouping keyword-entries. This is was a keyword-container essentially is.
\ No newline at end of file
+ `CONTAINER` is the a name and used for grouping keyword-entries. This is was a keyword-container essentially is.
+After creation of an entry it cannot be changed anymore.
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/container/stateProcess.js b/entity/KeywordEntry_entity/entityfields/container/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82fc64847e6ac4e59a674fac7873eef6161aa741
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/container/stateProcess.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+/*allowing the CONTAINER to change later would result in a lot of problems like
+ * - what happens to SORTING-value?
+ * - what happens with already created keyword-attributerelations?
+ * - what happens when a key is specified twice after the change?
+ * - what happens when the keywordentry has been already used?
+ *
+ * Therefore just forbid to change it after the record has been inserted
+ */
+var fieldState;
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ fieldState = neon.COMPONENTSTATE_AUTO;
+else
+ fieldState = neon.COMPONENTSTATE_READONLY;
+
+result.string(fieldState);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc b/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..543e079982a272d1ea3414231414004150915df5
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc
@@ -0,0 +1,7 @@
+The key of an keyword-entry is a internal, technical representation which is stored in references.
+It's unique within a keyword-container but not within the whole keyword-module (like the `AB_KEYWORD_ENTRYID` is).
+
+A UUID is generated and used as preset-value but it's possible to overwrite the `KEYID` with an own value (as long as the custom key follows the rules, like keyword-entry-level-uniqueness)
+This could for example be ISO-standardised value or a value that is maintained within an ERP-system.
+
+After creation of an entry it cannot be changed anymore.
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js b/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..a0830f5196463702be757aa76d46e9b3d3c1c8f4
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js
@@ -0,0 +1,26 @@
+import("system.translate");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+import("Entity_lib");
+
+var container = vars.get("$field.CONTAINER");
+var keyId = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.KEYID")).trim();
+
+//a KEY has always to be unique within one container and since the user can specify the key on insert we've to ensure that it's unique
+if (container && keyId)
+{
+ var selfEntryId = vars.get("$field.AB_KEYWORD_ENTRYID");
+ var sqlMasks = new SqlMaskingUtils();
+ var alreadyExistsSql = SqlCondition.begin()
+ .andPrepare(sqlMasks.trim("AB_KEYWORD_ENTRY.KEYID"), keyId, null, SqlUtils.getSingleColumnType("AB_KEYWORD_ENTRY", "KEYID"))
+ .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", container)
+ .andPrepare("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", selfEntryId, "# != ?")
+ .buildSql("select AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID from AB_KEYWORD_ENTRY");
+ var alreadyExistantEntryId = db.cell(alreadyExistsSql);
+
+ if (alreadyExistantEntryId != "")
+ result.string(translate.text("the specified key has to be unique for that container but does already exist"));
+
+}
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js b/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js
index 4af99287f59a86e98d9b4c552c010fe13c106cc7..2fc41228ab188dc70af71478adb1d1afd7c1cb77 100644
--- a/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js
+++ b/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js
@@ -3,5 +3,5 @@ import("system.result");
import("system.neon");
import("system.vars");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc b/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc
index d999d0a3d2509691a8f9c2d9830044cbd690218a..6fa05d6250b840da77653b9ab5cc4c40440185e1 100644
--- a/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc
+++ b/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc
@@ -2,5 +2,6 @@ Used for sorting keyword-entries within a keyword-container.
[NOTE]
====
-Currently this cannot be set (it's *READONLY*) - the value is generated automatically. Reserved for future use.
+Currently this field can be edited - the value is generated automatically on save if the value has not been set by the user.
+For future implementations this behavior may change (sorting may be done by drag and drop or similar)
====
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js b/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..5770e446a9d339b5e4aa822f225fa0d36bd3a4ac
--- /dev/null
+++ b/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,5 @@
+import("Sql_lib");
+import("system.db");
+
+var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID", "$field.AB_KEYWORD_ENTRYID").build("1=2");
+db.deleteData("AB_KEYWORD_ATTRIBUTERELATION", cond);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js b/entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js
deleted file mode 100644
index d9f8978acd6592e20a2851d1e46b490b2ff398d7..0000000000000000000000000000000000000000
--- a/entity/KeywordEntry_entity/recordcontainers/db/onDBUpdate.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.vars");
-import("system.text");
-import("system.neon");
-import("Sql_lib");
-
-var changedFields = vars.get("$local.changed");
-//whenever the container is changed data that depends on the keyword-container has be "fixed" to keep consistency
-//this could be information like Keyword-attributes or the sorting-position
-// TODO: maybe it'd be better to lock KeywordContainer as read-only after creation
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && changedFields.indexOf("AB_KEYWORD_ENTRY.CONTAINER") > -1)
-{
- var keyContainer = vars.get("$field.CONTAINER");
- if (keyContainer)
- {
- var cond = SqlCondition.begin().andPrepare("AB_KEYWORD_ENTRY.CONTAINER", keyContainer);
- var maskingHelper = new SqlMaskingUtils();
- var newCodeNumber = db.cell(cond.buildSql("select " + maskingHelper.max("AB_KEYWORD_ENTRY.SORTING") + " from AB_KEYWORD_ENTRY", "1 = 2"));
- newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
- if (isNaN(newCodeNumber))
- throw new TypeError(translate.text("The code number is not a valid number."));
-
- var cols = ["SORTING"];
- var vals = [++newCodeNumber];
- cond.clear().andPrepare("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", vars.get("$sys.uid"));
- db.updateData("AB_KEYWORD_ENTRY", cols, null, vals, cond.build("1 = 2"));
- }
-}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/ObjectRelation_entity.aod b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
index 0415c0ddb35f76b323109a18556eeca9b461b035..7962870d76d7b67f7f3d91d16bb3a4a301c3cc2d 100644
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -40,7 +40,9 @@
<linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<stateProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT2_TYPE</name>
@@ -153,6 +155,14 @@
<targetIdField>OBJECT2_ROWID</targetIdField>
<documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/bothobjects/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>cb49ee3d-4497-4edc-90b6-82d397464f75</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>TaskObjectRelations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
<children>
<entityParameter>
<name>AnyObjectRowid_param</name>
@@ -165,7 +175,7 @@
<entityParameter>
<name>Object1Rowid_param</name>
<expose v="true" />
- <mandatory v="true" />
+ <mandatory v="false" />
</entityParameter>
<entityParameter>
<name>Object1Type_param</name>
@@ -175,7 +185,7 @@
<entityParameter>
<name>Object2Rowid_param</name>
<expose v="true" />
- <mandatory v="true" />
+ <mandatory v="false" />
</entityParameter>
<entityParameter>
<name>Object2Type_param</name>
@@ -211,8 +221,8 @@
<entityProvider>
<name>AnyObject</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <targetContextField>AnyTargetType</targetContextField>
- <targetIdField>AnyTargetRowid</targetIdField>
+ <targetContextField>AnyObjectType</targetContextField>
+ <targetIdField>AnyObjectRowid</targetIdField>
<documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobject/documentation.adoc</documentation>
<recordContainer>db</recordContainer>
<dependencies>
@@ -311,12 +321,25 @@
</children>
</entityConsumer>
<entityField>
- <name>AnyTargetRowid</name>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js</valueProcess>
+ <name>AnyObjectRowid</name>
+ <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjectrowid/documentation.adoc</documentation>
+ <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjectrowid/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjectrowid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>AnyObjectType</name>
+ <documentation>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjecttype/documentation.adoc</documentation>
+ <groupable v="true" />
+ <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjecttype/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityParameter>
+ <name>Object2RowidTitle_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
<entityField>
- <name>AnyTargetType</name>
- <valueProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js</valueProcess>
+ <name>EMPTY</name>
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/ObjectRelation_entity/entityfields/anyobjectrowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..29b3c356fb8f351c572ff747316347964f3b279d
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Context_lib");
+
+if (vars.exists("$field.AnyObjectType") && vars.get("$field.AnyObjectType") && vars.exists("$field.AnyObjectRowid") && vars.get("$field.AnyObjectRowid"))
+{
+ result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.AnyObjectType"), vars.get("$field.AnyObjectRowid"))));
+}
diff --git a/entity/ObjectRelation_entity/entityfields/anyobjectrowid/documentation.adoc b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..336799b4617739da6a7435355cd9e7bde4e3650f
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/documentation.adoc
@@ -0,0 +1,3 @@
+This field is only filled when using the AnyObject Provider.
+
+Calculates the opposite side of the given AnyObject parameters.
diff --git a/entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js b/entity/ObjectRelation_entity/entityfields/anyobjectrowid/valueProcess.js
similarity index 100%
rename from entity/ObjectRelation_entity/entityfields/anytargetrowid/valueProcess.js
rename to entity/ObjectRelation_entity/entityfields/anyobjectrowid/valueProcess.js
diff --git a/entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca00da6bc37690b86ed4f22e84626869fba6984b
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anyobjecttype/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.project");
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$field.AnyObjectType") && vars.get("$field.AnyObjectType"))
+{
+ result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.AnyObjectType"))[1]);
+}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/anyobjecttype/documentation.adoc b/entity/ObjectRelation_entity/entityfields/anyobjecttype/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..fba180b53ae87bb36854010f09dbb75125fd3159
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/anyobjecttype/documentation.adoc
@@ -0,0 +1,3 @@
+This field is only filled when using the AnyObject Provider.
+
+Calculates the opposite side of the given AnyObject parameters.
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js b/entity/ObjectRelation_entity/entityfields/anyobjecttype/valueProcess.js
similarity index 86%
rename from entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js
rename to entity/ObjectRelation_entity/entityfields/anyobjecttype/valueProcess.js
index c8dd2fb8c6fc3fd7d0863719e63411aa5b4564de..8635bcb6845130b5780e8ee872af7afa2159b97d 100644
--- a/entity/ObjectRelation_entity/entityfields/anytargettype/valueProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/anyobjecttype/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.result");
import("system.vars");
@@ -14,11 +15,13 @@ if (vars.exists("$param.AnyObjectType_param") && vars.get("$param.AnyObjectType_
// anyObject and object 1 == opened object --> target is object2
if (vars.get("$field.OBJECT1_ROWID") == openedRowid && vars.get("$field.OBJECT1_TYPE") == openedType)
{
+ logging.log(vars.get("$field.OBJECT2_TYPE"))
result.string(vars.get("$field.OBJECT2_TYPE"));
}
// anyObject and object 2 == opened object --> target is object1
else if (vars.get("$field.OBJECT2_ROWID") == openedRowid && vars.get("$field.OBJECT2_TYPE") == openedType)
{
+ logging.log(vars.get("$field.OBJECT1_TYPE"))
result.string(vars.get("$field.OBJECT1_TYPE"));
}
}
diff --git a/entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js b/entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..04cbd7a32102a5efd583a0af62b1ce46ecebdbb7
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/object2_rowid/displayValueProcess.js
@@ -0,0 +1,14 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("system.db");
+import("Context_lib");
+
+var recordstate = vars.get("$sys.recordstate");
+if (recordstate == neon.OPERATINGSTATE_EDIT)
+{
+ if (vars.exists("$field.OBJECT1_ROWID") && vars.get("$field.OBJECT1_ROWID") && vars.exists("$field.OBJECT1_TYPE") && vars.get("$field.OBJECT1_TYPE"))
+ {
+ result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT1_TYPE"), vars.get("$field.OBJECT1_ROWID"))));
+ }
+}
\ No newline at end of file
diff --git a/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js b/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dc39a528c34c8e610d4f6f53ea6f83b98699f497
--- /dev/null
+++ b/entity/ObjectRelation_entity/entityfields/object2_rowid/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("Context_lib");
+result.string(vars.exists("$param.Object2RowidTitle_param") ? vars.get("$param.Object2RowidTitle_param") : "Object 2");
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 0fc9689963c7d1081dd517b6101e1993bf14e7a8..253537e5a0a76f854936e7acc7c5d5674cad9819 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -15,6 +15,8 @@
<name>CURRENCY</name>
<title>Currency</title>
<consumer>KeywordCurrencies</consumer>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OFFERCODE</name>
@@ -87,6 +89,7 @@
<name>HEADER</name>
<title>Cover letter</title>
<contentType>HTML</contentType>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>Offeritems</name>
@@ -181,12 +184,14 @@
<title>Language</title>
<consumer>Languages</consumer>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
</entityField>
<entityActionField>
- <name>newOffer</name>
+ <name>copyOffer</name>
<fieldType>ACTION</fieldType>
<title>Copy offer</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js</onActionProcess>
</entityActionField>
<entityField>
<name>VERSNR</name>
@@ -198,6 +203,7 @@
<entityField>
<name>OFFER_ID</name>
<documentation>%aditoprj%/entity/Offer_entity/entityfields/offer_id/documentation.adoc</documentation>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offer_id/valueProcess.js</valueProcess>
</entityField>
<entityFieldGroup>
<name>OfferCode_VersNr_fieldgroup</name>
@@ -229,10 +235,10 @@
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
- <name>offerReport</name>
+ <name>printOffer</name>
<fieldType>ACTION</fieldType>
- <title>Offer report</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/offerreport/onActionProcess.js</onActionProcess>
+ <title>Print Offer</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/onActionProcess.js</onActionProcess>
</entityActionField>
<entityField>
<name>CONTACT_ORG_ID</name>
@@ -313,6 +319,8 @@
<title>Address</title>
<description></description>
<contentType>LONG_TEXT</contentType>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/address/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>ChosenAddress</name>
@@ -383,6 +391,104 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
+ <title>Activities</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/activities/children/objectid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <code>%aditoprj%/entity/Offer_entity/entityfields/activities/children/rowid_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
+ <entityProvider>
+ <name>ContactOffers</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>OfferCurrency_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferLanguage_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferHeader_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferOriginal_Id_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferAddress_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCode_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferVersnr_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -391,6 +497,7 @@
<maximumDbRows v="0" />
<fromClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBInsert>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
diff --git a/entity/Offer_entity/entityfields/activities/children/objectid_param/code.js b/entity/Offer_entity/entityfields/activities/children/objectid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Offer_entity/entityfields/activities/children/objectid_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/Offer_entity/entityfields/activities/children/rowid_param/code.js b/entity/Offer_entity/entityfields/activities/children/rowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e9d96c53826855e51135a90c02ef5d82900fb815
--- /dev/null
+++ b/entity/Offer_entity/entityfields/activities/children/rowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.OFFERID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/address/valueProcess.js b/entity/Offer_entity/entityfields/address/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..160f9518edab8b5ed593d921661aada906512ee4
--- /dev/null
+++ b/entity/Offer_entity/entityfields/address/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferAddress_param"))
+{
+ result.string(vars.get("$param.OfferAddress_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4957b1ff844fb074b3ffd05533d1e75377f5b96d
--- /dev/null
+++ b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.neon");
+import("Offer_lib");
+
+var contactId = vars.getString("$field.CONTACT_ID");
+var currency = vars.getString("$field.CURRENCY");
+var language = vars.getString("$field.LANGUAGE");
+var header = vars.getString("$field.HEADER");
+var offerId = vars.getString("$field.OFFERID");
+
+OfferUtils.copyOffer(offerId, contactId, language, currency, header);
+
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/currency/displayValueProcess.js b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..251895de0caa384e595ac12282df6a3955093b04
--- /dev/null
+++ b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+
+if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
+{
+ var currency = KeywordUtils.getViewValue($KeywordRegistry.get.Currency, vars.get("$param.OfferCurrency_param"));
+ result.string(currency);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/currency/valueProcess.js b/entity/Offer_entity/entityfields/currency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..636be1adc9a7505eea4d957860d46a81856f5a93
--- /dev/null
+++ b/entity/Offer_entity/entityfields/currency/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
+{
+ result.string(vars.get("$param.OfferCurrency_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1dd2bbc6e368ccd25f363f47e8e86f6abceaa55
--- /dev/null
+++ b/entity/Offer_entity/entityfields/header/valueProcess.js
@@ -0,0 +1,7 @@
+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
diff --git a/entity/Offer_entity/entityfields/language/displayValueProcess.js b/entity/Offer_entity/entityfields/language/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..987df7556fbe55afa0152a52e1e8d4c766b4ce39
--- /dev/null
+++ b/entity/Offer_entity/entityfields/language/displayValueProcess.js
@@ -0,0 +1,15 @@
+import("system.db");
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param"))
+{
+ var iso3 = vars.get("$param.OfferLanguage_param");
+ var latinName = db.cell(SqlCondition.begin()
+ .andPrepare("AB_LANGUAGE.ISO3", iso3)
+ .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=0"));
+ latinName = translate.text(latinName);
+ result.string(latinName);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/language/valueProcess.js b/entity/Offer_entity/entityfields/language/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4fc924e18219f6a6b30f4b3ebb8ffb22d8ed3cb0
--- /dev/null
+++ b/entity/Offer_entity/entityfields/language/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param"))
+{
+ result.string(vars.get("$param.OfferLanguage_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newactivity/onActionProcess.js b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d93e51415984160000410db0d04359823d7ceaa4
--- /dev/null
+++ b/entity/Offer_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.OFFERID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js b/entity/Offer_entity/entityfields/newoffer/onActionProcess.js
deleted file mode 100644
index 1991c7036f76bc53bdb6c9ce2b6abe508001a7a1..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import("system.vars");
-import("system.neon");
-import("Util_lib");
-import("Neon_lib");
-import("Offer_lib");
-
-var InputMapping = {
-
- "OFFER": {
- condition: "OFFERID = '" + vars.get("$field.OFFERID") + "'"
- , ValueMapping: {
- "OFFER_ID": ""
- , "OFFERCODE": OfferUtils.getNextOfferNumber()
- , "VERSNR": "1"
- }
- , SubModules:{
- "OFFERITEM": {
- condition: "OFFER_ID = '" + vars.get("$field.OFFERID") + "' order by ITEMSORT"
- }
- }
- }
-}
-
-var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
-
-CopyModuleUtils.openNewModules("Offer", ModulesMapping);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
index 0a83f6827223845ef954c036bf5d99866118fe5e..add48fbf11814bdf125f71afc331b9957afa4172 100644
--- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
@@ -1,26 +1,16 @@
import("system.vars");
import("system.neon");
-import("Util_lib");
-import("Neon_lib");
import("Offer_lib");
-var InputMapping = {
-
- "OFFER": {
- condition: "OFFERID = '" + vars.get("$field.OFFERID") + "'"
- , ValueMapping: {
- "OFFER_ID": vars.get("$field.OFFERID")
- , "OFFERCODE": vars.get("$field.OFFERCODE")
- , "VERSNR": OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE"))
- }
- , SubModules:{
- "OFFERITEM": {
- condition: "OFFER_ID = '" + vars.get("$field.OFFERID") + "' order by ITEMSORT"
- }
- }
- }
+var params = {
+ "ContactId_param" : vars.get("$field.CONTACT_ID"),
+ "SalesprojectId_param" : vars.get("$field.SALESPROJECT_ID"),
+ "OfferLanguage_param" : vars.get("$field.LANGUAGE"),
+ "OfferOriginal_Id_param" : vars.get("$field.OFFERID"),
+ "OfferCode_param" : vars.get("$field.OFFERCODE"),
+ "OfferVersnr_param" : OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE")),
+ "OfferCurrency_param" : vars.get("$field.CURRENCY"),
+ "OfferAddress_param" : vars.get("$field.ADDRESS"),
+ "OfferHeader_param" : vars.get("$field.HEADER")
}
-
-var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
-
-CopyModuleUtils.openNewModules("Offer", ModulesMapping);
\ No newline at end of file
+neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offer_id/valueProcess.js b/entity/Offer_entity/entityfields/offer_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Offer_entity/entityfields/offercode/onValidation.js b/entity/Offer_entity/entityfields/offercode/onValidation.js
index de949a3e766bbf81de26ee22689c4808a7faae44..3b9c0b76f65fa2b8ae4026d17b1e78d5197d919f 100644
--- a/entity/Offer_entity/entityfields/offercode/onValidation.js
+++ b/entity/Offer_entity/entityfields/offercode/onValidation.js
@@ -6,7 +6,8 @@ import("Salesproject_lib");
import("Util_lib");
import("Entity_lib");
-if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && !vars.exists("$param.OfferCode_param")
&& !OfferUtils.validateOfferNumber(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.OFFERCODE"))) )
{
vars.set( "$field.OFFERCODE", OfferUtils.getNextOfferNumber().toString() );
diff --git a/entity/Offer_entity/entityfields/offercode/valueProcess.js b/entity/Offer_entity/entityfields/offercode/valueProcess.js
index 933257e8cc871bfd2d5cb0be92049e55ea93a2b8..502b44731b281c7fc79094de58242869d07e423d 100644
--- a/entity/Offer_entity/entityfields/offercode/valueProcess.js
+++ b/entity/Offer_entity/entityfields/offercode/valueProcess.js
@@ -4,6 +4,9 @@ import("system.neon");
import("Offer_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- result.string(OfferUtils.getNextOfferNumber());
+{
+ if (vars.exists("$param.OfferCode_param") && vars.get("$param.OfferCode_param"))
+ result.string(vars.get("$param.OfferCode_param"));
+ else
+ result.string(OfferUtils.getNextOfferNumber());
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offerreport/onActionProcess.js b/entity/Offer_entity/entityfields/printoffer/onActionProcess.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offerreport/onActionProcess.js
rename to entity/Offer_entity/entityfields/printoffer/onActionProcess.js
diff --git a/entity/Offer_entity/entityfields/versnr/valueProcess.js b/entity/Offer_entity/entityfields/versnr/valueProcess.js
index f3ad73d05605a0009779e02d2767edba66fe2189..5d3797b77b0fc1e83590585de35fa636da9962aa 100644
--- a/entity/Offer_entity/entityfields/versnr/valueProcess.js
+++ b/entity/Offer_entity/entityfields/versnr/valueProcess.js
@@ -5,5 +5,8 @@ import("Offer_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- result.string( "1" );
+ if (vars.exists("$param.OfferVersnr_param") && vars.get("$param.OfferVersnr_param"))
+ result.string(vars.get("$param.OfferVersnr_param"));
+ else
+ result.string( "1" );
}
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/conditionProcess.js b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
index 46b77172c421062e7a3ca794200ae6c992f04147..58347450b6f13af8e510f022630d36b1dfac80ea 100644
--- a/entity/Offer_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Offer_entity/recordcontainers/db/conditionProcess.js
@@ -4,6 +4,7 @@ import("Sql_lib");
var cond = new SqlCondition();
cond.andPrepareVars("OFFER.SALESPROJECT_ID", "$param.SalesprojectId_param");
+cond.andPrepareVars("OFFER.CONTACT_ID", "$param.ContactId_param");
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBInsert.js b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b3c4033a05890bdd874ce4fa610333b06fdc538
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("Offer_lib");
+
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
+ OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), vars.get("$field.OFFERID"));
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 3940f0c89477b9234dc1176030eb430a8c7a37c0..4afb6c516c1caa25aecd7211b004f98488fdce70 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -358,6 +358,33 @@
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
+ <entityConsumer>
+ <name>Activities</name>
+ <title>Activity</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RowId_param</name>
+ <code>%aditoprj%/entity/Order_entity/entityfields/activities/children/rowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <code>%aditoprj%/entity/Order_entity/entityfields/activities/children/objectid_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Order_entity/entityfields/activities/children/objectid_param/code.js b/entity/Order_entity/entityfields/activities/children/objectid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Order_entity/entityfields/activities/children/objectid_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/Order_entity/entityfields/activities/children/rowid_param/code.js b/entity/Order_entity/entityfields/activities/children/rowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..229c1cc55241a6acc700ad611ba131aadd83ac89
--- /dev/null
+++ b/entity/Order_entity/entityfields/activities/children/rowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.SALESORDERID"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/currency/displayValueProcess.js b/entity/Order_entity/entityfields/currency/displayValueProcess.js
index 6be00b937833451cf3146a6c30d09c46980cf840..2519786ebebdab4dd7112825bf47108ea7110ead 100644
--- a/entity/Order_entity/entityfields/currency/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/currency/displayValueProcess.js
@@ -1,5 +1,3 @@
-import("system.db");
-import("system.translate");
import("system.result");
import("system.vars");
import("Keyword_lib");
diff --git a/entity/Order_entity/entityfields/newactivity/onActionProcess.js b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0dfbcbcb9f63def6b709cc3ccfc54b72f6ac116b
--- /dev/null
+++ b/entity/Order_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.SALESORDERID"));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 9162c9654de9ae11fc8509b929d8f764d7497db5..c479324ec12198fed69af55498a8f6bc10d18342 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -235,10 +235,6 @@
<name>ASSIGNEDTO.value</name>
<recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DESCRIPTION.value</name>
- <recordfield>SALESORDERITEM.DESCRIPTION</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNT.value</name>
<recordfield>SALESORDERITEM.DISCOUNT</recordfield>
@@ -303,6 +299,10 @@
<name>PRODUCT_ID.displayValue</name>
<expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>SALESORDERITEM.INFO</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index fc41a485f2b2366a8d0232671f5519746513e2ea..1408247f3f4c2fd6cc24bc389873f52c49691d4c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -405,6 +405,7 @@
<entityParameter>
<name>objectRowId_param</name>
<code>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
+ <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
@@ -507,6 +508,7 @@
</entityConsumer>
<entityConsumer>
<name>KeywordStrenght</name>
+ <title>Salesprojects</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -520,6 +522,41 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newTask</name>
+ <fieldType>ACTION</fieldType>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
+ <entityConsumer>
+ <name>TaskObjectRelations</name>
+ <title>Tasks</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectRelation_entity</entityName>
+ <fieldName>BothObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Object1Rowid_param</name>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>Object1Type_param</name>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1type_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>Object2Type_param</name>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2type_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>Object2RowidTitle_param</name>
+ <code>%aditoprj%/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2rowidtitle_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -530,14 +567,14 @@
<onDBUpdate>%aditoprj%/entity/Organisation_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
- <name>ff0fa64f-4d73-49b3-bc02-02018392e838</name>
+ <name>47c6c065-ae0e-4cee-b913-335570e3221c</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>e3033b6f-966e-415a-9390-c61d5a1b19fc</name>
+ <name>e6120ee7-e6c3-4f60-9327-417627ba1fac</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
diff --git a/entity/Organisation_entity/entityfields/newtask/onActionProcess.js b/entity/Organisation_entity/entityfields/newtask/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..184aba3ab162e889d040c46a76c62f651e982d86
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/newtask/onActionProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.neon");
+import("Context_lib");
+
+var params = {};
+params["ObjectType_param"] = ContextUtils.getCurrentContextId();
+params["RowId_param"] = vars.get("$field.ORGANISATIONID");
+neon.openContext("Task", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js b/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..835140d0bee877176a6fd5a8e94460e5b5e776d1
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/salesprojects/children/contactid_param/code.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..bcfda44fe71eac93b3f8c11cc0c85a496f2cd51c
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1rowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1type_param/code.js b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1type_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object1type_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/Organisation_entity/entityfields/taskobjectrelations/children/object2rowidtitle_param/code.js b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2rowidtitle_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..e273ebaf0d31de77e8d77836146eeb81503ed474
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2rowidtitle_param/code.js
@@ -0,0 +1,3 @@
+import("system.translate");
+import("system.result");
+result.string(translate.text("Task"))
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2type_param/code.js b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2type_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..86bf9bdfc95f2757f6ee947b7549edad4ce0b154
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/taskobjectrelations/children/object2type_param/code.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("Task");
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 1ec47e052201d9851a7720131fcd674112dd885a..368f81ad8683818dafeec76464b82a86d14bd853 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -4,6 +4,7 @@
<title>Contact</title>
<description>former Pers</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Person_entity/documentation.adoc</documentation>
<iconId>VAADIN:USERS</iconId>
<imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
<titleProcess>%aditoprj%/entity/Person_entity/titleProcess.js</titleProcess>
@@ -42,6 +43,8 @@
<entityField>
<name>SALUTATION</name>
<title>Salutation</title>
+ <mandatory v="true" />
+ <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>TITLE</name>
@@ -384,10 +387,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/rel_relationship/valueProcess.js</valueProcess>
</entityField>
<entityActionField>
- <name>openEditDefaultsView_action</name>
+ <name>openEditDefaultsView</name>
<fieldType>ACTION</fieldType>
<title>Edit defaults</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js</onActionProcess>
<iconId>VAADIN:WRENCH</iconId>
</entityActionField>
<entityActionField>
@@ -507,6 +510,45 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<fieldName>LanguagesISO3Code</fieldName>
</dependency>
</entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
+ <title>Offer</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>ContactOffers</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <code>%aditoprj%/entity/Person_entity/entityfields/offers/children/contactid_param/code.js</code>
+ </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>objectRowId_param</name>
+ <code>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>objectType_param</name>
+ <code>%aditoprj%/entity/Person_entity/entityfields/attributes/children/objecttype_param/code.js</code>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/documentation.adoc b/entity/Person_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js b/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee0cddc370f78c08084b64d57e2a36686aad1e82
--- /dev/null
+++ b/entity/Person_entity/entityfields/attributes/children/objectrowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.PERSONID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/attributes/children/objecttype_param/code.js b/entity/Person_entity/entityfields/attributes/children/objecttype_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Person_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/Person_entity/entityfields/offers/children/contactid_param/code.js b/entity/Person_entity/entityfields/offers/children/contactid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed4a4f567aa9d494002b914426589ea37bc56682
--- /dev/null
+++ b/entity/Person_entity/entityfields/offers/children/contactid_param/code.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js b/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
index e7afa1485396900885b2a74453df003aa2869337..f8e59e680f629617e444c405a8e6e42c2997c901 100644
--- a/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
+++ b/entity/Person_entity/entityfields/openeditdefaultsview/onActionProcess.js
@@ -1,3 +1,3 @@
import("system.vars");
import("system.neon");
-neon.openContext("Person", "ContactEditDefaults_view", [vars.get("$field.CONTACTID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
+neon.openContext("Person", "PersonEditDefaults_view", [vars.get("$field.CONTACTID")], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js b/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
deleted file mode 100644
index b0fcb98f2ebff8d3bc44ad52b7b2b7b515875f46..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/openeditdefaultsview_action/onActionProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.neon");
-neon.openContext("Person", "ContactEditDefaults_view", [vars.get("$sys.uid")], neon.OPERATINGSTATE_EDIT, null);
diff --git a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..935c4ef90bfcfae64a38388e2c0c9a44cbec9da2
--- /dev/null
+++ b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object([["Frau", "Frau"], ["Herr", "Herr"]])
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 2cd464e46c26353a7790d6bbf77fc1bb5679c6fe..d2902bb8988c83b2ea5721dabfdf8350f3a422b2 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -290,6 +290,33 @@
<fieldName>LanguagesISO3Code</fieldName>
</dependency>
</entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
+ <title>Activity</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <code>%aditoprj%/entity/Product_entity/entityfields/activities/children/objectid_param/code.js</code>
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <code>%aditoprj%/entity/Product_entity/entityfields/activities/children/rowid_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/activities/children/objectid_param/code.js b/entity/Product_entity/entityfields/activities/children/objectid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..008915f61deac19ccdd40fff81701de63eb3b6a2
--- /dev/null
+++ b/entity/Product_entity/entityfields/activities/children/objectid_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/activities/children/rowid_param/code.js b/entity/Product_entity/entityfields/activities/children/rowid_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..eaa8f9632d85a5a73a33bfe5e9ce56e6dddd390e
--- /dev/null
+++ b/entity/Product_entity/entityfields/activities/children/rowid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/newactivity/onActionProcess.js b/entity/Product_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b2be977254ab92678a76d702b47f2de59d379a37
--- /dev/null
+++ b/entity/Product_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.PRODUCTID"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 7037175d27761a49a0684cc7a3ef38103cdd38e2..18bb74b1c7ea3631d0c071fd7a576f6202bfa501 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -60,6 +60,7 @@
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/onValidation.js</onValidation>
</entityField>
<entityField>
diff --git a/entity/Productprice_entity/entityfields/valid_from/valueProcess.js b/entity/Productprice_entity/entityfields/valid_from/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4a5ac41f637617745a3985ec17bd66594133db52
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/valid_from/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("Date_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == "")
+{
+ result.string(DateUtils.getTodayUTC());
+}
+else
+ result.string(vars.get("$this.value"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/conditionProcess.js b/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
index 7ba1349840d22af2496b9ec2cd638e5afa5ff1fa..0019feb30c21ff68602d2db757f5c8cab5c626e6 100644
--- a/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Productprice_entity/recordcontainers/db/conditionProcess.js
@@ -1,9 +1,11 @@
+import("system.db");
import("system.result");
import("system.vars");
+import("Sql_lib");
-if(vars.exists("$param.ProductId_param") && vars.get("$param.ProductId_param") != "")
- result.string("PRODUCTPRICE.PRODUCT_ID = ('" + vars.get("$param.ProductId_param") + "')");
-else if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != "")
- result.string("PRODUCTPRICE.CONTACT_ID = ('" + vars.get("$param.ContactId_param") + "')");
-else
- result.string("1 = 2");
\ No newline at end of file
+var cond = SqlCondition.begin()
+ .andPrepareVars("PRODUCTPRICE.PRODUCT_ID", "$param.ProductId_param")
+ .andPrepareVars("PRODUCTPRICE.CONTACT_ID", "$param.ContactId_param");
+
+//TODO: use a preparedCondition when available #1030812 #1034026
+result.string(db.translateCondition(cond.build("1 = 2")));
\ No newline at end of file
diff --git a/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js b/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
index f165ed8fa18606a2080496441041fe5a39a06d59..ee62dca4c5b6641758a1ce2856db770d63641278 100644
--- a/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/SalesprojectForecast_entity/recordcontainers/db/onDBUpdate.js
@@ -1,3 +1,3 @@
import("Salesproject_lib");
-notifyToUpdateForecast()
\ No newline at end of file
+Salesproject.notifyToUpdateForecast()
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 53a24c81a9974cb37bf7621b9067231ad163fccb..63774cba86c602cea3ea1ac99c03442e4d7b5433 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_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>SalesprojectSource_entity</name>
- <title>Source</title>
+ <title>Touchpoint</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>db</recordContainer>
<entityFields>
@@ -54,7 +54,7 @@
</entityField>
<entityField>
<name>SOURCE</name>
- <title>Source</title>
+ <title>Touchpoint</title>
<consumer>KeywordSources</consumer>
</entityField>
<entityConsumer>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 3b17aa4a0b591b67d00626a2986e34f918bdc770..fbdf0e7d1ea7ae1dc90946261af2c776eb4884c4 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -111,7 +111,7 @@
</entityField>
<entityConsumer>
<name>SalesprojectSources</name>
- <title>Source</title>
+ <title>Touchpoints</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -311,6 +311,7 @@
<description>the total hours of all time trackings related to the salesproject</description>
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>IMAGE</name>
@@ -432,6 +433,39 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <fieldType>ACTION</fieldType>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>NEON:HISTORY</iconId>
+ </entityActionField>
+ <entityField>
+ <name>DAYS_NOTACTIVE</name>
+ <title>Days inactive</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>Salesprojects</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>0925d17f-a26a-4641-aaf4-0f74796fefa7</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/neonContext/Salesproject/documentation.adoc b/entity/Salesproject_entity/documentation.adoc
similarity index 100%
rename from neonContext/Salesproject/documentation.adoc
rename to entity/Salesproject_entity/documentation.adoc
diff --git a/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js b/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cddfb6d43c94f74e66d49f9444cbaf03415b07d2
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/days_notactive/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Activity_lib");
+import("Date_lib");
+
+var entryDate = ActivityUtils.getLastActivityDate(vars.get("$field.SALESPROJECTID"));
+var daysPassed = DateUtils.getDayDifference(entryDate);
+
+if (daysPassed != null)
+ result.string(daysPassed);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js b/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0a299b330a3c72d55249e6bd6d52a51512d0867b
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("Activity_lib");
+
+ActivityUtils.createNewActivity(vars.getString("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js b/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bfe42a40a4a4811369dc8073130dc00b96032782
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/timetrackingsum/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Timetracking_lib");
+
+result.string(Timetracking.minutesToReadableHour(parseInt(vars.getString("$field.TIMETRACKINGSUM"))));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js b/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js
index e3ef6877942e157abdbd49460716516416b058d0..83c88895a0224ff240ea0dfbaf5b68249efffe8d 100644
--- a/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/timetrackingsum/valueProcess.js
@@ -1,10 +1,5 @@
-import("system.text");
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Timetracking_lib");
-
-var hrs = Timetracking.getTotalTrackingTime(vars.getString("$field.SALESPROJECTID")) / 60;
-hrs = text.formatDouble(hrs, "0.00");
-
-result.string(hrs + " " + translate.text("hrs"));
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("Timetracking_lib");
+
+result.string(Timetracking.getTotalTrackingTime(vars.getString("$field.SALESPROJECTID")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index c5ae703c9e1ee768bc4f56bfcbdc6290871d04f6..222926e7c12d2e84a2f409dd5b6698a8bbbf4c87 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -15,7 +15,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
fieldVar = "$field.STATE";
break;
}
-
+
if (typeValue) {
Salesproject.insertMilestone(vars.getString("$field.SALESPROJECTID"), typeValue, vars.getString(fieldVar), true);
}
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 1cc8e7b44dee6184cadf8bdb2cb0b377d9368c94..57761954d1b121d5ebc7ff19d677347f0e11939d 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -11,6 +11,7 @@
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
</entityProvider>
<entityField>
<name>CODE</name>
@@ -18,9 +19,7 @@
<title>task number</title>
<contentType>NUMBER</contentType>
<outputFormat>0000000</outputFormat>
- <state>READONLY</state>
- <stateProcess>%aditoprj%/entity/Task_entity/entityfields/code/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/code/valueProcess.js</valueProcess>
+ <state>DISABLED</state>
</entityField>
<entityField>
<name>SUBJECT</name>
@@ -77,7 +76,9 @@
<name>TYPE</name>
<title>type</title>
<consumer>KeywordTypes</consumer>
- <groupable v="true" />
+ <searchable v="false" />
+ <groupable v="false" />
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
@@ -170,6 +171,16 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>RowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
<entityConsumer>
<name>KeywordPriority</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -185,6 +196,7 @@
<name>db</name>
<alias>Data_alias</alias>
<orderClauseProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<linkInformation>
<linkInformation>
<name>47e1b4a5-6901-48b0-85ba-bec39b86a2d7</name>
diff --git a/entity/Task_entity/entityfields/code/documentation.adoc b/entity/Task_entity/entityfields/code/documentation.adoc
index 418cfa22905051736503922471bcb74502b2508d..23f0e1f5074bd4a70aab2155d98e0127d0430ddc 100644
--- a/entity/Task_entity/entityfields/code/documentation.adoc
+++ b/entity/Task_entity/entityfields/code/documentation.adoc
@@ -1,3 +1 @@
-The `CODE` field is a automatically increased sequential number.
-It cannot be set by the user.
-Therefore it's only visible after creation of a `TASK` record.
\ No newline at end of file
+The `CODE` field is reserved for future implementations. It's in no view and does not store any value or has any other interaction.
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/code/stateProcess.js b/entity/Task_entity/entityfields/code/stateProcess.js
deleted file mode 100644
index 3104b5b489485ec14165fc219df0850b233f9827..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/code/stateProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-//the code (tasknumber) value is genereated before save to prevent duplicate numbers
-//so: no need to display it on new
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(neon.COMPONENTSTATE_INVISIBLE);
-else
- result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/code/valueProcess.js b/entity/Task_entity/entityfields/code/valueProcess.js
deleted file mode 100644
index 7175621de3beecb887b38e37d160d505af2b2c42..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/code/valueProcess.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import("system.logging");
-import("system.neon");
-import("system.db");
-import("system.vars");
-import("Sql_lib");
-
-
-//if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-//{
-// var maskingHelper = new SqlMaskingUtils();
-// var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
-// newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
-// if (isNaN(newCodeNumber))
-// throw new TypeError();//TODO:add Message
-// ++newCodeNumber;
-// logging.log("newCodeNumber: " + newCodeNumber)
-// vars.set("$field.CODE", newCodeNumber);
-//}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/type/valueProcess.js b/entity/Task_entity/entityfields/type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..68427766d13467b6bb55261aa6249df15cf8eacb
--- /dev/null
+++ b/entity/Task_entity/entityfields/type/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+// Sets the type to "Task" as default value.
+result.string("4dee8727-8299-422e-ae41-6cdf9de2dfd7");
\ No newline at end of file
diff --git a/entity/Task_entity/onValidation.js b/entity/Task_entity/onValidation.js
index 460d1e2fc978a5608fbb4eceab1d59b13374ef12..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/entity/Task_entity/onValidation.js
+++ b/entity/Task_entity/onValidation.js
@@ -1,17 +0,0 @@
-import("system.translate");
-import("system.db");
-import("system.vars");
-import("system.text");
-import("system.neon");
-import("Sql_lib");
-
-//TODO: this should no happen in onValidation; waiting for #1032668
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-{
- var maskingHelper = new SqlMaskingUtils();
- var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
- newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
- if (isNaN(newCodeNumber))
- throw new TypeError(translate.text("The code number is not a valid number."));
- neon.setFieldValue("$field.CODE", ++newCodeNumber);
-}
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/onDBInsert.js b/entity/Task_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..333d4d3ca97769c16660a9c6fa7459e28669b98e
--- /dev/null
+++ b/entity/Task_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.util");
+import("system.db");
+
+if (vars.exists("$param.ObjectType_param") && vars.exists("$param.RowId_param") && vars.get("$param.ObjectType_param") && vars.get("$param.RowId_param"))
+ db.insertData("AB_OBJECTRELATION", ["AB_OBJECTRELATIONID", "OBJECT1_TYPE", "OBJECT1_ROWID", "OBJECT2_TYPE", "OBJECT2_ROWID"], null,
+ [
+ util.getNewUUID(),
+ vars.get("$param.ObjectType_param"),
+ vars.get("$param.RowId_param"),
+ "Task",
+ vars.get("$field.TASKID")
+ ]);
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/orderClauseProcess.js b/entity/Task_entity/recordcontainers/db/orderClauseProcess.js
index a9a4d09c9b79d1a83a4aed6b36cf6420baf8d271..e1eed9e6c15fff6062b3ed8161413699d5301f28 100644
--- a/entity/Task_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Task_entity/recordcontainers/db/orderClauseProcess.js
@@ -1,4 +1,4 @@
import("system.db");
import("system.result");
-result.object({"TASK.CODE": db.DESCENDING});
\ No newline at end of file
+result.object({"TASK.MATURITY_DATE": db.DESCENDING});
\ No newline at end of file
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 4bdee59f79a0d7ca91293f99c44eb094b05b6259..8e52105f68d966cf5b7d9f7dc22db12a9c829bed 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -15,8 +15,10 @@
</entityField>
<entityField>
<name>MINUTES</name>
- <title>Minutes</title>
+ <title>Time</title>
+ <contentType>NUMBER</contentType>
<mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>OBJECT_ID</name>
diff --git a/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js b/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..326c2a9f306a8a9356e4f895c630ace18a27a91f
--- /dev/null
+++ b/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Timetracking_lib");
+
+result.string(Timetracking.minutesToReadableHour(parseInt(vars.getString("$field.MINUTES"))));
\ No newline at end of file
diff --git a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
index 5953c631790c0ce6159a487fbed9642f5f47a103..74fa0b796d49d26a64f3dc1afebdec42fa58ec9d 100644
--- a/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js
@@ -5,7 +5,8 @@ import("system.db");
import("system.result");
import("system.translate");
import("Data_lib");
-
+import("Keyword_lib");
+import("Money_lib");
var turnoverCategory = translate.text('Turnover');
var forecastCategory = translate.text('Forecast');
@@ -13,6 +14,13 @@ var forecastCategory = translate.text('Forecast');
// load data
var sumOfMonthTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, sum(NET + VAT) from SALESORDER group by year(SALESORDERDATE), month(SALESORDERDATE) order by yearNum, monthNum");
var sumOfMonthForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, sum(VOLUME * 1000) from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START) order by yearNum, monthNum");
+var sumOfMonthProductsTurnover = db.table("select year(SALESORDERDATE) yearNum, month(SALESORDERDATE) monthNum, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE, sum(SALESORDERITEM.QUANTITY), SALESORDERITEM.GROUPCODEID, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "SALESORDERITEM.GROUPCODEID") + ") \n\
+ from SALESORDER \n\
+ join SALESORDERITEM on SALESORDERITEM.SALESORDER_ID = SALESORDER.SALESORDERID \n\
+ where SALESORDERITEM.OPTIONAL <> 1 \n\
+ group by year(SALESORDERDATE), month(SALESORDERDATE), SALESORDERITEM.GROUPCODEID, SALESORDERITEM.DISCOUNT, SALESORDERITEM.VAT, SALESORDERITEM.PRICE \n\
+ order by yearNum, monthNum"); // V--V--> there is no VAT/Discount in forecasts V-----> forecasts are grouped by grupcode and have always quantity 1
+var sumOfMonthProductsForecast = db.table("select year(DATE_START) yearNum, month(DATE_START) monthNum, 0, 0, sum(VOLUME * 1000), 1, GROUPCODE, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductGroupcode, "GROUPCODE") + ") from SALESPROJECT_FORECAST group by year(DATE_START), month(DATE_START), GROUPCODE order by yearNum, monthNum");
// build chartData
var rootNode = "";
@@ -25,33 +33,35 @@ var yearCountToShow = parseInt(vars.get("$param.YearCountToShow_param"));
for (let i = 0; i < yearCountToShow; i++)
{
- // TODO: currently years are hardcoded.
var year = i + maxYear - yearCountToShow + 1;
- var TurnoverYearSum = 0;
- var ForecastYearSum = 0;
+ var turnoverYearSum = 0;
+ var forecastYearSum = 0;
// filter data by current year
- var TurnoverYearData = sumOfMonthTurnover.filter(function(row)
+ var turnoverYearData = sumOfMonthTurnover.filter(function(row)
{
- return row[0] == year
+ return row[0] == year;
});
- var ForecastYearData = sumOfMonthForecast.filter(function(row)
+ var forecastYearData = sumOfMonthForecast.filter(function(row)
{
- return row[0] == year
+ return row[0] == year;
});
for (let i = 1; i <= 12; i++)
{
// add months
- TurnoverYearSum += _addMonth(year, i, TurnoverYearData, turnoverCategory);
- ForecastYearSum += _addMonth(year, i, ForecastYearData, forecastCategory);
+ turnoverYearSum += _addMonth(year, i, turnoverYearData, turnoverCategory);
+ forecastYearSum += _addMonth(year, i, forecastYearData, forecastCategory);
+
+ _addProducts(year, i, sumOfMonthProductsTurnover, turnoverCategory);
+ _addProducts(year, i, sumOfMonthProductsForecast, forecastCategory);
}
// add year nodes
- chartData.add(turnoverCategory + year, rootNode, [turnoverCategory, year.toString(), TurnoverYearSum]);
- chartData.add(forecastCategory + year, rootNode, [forecastCategory, year.toString(), ForecastYearSum]);
+ chartData.add(turnoverCategory + year, rootNode, [turnoverCategory, year.toString(), turnoverYearSum]);
+ chartData.add(forecastCategory + year, rootNode, [forecastCategory, year.toString(), forecastYearSum]);
}
@@ -87,4 +97,40 @@ function _addMonth(pYear, pMonth, pData, pCategory)
// add month node
chartData.add(pCategory + pYear + pMonth, pCategory + pYear, [pCategory, monthDate, monthValue]);
return yearSum;
-}
\ No newline at end of file
+}
+
+function _addProducts(pYear, pMonth, pData, pCategory)
+{
+ var groupcodeSums = {};
+
+ for (let i = 0; i < pData.length; i++)
+ {
+ if (pData[i][0] == pYear && pData[i][1] == pMonth)
+ {
+ var groupCode = pData[i][6];
+ if (groupCode != undefined)
+ {
+ if (groupcodeSums[groupCode] == undefined)
+ {
+ groupcodeSums[groupCode] = {
+ sum: 0,
+ name: pData[i][7]
+ }
+ }
+
+ pData[i][2] = pData[i][2] || 0;
+ pData[i][3] = pData[i][3] || 0;
+ pData[i][4] = pData[i][4] || 0;
+ pData[i][5] = pData[i][5] || 0;
+
+ groupcodeSums[groupCode]["sum"] += MoneyUtils.getGross(parseFloat(pData[i][3]), parseFloat(pData[i][4]), parseFloat(pData[i][5]), parseFloat(pData[i][2]));
+ }
+ }
+ }
+
+ for (let groupcode in groupcodeSums)
+ {
+ if (groupcodeSums[groupcode]["sum"])
+ chartData.add(pCategory + pYear + pMonth + groupcode, pCategory + pYear + pMonth, [pCategory, groupcodeSums[groupcode]["name"], groupcodeSums[groupcode]["sum"]]);
+ }
+}
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 6d07ea71054ed1240d173780e33d8f25959c7380..bb50a0cfc5ae38837d03dbd597767fbd1009e531 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2338,10 +2338,52 @@
<key>Links</key>
</entry>
<entry>
- <key>Linktype</key>
+ <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
</entry>
<entry>
- <key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
+ <key>Object type</key>
+ </entry>
+ <entry>
+ <key>Level</key>
+ </entry>
+ <entry>
+ <key>Print Offer</key>
+ </entry>
+ <entry>
+ <key>Touchpoints</key>
+ </entry>
+ <entry>
+ <key>Day</key>
+ </entry>
+ <entry>
+ <key>Days</key>
+ </entry>
+ <entry>
+ <key>Days inactive</key>
+ </entry>
+ <entry>
+ <key>Touchpoint</key>
+ </entry>
+ <entry>
+ <key>Combobox Value</key>
+ </entry>
+ <entry>
+ <key>relations</key>
+ </entry>
+ <entry>
+ <key>Time</key>
+ </entry>
+ <entry>
+ <key>New task</key>
+ </entry>
+ <entry>
+ <key>MyTasks</key>
+ </entry>
+ <entry>
+ <key>Show my tasks</key>
+ </entry>
+ <entry>
+ <key>the specified key has to be unique for that container but does already exist</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index f18b405fac7b4178ba760ed64e2f568dddc9ba67..ae516de8b29040697890f44b499916e7ca0ed646 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -14,6 +14,10 @@
<key>Turnover</key>
<value>Umsatz</value>
</entry>
+ <entry>
+ <key>Days</key>
+ <value>Tage</value>
+ </entry>
<entry>
<key>E-Mail</key>
<value>E-Mail</value>
@@ -78,6 +82,10 @@
<key>${SALESPROJECT_MEMBER}</key>
<value>Projektteam</value>
</entry>
+ <entry>
+ <key>Days inactive</key>
+ <value>Tage inaktiv</value>
+ </entry>
<entry>
<key>Active</key>
<value>Aktiv</value>
@@ -309,6 +317,10 @@
<entry>
<key>Internal (2)</key>
</entry>
+ <entry>
+ <key>Touchpoints</key>
+ <value>Kontaktpunkte</value>
+ </entry>
<entry>
<key>Company Addresses</key>
<value>Firmenadressen</value>
@@ -752,6 +764,10 @@
<key>Show open salesprojects</key>
<value>Offene Vertriebsprojekte anzeigen</value>
</entry>
+ <entry>
+ <key>Day</key>
+ <value>Tag</value>
+ </entry>
<entry>
<key>Receipt number</key>
<value>Belegnummer</value>
@@ -1047,6 +1063,10 @@
<key>My Activities</key>
<value>Meine Aktivitäten</value>
</entry>
+ <entry>
+ <key>Combobox Value</key>
+ <value>Combobox-Wert</value>
+ </entry>
<entry>
<key>Salesprojects</key>
<value>Vertriebsprojekte</value>
@@ -1671,9 +1691,11 @@
</entry>
<entry>
<key>Customer</key>
+ <value>Kunde</value>
</entry>
<entry>
<key>Outgoing</key>
+ <value>ausgehend</value>
</entry>
<entry>
<key>Paraguay</key>
@@ -1846,6 +1868,7 @@
</entry>
<entry>
<key>${ORGTYPE_OTHER}</key>
+ <value>Sonstiges</value>
</entry>
<entry>
<key>Haiti</key>
@@ -1858,6 +1881,7 @@
</entry>
<entry>
<key>waiting</key>
+ <value>warten auf Rückmeldung</value>
</entry>
<entry>
<key>American Samoa</key>
@@ -1918,6 +1942,7 @@
</entry>
<entry>
<key>Incoming</key>
+ <value>eingehend</value>
</entry>
<entry>
<key>Ghana</key>
@@ -1969,6 +1994,7 @@
</entry>
<entry>
<key>Supplier</key>
+ <value>Lieferant</value>
</entry>
<entry>
<key>Nigeria</key>
@@ -1993,6 +2019,7 @@
</entry>
<entry>
<key>Prospect</key>
+ <value>Potenzieller Kunde</value>
</entry>
<entry>
<key>Estonia</key>
@@ -2023,6 +2050,7 @@
</entry>
<entry>
<key>new</key>
+ <value>neu</value>
</entry>
<entry>
<key>Adviser</key>
@@ -2353,6 +2381,7 @@
</entry>
<entry>
<key>Internal</key>
+ <value>intern</value>
</entry>
<entry>
<key>Brunei Darussalam</key>
@@ -2413,6 +2442,11 @@
</entry>
<entry>
<key>${GENDER_OTHER}</key>
+ <value>Divers</value>
+ </entry>
+ <entry>
+ <key>Touchpoint</key>
+ <value>Kontaktpunkt</value>
</entry>
<entry>
<key>Turkey</key>
@@ -2459,6 +2493,7 @@
</entry>
<entry>
<key>in process</key>
+ <value>in Bearbeitung</value>
</entry>
<entry>
<key>Saint Martin (French part)</key>
@@ -2498,7 +2533,7 @@
</entry>
<entry>
<key>ended</key>
- <value></value>
+ <value>abgeschlossen</value>
</entry>
<entry>
<key>Saint Barthélemy</key>
@@ -2624,6 +2659,7 @@
</entry>
<entry>
<key>Checkbox</key>
+ <value></value>
</entry>
<entry>
<key>Numeric value</key>
@@ -2645,6 +2681,7 @@
</entry>
<entry>
<key>${NUMBER}</key>
+ <value>Zahl</value>
</entry>
<entry>
<key>Name \&quot;%0\&quot; already used for container \&quot;%1\&quot;</key>
@@ -2693,13 +2730,43 @@
<entry>
<key>Links</key>
</entry>
- <entry>
- <key>Linktype</key>
- </entry>
<entry>
<key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
<value>Es wird der Funktion %0 keine Produktid übergeben.</value>
</entry>
+ <entry>
+ <key>Object type</key>
+ <value>Typ</value>
+ </entry>
+ <entry>
+ <key>Level</key>
+ </entry>
+ <entry>
+ <key>Print Offer</key>
+ <value>Angebot drucken</value>
+ </entry>
+ <entry>
+ <key>relations</key>
+ </entry>
+ <entry>
+ <key>Time</key>
+ <value>Zeit</value>
+ </entry>
+ <entry>
+ <key>New task</key>
+ <value>Neue Aufgabe</value>
+ </entry>
+ <entry>
+ <key>MyTasks</key>
+ <value>Meine Aufgaben</value>
+ </entry>
+ <entry>
+ <key>Show my tasks</key>
+ <value>Meine Aufgaben anzeigen</value>
+ </entry>
+ <entry>
+ <key>the specified key has to be unique for that container but does already exist</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 78ad4e2a7e8e0c3e9ed19221b5e2ebc4cfee6f1a..4c101a4c2c0ac238cf76b884496c4bd3ab3c1274 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -55,6 +55,9 @@
<entry>
<key>Information</key>
</entry>
+ <entry>
+ <key>Print Offer</key>
+ </entry>
<entry>
<key>Language</key>
</entry>
@@ -2360,13 +2363,52 @@
<entry>
<key>Links</key>
</entry>
- <entry>
- <key>Linktype</key>
- </entry>
<entry>
<key>${PRODUCT_LIB_NO_PRODUCT_ID} function: %0</key>
<value>Missing productId in function %0.</value>
</entry>
+ <entry>
+ <key>Object type</key>
+ </entry>
+ <entry>
+ <key>Level</key>
+ </entry>
+ <entry>
+ <key>Touchpoint</key>
+ </entry>
+ <entry>
+ <key>Touchpoints</key>
+ </entry>
+ <entry>
+ <key>Day</key>
+ </entry>
+ <entry>
+ <key>Days</key>
+ </entry>
+ <entry>
+ <key>Days inactive</key>
+ </entry>
+ <entry>
+ <key>Combobox Value</key>
+ </entry>
+ <entry>
+ <key>relations</key>
+ </entry>
+ <entry>
+ <key>Time</key>
+ </entry>
+ <entry>
+ <key>New task</key>
+ </entry>
+ <entry>
+ <key>MyTasks</key>
+ </entry>
+ <entry>
+ <key>Show my tasks</key>
+ </entry>
+ <entry>
+ <key>the specified key has to be unique for that container but does already exist</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/AttributeRelation/AttributeRelation.aod b/neonContext/AttributeRelation/AttributeRelation.aod
index 7e9ce7018b9378bf85def94c6f6ec4f0bdc8148e..3d56373fb0ac8111c7d1df0efc29eee8f5c1b36f 100644
--- a/neonContext/AttributeRelation/AttributeRelation.aod
+++ b/neonContext/AttributeRelation/AttributeRelation.aod
@@ -10,5 +10,9 @@
<name>d21d2e1b-db79-4013-a056-6e9ce35a5757</name>
<view>AttributeRelationFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>d2970ead-0da7-4fad-9f82-0c02fe85fe2c</name>
+ <view>AttributeRelationEdit_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/ObjectRelation/ObjectRelation.aod b/neonContext/ObjectRelation/ObjectRelation.aod
index 386580a64a6b75f1cf013e1a867e830121506fc6..763a754b47c69d0746663e2b28c48748487daaa0 100644
--- a/neonContext/ObjectRelation/ObjectRelation.aod
+++ b/neonContext/ObjectRelation/ObjectRelation.aod
@@ -2,14 +2,14 @@
<neonContext 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/neonContext/1.0.0">
<name>ObjectRelation</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>ObjectRelationFilter_view</filterview>
+ <filterview>AnyObjectRelationFilter_view</filterview>
<editview>ObjectRelationEdit_view</editview>
<preview>ObjectRelationPreview_view</preview>
<entity>ObjectRelation_entity</entity>
<references>
<neonViewReference>
<name>f6b27aa2-d0a7-479c-812e-8b16400b564b</name>
- <view>ObjectRelationFilter_view</view>
+ <view>AnyObjectRelationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>dc0bd793-a472-4a7b-8394-06c4bc31258a</name>
@@ -19,5 +19,9 @@
<name>30334c84-5e46-4a4e-a5c4-3c42d1cb109b</name>
<view>ObjectRelationEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>cec4dc52-b38f-4f7c-b8ca-4b81ccda3ac1</name>
+ <view>Object1RelationFilter_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 968ccbfe817a9cc274763fca03626b25ece07bfa..26e9b98ce2551670cd108cf2ad6cc54f7486eed9 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -31,13 +31,13 @@
<name>bb592f88-fa9f-4ecc-98cc-51a7903dc970</name>
<view>OrganisationAttr_view</view>
</neonViewReference>
- <neonViewReference>
- <name>b1634a51-b3f3-47b7-aea0-b9e8fba851da</name>
- <view>OrganisationEditDefaults_view</view>
- </neonViewReference>
<neonViewReference>
<name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
<view>OrganisationLookup_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>0e8f983b-0ff6-431c-9118-fecd9563c742</name>
+ <view>OrganisationEditDefaults_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index cf828aac4f6e718b1539118fa6804a5faac30b2d..0d925d49efa8aeaf7421bd5b6fee7b5673f5d789 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -3,7 +3,6 @@
<name>Salesproject</name>
<title>Salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonContext/Salesproject/documentation.adoc</documentation>
<mainview>SalesprojectMain_view</mainview>
<filterview>SalesprojectFilter_view</filterview>
<editview>SalesprojectEdit_view</editview>
diff --git a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
index 597ac9502a58f95a5c666e853338c7f276225c48..d7491b7ecf0d1e22859cd53718fcbc68c1b872bc 100644
--- a/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
+++ b/neonView/ActivityLinkFilter_view/ActivityLinkFilter_view.aod
@@ -11,6 +11,7 @@
<children>
<tableViewTemplate>
<name>ActivityLinkFilter_template</name>
+ <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod b/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod
similarity index 73%
rename from neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
rename to neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod
index 167f255e1102c9e0f837cc59888ef0fb3610b8e6..bcfa55713b2623688e648247cfb45de79368a04e 100644
--- a/neonView/ObjectRelationFilter_view/ObjectRelationFilter_view.aod
+++ b/neonView/AnyObjectRelationFilter_view/AnyObjectRelationFilter_view.aod
@@ -1,11 +1,12 @@
<?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>ObjectRelationFilter_view</name>
+ <name>AnyObjectRelationFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
- <boxLayout>
+ <groupLayout>
<name>layout</name>
- </boxLayout>
+ </groupLayout>
</layout>
<children>
<tableViewTemplate>
@@ -29,12 +30,17 @@
<entityField>OBJECT2_TYPE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>4495cf75-82d1-4ad3-9a48-86ad44eadc37</name>
+ <name>027a408e-56bc-4dcd-a0da-57e531954d20</name>
<entityField>OBJECT2_ROWID</entityField>
- <width v="75" />
- <expandRatio v="100" />
</neonTableColumn>
</columns>
</tableViewTemplate>
+ <treetableViewTemplate>
+ <name>AnyObjectRelations</name>
+ <favoriteActionGroup2></favoriteActionGroup2>
+ <titleField>AnyObjectType</titleField>
+ <descriptionField>AnyObjectRowid</descriptionField>
+ <entityField>#ENTITY</entityField>
+ </treetableViewTemplate>
</children>
</neonView>
diff --git a/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7b8c5fa852078ebc12bff8fdc3873c95d54ddb0f
--- /dev/null
+++ b/neonView/AnyObjectRelationTree_view0/AnyObjectRelationTree_view0.aod
@@ -0,0 +1,19 @@
+<?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>AnyObjectRelationTree_view0</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treetableViewTemplate>
+ <name>AnyObjectRelations</name>
+ <parentField>AnyObjectType</parentField>
+ <titleField>AnyObjectRowid</titleField>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ </treetableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index 68581d6336cf998f5963361f1f428d10b09a002b..81d642c40d54f51d68ef3246add18df5e97f9d6a 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -30,8 +30,6 @@
<masterBeginField>MASTERBEGIN</masterBeginField>
<masterEndField>MASTEREND</masterEndField>
<reminderField>REMINDER</reminderField>
- <appointmentLinkField>LINKS</appointmentLinkField>
- <appointmentLinkTypeField>LINKTYPE</appointmentLinkTypeField>
<entityField>#ENTITY</entityField>
</appointmentEditViewTemplate>
<neonViewReference>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index 28572813858612fe1b31d76dffa1ec8adac5320b..0e6f03ca25af5f1f5f76bd87009bc68a788c48c1 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -1,6 +1,7 @@
<?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>AppointmentLinkFilter_view</name>
+ <title>relations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -10,8 +11,10 @@
<children>
<tableViewTemplate>
<name>Links</name>
+ <showHeader v="true" />
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
+ <title>relations</title>
<columns>
<neonTableColumn>
<name>17c0a8a9-354c-4095-a5d4-5c2613c897a3</name>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index 59adbab341fa443a18be81de0097635898b4fc31..f3e5d5fa9e51b0d3fedf0e8f0b07f37f8c561472 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -20,6 +20,10 @@
<entityField>#ENTITY</entityField>
<title></title>
<fields>
+ <entityFieldLink>
+ <name>5f20a5d4-0343-4b8c-92bf-15eeb2483ba9</name>
+ <entityField>ATTRIBUTE_PARENT_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>e00bfeb1-7003-4d5a-b71a-c6921e255c9d</name>
<entityField>ATTRIBUTE_ACTIVE</entityField>
diff --git a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b4c8d4ad85db22baaa90965b82fac2e75f090642
--- /dev/null
+++ b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.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>AttributeRelationEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>MultiEdit</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>3da856c1-6a5b-4fc3-aa41-0865b331a5e4</name>
+ <entityField>AB_ATTRIBUTE_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>04dda499-d970-41d1-a524-5e354c0d2bfd</name>
+ <entityField>ATTRIBUTERELATION_VALUE</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
index 75bd616a56f2377853f08fbf281d5d29a85ea125..fbcf895c91a45e539a0b4aa4cb9d56875a007d49 100644
--- a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
+++ b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
@@ -27,7 +27,9 @@
</tableViewTemplate>
<treetableViewTemplate>
<name>Tree</name>
- <titleField>ATTRIBUTERELATION_VALUE</titleField>
+ <parentField>ATTRIBUTE_PARENT_ID</parentField>
+ <titleField>AB_ATTRIBUTE_ID</titleField>
+ <descriptionField>ATTRIBUTERELATION_VALUE</descriptionField>
<entityField>#ENTITY</entityField>
</treetableViewTemplate>
</children>
diff --git a/neonView/DocumentEdit_view/DocumentEdit_view.aod b/neonView/DocumentEdit_view/DocumentEdit_view.aod
index 3c275fedd04664c7b25e831769ed0fdf035e4c20..af265987d1c99be75d8a6838628990ce2453e4a6 100644
--- a/neonView/DocumentEdit_view/DocumentEdit_view.aod
+++ b/neonView/DocumentEdit_view/DocumentEdit_view.aod
@@ -13,6 +13,10 @@
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>7d74c495-1af7-4e00-8a78-5787e544e101</name>
+ <entityField>BINDATA_UPLOAD</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>91d96ac4-d838-4f92-90e7-954166b57288</name>
<entityField>NAME</entityField>
@@ -25,10 +29,6 @@
<name>d3265f22-18dd-468b-8316-6a11fab662c3</name>
<entityField>IS_MAIN_DOCUMENT</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>7d74c495-1af7-4e00-8a78-5787e544e101</name>
- <entityField>BINDATA_UPLOAD</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod b/neonView/Object1RelationFilter_view/Object1RelationFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bd5d9de2901e7bcb490f61daef99819f696d9c1f
--- /dev/null
+++ b/neonView/Object1RelationFilter_view/Object1RelationFilter_view.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>Object1RelationFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Object2</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>9df2f22f-96ab-461e-af54-2dfdfa2de221</name>
+ <entityField>OBJECT2_ROWID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9df2f22f-96ab-461e-af54-2dfdfa7de221</name>
+ <entityField>EMPTY</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index 5b736ba58050f5d14a8e2640c98b9c9cd89f666b..96e53e98805a3dc2c0a049a9c7e8f1c9482925bf 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -14,16 +14,21 @@
<entityField>#ENTITY</entityField>
<view>OfferPreview_view</view>
</neonViewReference>
- <neonViewReference>
- <name>e6b12eed-d67e-467c-9302-f6340f901235</name>
- <entityField>#ENTITY</entityField>
- <view>OfferDetail_view</view>
- </neonViewReference>
<neonViewReference>
<name>da7c8cef-a4f0-4614-a330-d81221abe566</name>
<entityField>Offeritems</entityField>
<view>OfferitemFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>a3702740-418d-40d5-9415-788542c14abb</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e6b12eed-d67e-467c-9302-f6340f901235</name>
+ <entityField>#ENTITY</entityField>
+ <view>OfferDetail_view</view>
+ </neonViewReference>
<neonViewReference>
<name>e96f2fec-1a98-4380-895a-82ab78ba408a</name>
<entityField>Documents</entityField>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index e5d693958f3765bf175d06e20bd9ef119333a843..6e56315bc93cfc70218efb22ecd2447aa36024df 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -14,6 +14,11 @@
<entityField>#ENTITY</entityField>
<view>OrderPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>7ec102f5-fb45-44a7-9bbf-0eba7f1536d7</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>f5455f3f-0743-47d1-bcb7-f2e83526e329</name>
<entityField>Orderitems</entityField>
diff --git a/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4c660f02d48e4fce4c8af45f2f21198c2cc3fd55
--- /dev/null
+++ b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
@@ -0,0 +1,31 @@
+<?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>OrganisationEditDefaults_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>EditDefaults_template</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>ccc421c9-3943-4668-a6c7-960753c38562</name>
+ <entityField>ADDRESS_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8625fb63-550c-4ad3-9b39-3091762e3f29</name>
+ <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a984c913-54e8-492e-928a-3553a1e76726</name>
+ <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
index 98a781f875c112f8898b153c0acc936b66d172fd..3663da44374d333a97dddbdee952647333d17e74 100644
--- a/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
+++ b/neonView/OrganisationEdit_view/OrganisationEdit_view.aod
@@ -52,5 +52,10 @@
<entityField>Communications</entityField>
<view>CommunicationMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>2037ef93-6719-49af-9352-9ca3c03d6972</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index c3792a23b39149940505f6d18c917ef02a154461..5fcec76945e9d274d53facb435b159b212b99989 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -48,7 +48,17 @@
<neonViewReference>
<name>ee7395b9-b787-4662-9021-f6e2d486bd16</name>
<entityField>ObjectRelations</entityField>
- <view>ObjectRelationFilter_view</view>
+ <view>AnyObjectRelationFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dc1aa0ca-d0bd-45fd-84dc-55cfcf3ca430</name>
+ <entityField>Salesprojects</entityField>
+ <view>SalesprojectFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>331f8519-f112-48c8-8430-85927dd0635e</name>
+ <entityField>TaskObjectRelations</entityField>
+ <view>Object1RelationFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonEdit_view/PersonEdit_view.aod b/neonView/PersonEdit_view/PersonEdit_view.aod
index f846c2c82867c21a3c16c9885c8cac3996c136a6..f284f32b2b819fa90d398b224cfa1c8db9dbeffe 100644
--- a/neonView/PersonEdit_view/PersonEdit_view.aod
+++ b/neonView/PersonEdit_view/PersonEdit_view.aod
@@ -70,5 +70,10 @@
<entityField>Communications</entityField>
<view>CommunicationMultiEdit_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>520f3056-2a24-4469-a86f-76ba80090829</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 5866999b02e4a20bc73cb92843cead6317af401e..93442d69e26e9db2feda7e0dc32b9613366468ff 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -24,6 +24,11 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>0cb8f431-0377-45cb-a41b-a5716efb0fd0</name>
+ <entityField>Offers</entityField>
+ <view>OfferFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>ec344a07-7b82-4c54-b06b-30ac5b8599f9</name>
<entityField>Contracts</entityField>
@@ -32,7 +37,12 @@
<neonViewReference>
<name>726f10a6-dad6-4325-a73e-2d6caf0340db</name>
<entityField>ObjectRelations</entityField>
- <view>ObjectRelationFilter_view</view>
+ <view>AnyObjectRelationFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>be48c6fe-1837-4c40-aef1-130fc1a5c544</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index 3f6aabdbf743965da9ddabdb20a96ae73ccd2325..68c00aaceec3ba5a2590cb09dd787ce1f8aeddb4 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -14,6 +14,11 @@
<entityField>#ENTITY</entityField>
<view>ProductPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>41887933-bb9a-48ce-818d-1db815021a36</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>51f37fe5-91e1-4b76-83b3-be0319e871a4</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
index 4e378bfd4da1e655a215ec14f72ecbeb9d22859c..867fcfc0b4a69b217396e3a4e219d7f8eabc65ab 100644
--- a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
+++ b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
@@ -18,6 +18,10 @@
<name>e2afee84-173b-430a-8e29-1fd16d33dd69</name>
<entityField>PRICELIST</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>21c8be49-ee64-4d9c-a8b0-eb44575cfd01</name>
+ <entityField>PRODUCT_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>fa21fa53-ac64-44b1-a5d1-8a1af16590fe</name>
<entityField>VALID_FROM</entityField>
@@ -46,10 +50,6 @@
<name>ca06ebcb-abf5-4606-98cd-fd54dccce6d0</name>
<entityField>CURRENCY</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>21c8be49-ee64-4d9c-a8b0-eb44575cfd01</name>
- <entityField>PRODUCT_ID</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index ae2f4f219ba45ae0143202e4468334785e45cce1..22e91e6848557fd2869630e628c09ae3c7e45bc8 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -62,7 +62,7 @@
<neonViewReference>
<name>d02bf839-1901-4ca1-bcee-245ee9512fe2</name>
<entityField>ObjectRelations</entityField>
- <view>ObjectRelationFilter_view</view>
+ <view>AnyObjectRelationFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>0a3f2444-8d91-41e3-8f4d-19a6013c29c5</name>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index e0bc20e97a1fcf618f7bc89005c47ade6ac496d0..b6c522853b78b3785cafaa2a1c213fa84ad3d8c0 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -76,5 +76,15 @@
<entityField>MainDocuments</entityField>
<view>DocumentList_view</view>
</neonViewReference>
+ <genericViewTemplate>
+ <name>SalesprojectScore_template</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>79490331-6be4-422f-9450-da0db56f0654</name>
+ <entityField>DAYS_NOTACTIVE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
</children>
</neonView>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 17c595d7e5a591a458451e2040eb3ba7ff1c83d6..24df599d7a43e21be159443d1179c7aeaa2d5683 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -13,10 +13,6 @@
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
- <entityFieldLink>
- <name>bc1d5872-58e5-4799-a382-79e74945cc75</name>
- <entityField>CODE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
<entityField>SUBJECT</entityField>
@@ -37,10 +33,6 @@
<name>0f600024-eb83-445c-8eb9-62bcf9e95313</name>
<entityField>PRIORITY</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>8173056f-fac6-4ee0-a8ff-c27c8184e6e9</name>
- <entityField>TYPE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>71d2b122-1687-454a-ae60-7e68aa83106c</name>
<entityField>PROTECTIONLEVEL</entityField>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 685009d266653d324a1b6368fe4d8d75aef30f93..f0c310450207f2295e88da001daa245ae197cfd8 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -3,6 +3,23 @@
<name>TaskFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name></name>
+ <title>MyTasks</title>
+ <description>Show my tasks</description>
+ <fragment>Task/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>VAADIN:TASKS</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>tasks</name>
+ <title>Tasks</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
<layout>
<groupLayout>
<name>layout</name>
@@ -22,10 +39,6 @@
<entityField>#ENTITY</entityField>
<title></title>
<columns>
- <neonTableColumn>
- <name>c60f59e5-f56b-4d13-87fc-e8c8e65bebd7</name>
- <entityField>CODE</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
<entityField>SUBJECT</entityField>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index c9b298b525883639f21f9e1d86f8e760c1f973ee..89cb729d600f3fd342ccc93240dfe1cefac6c9ea 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -19,10 +19,6 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
- <entityFieldLink>
- <name>0bfb984a-1a1b-404d-beb9-a1b8002ebed2</name>
- <entityField>CODE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>f988850e-53ed-443d-bd3d-16946eba656e</name>
<entityField>START_DATE</entityField>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index cc31fbb6b14d6b8fc84c30cbc7e88cf192695088..149f56dedc1aaca285dbe649edac6095b515cd92 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -24,10 +24,6 @@
<name>e95918f5-d21e-4c99-8d05-d70811aa3d89</name>
<entityField>PROTECTIONLEVEL</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>e73dda40-22cd-4d2d-abcf-c7fc59ea2e67</name>
- <entityField>TYPE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>fea59f13-750b-427d-bf33-cc1bead95446</name>
<entityField>DESCRIPTION</entityField>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 5f1e9c767f3c62cd9a462c6ba3d802b129c1dff9..cce489a22fc53fab49f62e16ecd82e94dec69397 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -20,10 +20,6 @@
<showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
- <entityFieldLink>
- <name>0bfb984a-1a1b-404d-beb9-a1b8002ebed2</name>
- <entityField>CODE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>f988850e-53ed-443d-bd3d-16946eba656e</name>
<entityField>START_DATE</entityField>
@@ -40,10 +36,6 @@
<name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
<entityField>PROTECTIONLEVEL</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>5bcbaa89-0826-4ef8-872d-bd68dbd8ef77</name>
- <entityField>TYPE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
<entityField>REQUESTOR_CONTACT_ID</entityField>
diff --git a/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml b/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml
deleted file mode 100644
index 3b0f9e8e11744d7d8f5856ef93daa961680874c4..0000000000000000000000000000000000000000
--- a/others/db_changes/EXPERIMENTAL_system_aliasDefault.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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">
- <include file="system_alias/struct/create_asys_aliasconfig.xml"/>
- <include file="system_alias/struct/create_asys_binaries.xml"/>
- <include file="system_alias/struct/create_asys_dashletconfigurations.xml"/>
- <include file="system_alias/struct/create_asys_dashlets.xml"/>
- <include file="system_alias/struct/create_asys_notifications.xml"/>
- <include file="system_alias/struct/create_asys_sequences.xml"/>
- <include file="system_alias/struct/create_asys_system.xml"/>
- <include file="system_alias/struct/create_asys_timer.xml"/>
- <include file="system_alias/struct/create_asys_users.xml"/>
- <include file="system_alias/struct/create_asys_calendarbackend.xml"/>
- <include file="system_alias/struct/create_asys_calendarlink.xml"/>
-
- <include file="system_alias/data/insert_asys_aliasconfig.xml"/>
- <include file="system_alias/data/insert_asys_system.xml"/>
- <include file="system_alias/data/insert_asys_users-admin.xml"/>
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt b/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0759040edd7a2fef03c9b13007b43fb70f7f4786
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/ChangeNotes.txt
@@ -0,0 +1,2 @@
+* all TaskTypes are deleted, new Type "Task" is created
+ - you may have to update all Tasks to use type "Tak" (keyid: 4dee8727-8299-422e-ae41-6cdf9de2dfd799)
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f96d83ec7e765e16ea47449c5527bc6472301fc6
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -0,0 +1,41 @@
+<?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">
+ <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_privat.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_gfk.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_mnf.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_lichtenstein.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_kaeltetechnik.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_pichelmaier.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_pfiffig.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_sommer.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_muller.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_leicht.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_kanzler.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_gruener.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_obermeier.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_smith.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_person/PERSON_lustig.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1000.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1001.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1002.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1003.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1004.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_gfk.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_jkl.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_activity/ACTIVITY_gfk.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1000.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1001.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1002.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1003.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
+
+ <include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
+ <include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml b/others/db_changes/data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_activity/example_activity_gfk.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_activity/ACTIVITY_gfk.xml
diff --git a/others/db_changes/data_alias/data/example_activity/LOBs/subjectText_661a7b87.txt b/others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
similarity index 100%
rename from others/db_changes/data_alias/data/example_activity/LOBs/subjectText_661a7b87.txt
rename to others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87.txt
diff --git a/others/db_changes/data_alias/data/example_activity/LOBs/subjectText_661a7b87_1.txt b/others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
similarity index 100%
rename from others/db_changes/data_alias/data/example_activity/LOBs/subjectText_661a7b87_1.txt
rename to others/db_changes/data_alias/basic/2019.2/data/example_activity/LOBs/subjectText_661a7b87_1.txt
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1000.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1000.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1000.xml
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1001.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1001.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1001.xml
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1002.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1002.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1002.xml
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1003.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1003.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1003.xml
diff --git a/others/db_changes/data_alias/data/example_contract/CONTRACT_1004.xml b/others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_contract/CONTRACT_1004.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_contract/CONTRACT_1004.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1000.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1001.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1002.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1003.xml
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml b/others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_offer/OFFER_1004.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_gfk.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_gfk.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_kaeltetechnik.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_lichtenstein.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_mnf.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_mnf.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_pichelmaier.xml
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_privat.xml b/others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_privat.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_organisation/ORGANISATION_privat.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_organisation/ORGANISATION_privat.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_gruener.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_gruener.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_gruener.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_kanzler.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_kanzler.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_leicht.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_leicht.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_leicht.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_lustig.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_lustig.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_lustig.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_muller.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_muller.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_muller.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_obermeier.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_obermeier.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_pfiffig.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_pfiffig.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_smith.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_smith.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_smith.xml
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_sommer.xml b/others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_person/PERSON_sommer.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_person/PERSON_sommer.xml
diff --git a/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml b/others/db_changes/data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_product/PRODUCT_42154311.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1000.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1001.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1002.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1003.xml
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesorder/SALESORDER_1004.xml
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_gfk.xml
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_jkl.xml b/others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
similarity index 100%
rename from others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_jkl.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_salesproject/SALESPROJECT_jkl.xml
diff --git a/others/db_changes/data_alias/data/example_task/base.xml b/others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml
similarity index 96%
rename from others/db_changes/data_alias/data/example_task/base.xml
rename to others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml
index 7680d3f8a042b1d4a63335e298f6807899128403..dae1ae32cef285ed93f4692315d9cbcdd971f92a 100644
--- a/others/db_changes/data_alias/data/example_task/base.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_task/base.xml
@@ -7,7 +7,7 @@
</column>
<column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-
+ <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="CODE" valueNumeric="10000"/>
<column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
<column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
@@ -28,7 +28,7 @@
</column>
<column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-
+ <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="CODE" valueNumeric="10001"/>
<column name="SUBJECT" value="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
<column name="STATUS" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
@@ -49,7 +49,7 @@
</column>
<column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
-
+ <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
<column name="CODE" valueNumeric="10002"/>
<column name="SUBJECT" value="Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris"/>
<column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
diff --git a/others/db_changes/data_alias/data/DASHLETCONFIGURATION_data.xml b/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
similarity index 55%
rename from others/db_changes/data_alias/data/DASHLETCONFIGURATION_data.xml
rename to others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
index c70a7012f5aa51beed3b322856ef841bb1bf8758..a74490dfcf370d59d36cbb6101152ac162ec0812 100644
--- a/others/db_changes/data_alias/data/DASHLETCONFIGURATION_data.xml
+++ b/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
@@ -1,6 +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="m.escher" id="bd4a9ffe-64d6-4f2d-8006-a29947eba5741">
- <delete tableName="ASYS_DASHLETCONFIGURATIONS"/>
- </changeSet>
+<changeSet author="j.goderbauer" id="598345d1-691b-4cae-b1c0-44c9c48705c8">
+ <dropNotNullConstraint tableName="TASK" columnName="CODE" />
+ <update tableName="TASK">
+ <column name="CODE"/>
+ </update>
+ <rollback>
+ <addNotNullConstraint tableName="TASK" columnName="CODE" />
+ <!--the update which sets everything to null cannot be rolled back-->
+ </rollback>
+</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml b/others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6e9186ce3f0d10263f64b464ab7aeb3a3e2a6755
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/update_TaskType_Task.xml
@@ -0,0 +1,85 @@
+<?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="a.loreth" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
+ <column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TITLE" value="Task"/>
+ <column name="CONTAINER" value="TaskType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="971b9424-9dda-4a4b-b6db-66c3ae3258ad" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="54231fc1-050e-4f00-91e1-4968387a6370" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b" />
+ </whereParams>
+ </delete>
+
+
+ <rollback>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
+ </whereParams>
+ </delete>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="7bd67c84-cb9d-4bb8-9189-4dd92c4b38a0"/>
+ <column name="KEYID" value="2594110a-a5a2-4516-a581-7540167e3976"/>
+ <column name="TITLE" value="Visit"/>
+ <column name="CONTAINER" value="TaskType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="971b9424-9dda-4a4b-b6db-66c3ae3258ad"/>
+ <column name="KEYID" value="d1765fbd-3388-4ac1-a67e-22533f14ef94"/>
+ <column name="TITLE" value="E-Mail"/>
+ <column name="CONTAINER" value="TaskType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="54231fc1-050e-4f00-91e1-4968387a6370"/>
+ <column name="KEYID" value="c402d3ad-9c46-4e79-b7fa-f70b771cb9d0"/>
+ <column name="TITLE" value="Phone"/>
+ <column name="CONTAINER" value="TaskType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="ac87d05f-2cf5-4c77-8342-c11e0cce7c8b"/>
+ <column name="KEYID" value="76188d38-a969-420e-bb99-d713ad7ce6fb"/>
+ <column name="TITLE" value="Online-Meeting"/>
+ <column name="CONTAINER" value="TaskType"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AX.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/AZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BB.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/BZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CX.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/CZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/DZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/EH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ER.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ES.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ET.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/FR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GB.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/GY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/HU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ID.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/IT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/JP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/KZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LB.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/LY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ME.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ML.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MQ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MX.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/MZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NP.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/NZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/OM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/PY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/QA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/RW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SB.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ST.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SX.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/SZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TD.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TH.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TJ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TL.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TO.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TR.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TV.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/TZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/US.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UY.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/UZ.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VC.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VG.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VI.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VN.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/VU.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WF.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/WS.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/XK.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YE.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/YT.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZA.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZM.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/ChangesLobFile/blob/ZW.svg
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
similarity index 78%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
index a69e1d4f46596853fc509942e3a788c97db16acd..bf57d6e5328a16d694d400033173a33f773f3c99 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
+++ b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
@@ -25,12 +25,4 @@
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_AttributeType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectProbability.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_OfferProbability.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ActivityCategory.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_CommunicationMedium.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_AddressType.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesProjectState.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesProjectPhase.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectEstimation.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskPriority.xml"/>
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
similarity index 81%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
index 958ebbabbff6c47cd11ca96e801f36a7963eb0fd..73d73f510da516e66388daf2a6916844f53ea1a2 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
+++ b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
@@ -1,97 +1,112 @@
-<?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="55a6a9df-5852-4bd4-ad72-8c575c0a27f6">
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="972e5eb1-a457-4b75-b966-1183896dac2c"/>
- <column name="KEYID" value="TEXT"/>
- <column name="TITLE" value="Text"/>
- <column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="0"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="cb7ecaea-b4e6-460e-9006-4a3d059b9857"/>
- <column name="KEYID" value="DATE"/>
- <column name="TITLE" value="Date"/>
- <column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="14de196a-aaa6-41b9-b503-3df1d45acc1e"/>
- <column name="KEYID" value="NUMBER"/>
- <column name="TITLE" value="${NUMBER}"/>
- <column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="2"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="8a9791c1-655f-4340-91b4-cfdf6372fc75"/>
- <column name="KEYID" value="BOOLEAN"/>
- <column name="TITLE" value="Checkbox"/>
- <column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="3"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="1390813c-6b94-4336-9986-9bcaddab69ac"/>
- <column name="KEYID" value="COMBO"/>
- <column name="TITLE" value="Combobox"/>
- <column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="4"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="2c188a17-2961-45df-bd68-34b55352375c"/>
- <column name="KEYID" value="GROUP"/>
- <column name="TITLE" value="Group"/>
- <column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="5"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <rollback>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="972e5eb1-a457-4b75-b966-1183896dac2c"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="cb7ecaea-b4e6-460e-9006-4a3d059b9857"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="14de196a-aaa6-41b9-b503-3df1d45acc1e"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="8a9791c1-655f-4340-91b4-cfdf6372fc75"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="1390813c-6b94-4336-9986-9bcaddab69ac"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="2c188a17-2961-45df-bd68-34b55352375c"/>
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
+<?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="55a6a9df-5852-4bd4-ad72-8c575c0a27f6">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="972e5eb1-a457-4b75-b966-1183896dac2c"/>
+ <column name="KEYID" value="TEXT"/>
+ <column name="TITLE" value="Text"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="cb7ecaea-b4e6-460e-9006-4a3d059b9857"/>
+ <column name="KEYID" value="DATE"/>
+ <column name="TITLE" value="Date"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="14de196a-aaa6-41b9-b503-3df1d45acc1e"/>
+ <column name="KEYID" value="NUMBER"/>
+ <column name="TITLE" value="${NUMBER}"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="8a9791c1-655f-4340-91b4-cfdf6372fc75"/>
+ <column name="KEYID" value="BOOLEAN"/>
+ <column name="TITLE" value="Checkbox"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="1390813c-6b94-4336-9986-9bcaddab69ac"/>
+ <column name="KEYID" value="COMBO"/>
+ <column name="TITLE" value="Combobox"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2c188a17-2961-45df-bd68-34b55352375c"/>
+ <column name="KEYID" value="GROUP"/>
+ <column name="TITLE" value="Group"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="75a67526-6b7c-400d-b958-e1f8f45466aa"/>
+ <column name="KEYID" value="COMBOVALUE"/>
+ <column name="TITLE" value="Combobox Value"/>
+ <column name="CONTAINER" value="AttributeType"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <rollback>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="972e5eb1-a457-4b75-b966-1183896dac2c"/>
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="cb7ecaea-b4e6-460e-9006-4a3d059b9857"/>
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="14de196a-aaa6-41b9-b503-3df1d45acc1e"/>
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="8a9791c1-655f-4340-91b4-cfdf6372fc75"/>
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="1390813c-6b94-4336-9986-9bcaddab69ac"/>
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="2c188a17-2961-45df-bd68-34b55352375c"/>
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="75a67526-6b7c-400d-b958-e1f8f45466aa"/>
+ </whereParams>
+ </delete>
+ </rollback>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_Currency.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_Currency.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_Currency.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_KeywordAttributeType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_PersonGender.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskType.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskType.xml
diff --git a/others/db_changes/data_alias/data/AditoBasic/init_ab_language.xml b/others/db_changes/data_alias/basic/init/data/AditoBasic/init_ab_language.xml
similarity index 100%
rename from others/db_changes/data_alias/data/AditoBasic/init_ab_language.xml
rename to others/db_changes/data_alias/basic/init/data/AditoBasic/init_ab_language.xml
diff --git a/others/db_changes/data_alias/basic/init/init.xml b/others/db_changes/data_alias/basic/init/init.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c4653839c7b975a5f2951845804b0ef995888eeb
--- /dev/null
+++ b/others/db_changes/data_alias/basic/init/init.xml
@@ -0,0 +1,47 @@
+<?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">
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_objectrelation.xml"/>
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_attribute.xml"/>
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_attributerelation.xml"/>
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_attributeusage.xml"/>
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_keyword_entry.xml"/>
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_keyword_attribute.xml"/>
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_keyword_attributerelation.xml"/>
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_countryinfo.xml"/>
+ <include relativeToChangelogFile="true" file="struct/AditoBasic/create_ab_language.xml"/>
+
+ <include relativeToChangelogFile="true" file="struct/create_person.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_organisation.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_contact.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_activity.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_activitylink.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_appointmentlink.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_address.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_communication.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_contract.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_product.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_prod2prod.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_productprice.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_stock.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesproject.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesproject_classification.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesproject_competition.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesproject_cycle.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesproject_forecast.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesproject_member.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesproject_source.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_offer.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_offeritem.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesorder.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_salesorderitem.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_timetracking.xml"/>
+ <include relativeToChangelogFile="true" file="struct/create_task.xml"/>
+
+ <!--reference files for keywords:-->
+ <include relativeToChangelogFile="true" file="data/AditoBasic/ab_keyword_entry.xml"/>
+ <include relativeToChangelogFile="true" file="data/AditoBasic/ab_keyword_attribute.xml"/>
+ <!--special case countryinfo data-->
+ <include relativeToChangelogFile="true" file="data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml"/>
+
+ <include relativeToChangelogFile="true" file="data/AditoBasic/init_ab_language.xml"/>
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_attribute.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_attribute.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attribute.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_attributerelation.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_attributerelation.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributerelation.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_attributeusage.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_attributeusage.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_attributeusage.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_countryinfo.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_countryinfo.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_countryinfo.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_attribute.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_attribute.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_attributerelation.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_attributerelation.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attributerelation.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_entry.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_keyword_entry.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_keyword_entry.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_language.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_language.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_language.xml
diff --git a/others/db_changes/data_alias/struct/AditoBasic/create_ab_objectrelation.xml b/others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/AditoBasic/create_ab_objectrelation.xml
rename to others/db_changes/data_alias/basic/init/struct/AditoBasic/create_ab_objectrelation.xml
diff --git a/others/db_changes/data_alias/struct/create_activity.xml b/others/db_changes/data_alias/basic/init/struct/create_activity.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_activity.xml
rename to others/db_changes/data_alias/basic/init/struct/create_activity.xml
diff --git a/others/db_changes/data_alias/struct/create_activitylink.xml b/others/db_changes/data_alias/basic/init/struct/create_activitylink.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_activitylink.xml
rename to others/db_changes/data_alias/basic/init/struct/create_activitylink.xml
diff --git a/others/db_changes/data_alias/struct/create_address.xml b/others/db_changes/data_alias/basic/init/struct/create_address.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_address.xml
rename to others/db_changes/data_alias/basic/init/struct/create_address.xml
diff --git a/others/db_changes/data_alias/struct/create_appointmentlink.xml b/others/db_changes/data_alias/basic/init/struct/create_appointmentlink.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_appointmentlink.xml
rename to others/db_changes/data_alias/basic/init/struct/create_appointmentlink.xml
diff --git a/others/db_changes/data_alias/struct/create_communication.xml b/others/db_changes/data_alias/basic/init/struct/create_communication.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_communication.xml
rename to others/db_changes/data_alias/basic/init/struct/create_communication.xml
diff --git a/others/db_changes/data_alias/struct/create_contact.xml b/others/db_changes/data_alias/basic/init/struct/create_contact.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_contact.xml
rename to others/db_changes/data_alias/basic/init/struct/create_contact.xml
diff --git a/others/db_changes/data_alias/struct/create_contract.xml b/others/db_changes/data_alias/basic/init/struct/create_contract.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_contract.xml
rename to others/db_changes/data_alias/basic/init/struct/create_contract.xml
diff --git a/others/db_changes/data_alias/struct/create_offer.xml b/others/db_changes/data_alias/basic/init/struct/create_offer.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_offer.xml
rename to others/db_changes/data_alias/basic/init/struct/create_offer.xml
diff --git a/others/db_changes/data_alias/struct/create_offeritem.xml b/others/db_changes/data_alias/basic/init/struct/create_offeritem.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_offeritem.xml
rename to others/db_changes/data_alias/basic/init/struct/create_offeritem.xml
diff --git a/others/db_changes/data_alias/struct/create_organisation.xml b/others/db_changes/data_alias/basic/init/struct/create_organisation.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_organisation.xml
rename to others/db_changes/data_alias/basic/init/struct/create_organisation.xml
diff --git a/others/db_changes/data_alias/struct/create_person.xml b/others/db_changes/data_alias/basic/init/struct/create_person.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_person.xml
rename to others/db_changes/data_alias/basic/init/struct/create_person.xml
diff --git a/others/db_changes/data_alias/struct/create_prod2prod.xml b/others/db_changes/data_alias/basic/init/struct/create_prod2prod.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_prod2prod.xml
rename to others/db_changes/data_alias/basic/init/struct/create_prod2prod.xml
diff --git a/others/db_changes/data_alias/struct/create_product.xml b/others/db_changes/data_alias/basic/init/struct/create_product.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_product.xml
rename to others/db_changes/data_alias/basic/init/struct/create_product.xml
diff --git a/others/db_changes/data_alias/struct/create_productprice.xml b/others/db_changes/data_alias/basic/init/struct/create_productprice.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_productprice.xml
rename to others/db_changes/data_alias/basic/init/struct/create_productprice.xml
diff --git a/others/db_changes/data_alias/struct/create_salesorder.xml b/others/db_changes/data_alias/basic/init/struct/create_salesorder.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesorder.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesorder.xml
diff --git a/others/db_changes/data_alias/struct/create_salesorderitem.xml b/others/db_changes/data_alias/basic/init/struct/create_salesorderitem.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesorderitem.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesorderitem.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_classification.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_classification.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_classification.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_classification.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_competition.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_competition.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_competition.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_competition.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_cycle.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_cycle.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_cycle.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_cycle.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_forecast.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_forecast.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_forecast.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_forecast.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_member.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_member.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_member.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_member.xml
diff --git a/others/db_changes/data_alias/struct/create_salesproject_source.xml b/others/db_changes/data_alias/basic/init/struct/create_salesproject_source.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_salesproject_source.xml
rename to others/db_changes/data_alias/basic/init/struct/create_salesproject_source.xml
diff --git a/others/db_changes/data_alias/struct/create_stock.xml b/others/db_changes/data_alias/basic/init/struct/create_stock.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_stock.xml
rename to others/db_changes/data_alias/basic/init/struct/create_stock.xml
diff --git a/others/db_changes/data_alias/struct/create_task.xml b/others/db_changes/data_alias/basic/init/struct/create_task.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_task.xml
rename to others/db_changes/data_alias/basic/init/struct/create_task.xml
diff --git a/others/db_changes/data_alias/struct/create_timetracking.xml b/others/db_changes/data_alias/basic/init/struct/create_timetracking.xml
similarity index 100%
rename from others/db_changes/data_alias/struct/create_timetracking.xml
rename to others/db_changes/data_alias/basic/init/struct/create_timetracking.xml
diff --git a/others/db_changes/dashboardChangelog.xml b/others/db_changes/data_alias/changelog.xml
similarity index 80%
rename from others/db_changes/dashboardChangelog.xml
rename to others/db_changes/data_alias/changelog.xml
index e47788724f67f0e4f30e5cacd57747370332268a..0754d5e05adc7a470dd86c988b58939825717e3d 100644
--- a/others/db_changes/dashboardChangelog.xml
+++ b/others/db_changes/data_alias/changelog.xml
@@ -1,5 +1,5 @@
<?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">
- <include file="data_alias/data/DASHLET_data.xml"/>
- <include file="data_alias/data/DASHLETCONFIGURATION_data.xml"/>
+ <include file="basic/init/init.xml"/>
+ <include file="basic/2019.2/changelog.xml"/>
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/DASHLET_data.xml b/others/db_changes/data_alias/data/DASHLET_data.xml
deleted file mode 100644
index d7e2561fb92ca8ed0cda313aab3a1940d67be47e..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/DASHLET_data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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="m.escher" id="1203e9e4-472b-48ac-9d6b-23ebae976beb">
- <delete tableName="ASYS_DASHLETS"/>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml b/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml
deleted file mode 100644
index 806289ad7ee1782eac9fa94e9047cab38ee53828..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_organisation/ORGANISATION_mass.xml
+++ /dev/null
@@ -1,579 +0,0 @@
-<?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.goderbauer" id="ded084f6-174d-49a9-a829-f49590c1cc85">
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f7310676-b0c6-412d-917f-3b21ad80d610"/>
- <column name="NAME" value="Sieber Kältetechnik "/>
- <column name="CUSTOMERCODE" value="00000006"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e913fcce-0722-44ee-9964-a91dc90cfefe"/>
- <column name="ORGANISATION_ID" value="f7310676-b0c6-412d-917f-3b21ad80d610"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="ded2582c-1c97-4e06-8d12-16ae00b60fb7"/>
- <column name="NAME" value="Amberger Dental & Technik GmbH & Co.KG "/>
- <column name="CUSTOMERCODE" value="00000007"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e1ee1d84-c9eb-4000-8921-b342db81d534"/>
- <column name="ORGANISATION_ID" value="ded2582c-1c97-4e06-8d12-16ae00b60fb7"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f8bf3212-d698-45a5-8270-5b786a83ce28"/>
- <column name="NAME" value="Winkelberg Versicherung "/>
- <column name="CUSTOMERCODE" value="00000008"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d8ea5981-ab27-4371-8a8b-65225d00dad9"/>
- <column name="ORGANISATION_ID" value="f8bf3212-d698-45a5-8270-5b786a83ce28"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d7f9af7d-c09b-41dd-88d0-8d66f464be19"/>
- <column name="NAME" value="Brandenburg Versicherungs AG "/>
- <column name="CUSTOMERCODE" value="00000009"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="de0ec35f-d123-4cbf-aa76-9089fbe6c3c3"/>
- <column name="ORGANISATION_ID" value="d7f9af7d-c09b-41dd-88d0-8d66f464be19"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e29b1302-68f6-4326-b9b2-dee3da297bc8"/>
- <column name="NAME" value="Lieferdienst GmbH und Co.KG"/>
- <column name="CUSTOMERCODE" value="00000010"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e16eb8a4-dffd-4a4a-8398-d1de4968f64f"/>
- <column name="ORGANISATION_ID" value="e29b1302-68f6-4326-b9b2-dee3da297bc8"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f304765c-7513-4ad6-89a5-e158c592c8be"/>
- <column name="NAME" value="Schwan GmbH"/>
- <column name="CUSTOMERCODE" value="00000011"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="ef9b34a6-c930-4ce0-939d-cdc5417f39d3"/>
- <column name="ORGANISATION_ID" value="f304765c-7513-4ad6-89a5-e158c592c8be"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="ec6d609f-6623-4589-ae32-9b957a9a0865"/>
- <column name="NAME" value="Neumann GmbH Tunnelvortriebstechnik "/>
- <column name="CUSTOMERCODE" value="00000012"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="da3fca12-14ae-4d1e-aece-40f96dae345a"/>
- <column name="ORGANISATION_ID" value="ec6d609f-6623-4589-ae32-9b957a9a0865"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d3138d27-4c09-4c0a-b647-ffe62bb7a425"/>
- <column name="NAME" value="Liebik KG"/>
- <column name="CUSTOMERCODE" value="00000013"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="f462072b-6ead-4d85-aba2-c87573f8a7b8"/>
- <column name="ORGANISATION_ID" value="d3138d27-4c09-4c0a-b647-ffe62bb7a425"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="dfcb852d-8730-4fc2-9999-4e5ab86114f7"/>
- <column name="NAME" value="JKL Ltd."/>
- <column name="CUSTOMERCODE" value="00000014"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d321e2b4-f97e-4754-ba16-ab4853512c3c"/>
- <column name="ORGANISATION_ID" value="dfcb852d-8730-4fc2-9999-4e5ab86114f7"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f0c7b4c7-e9f2-45d0-b823-771483a40c6d"/>
- <column name="NAME" value="SF Engineering-Services Ltd."/>
- <column name="CUSTOMERCODE" value="00000015"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="ff7978e6-9053-48fc-8dc2-b6ee93f71b32"/>
- <column name="ORGANISATION_ID" value="f0c7b4c7-e9f2-45d0-b823-771483a40c6d"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d9a40db6-7ec7-4271-af7b-649cbc1fd03f"/>
- <column name="NAME" value="Wolfshofer AG "/>
- <column name="CUSTOMERCODE" value="00000016"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d9a72273-fe0c-4461-bff0-851c294718c1"/>
- <column name="ORGANISATION_ID" value="d9a40db6-7ec7-4271-af7b-649cbc1fd03f"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d07a6321-ac60-4f58-a35d-80f6c8e4fc59"/>
- <column name="NAME" value="Grün Versicherung AG "/>
- <column name="CUSTOMERCODE" value="00000017"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d60e2e0d-bf6a-437d-89a8-841b09f4a899"/>
- <column name="ORGANISATION_ID" value="d07a6321-ac60-4f58-a35d-80f6c8e4fc59"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d4b18031-b1ad-4a5f-8c3f-1f483775ede3"/>
- <column name="NAME" value="Verband für Bauwirtschaft "/>
- <column name="CUSTOMERCODE" value="00000018"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d94ccadb-0022-4eb7-86ae-ba011fd257eb"/>
- <column name="ORGANISATION_ID" value="d4b18031-b1ad-4a5f-8c3f-1f483775ede3"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d882e2c8-84bd-411c-84db-81513e8d1918"/>
- <column name="NAME" value="Paseo S.R.L."/>
- <column name="CUSTOMERCODE" value="00000019"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e867c779-34bd-4659-88dc-eb0ae056c37f"/>
- <column name="ORGANISATION_ID" value="d882e2c8-84bd-411c-84db-81513e8d1918"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d4fbee0e-57ac-47bd-bc62-d41d979d97f1"/>
- <column name="NAME" value="Verband für Druckindustrie "/>
- <column name="CUSTOMERCODE" value="00000020"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d15f4906-3898-46f8-a039-03d58cfe56a9"/>
- <column name="ORGANISATION_ID" value="d4fbee0e-57ac-47bd-bc62-d41d979d97f1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d27d05dc-d06b-4cc6-8007-d13c0adff070"/>
- <column name="NAME" value="ZTN Ltd."/>
- <column name="CUSTOMERCODE" value="00000021"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e69a9f1c-1054-4ccf-8c3b-69ee1e8aa99b"/>
- <column name="ORGANISATION_ID" value="d27d05dc-d06b-4cc6-8007-d13c0adff070"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e7d22826-8d4c-428b-a45a-02b4257cc7f4"/>
- <column name="NAME" value="IKWA Services GmbH "/>
- <column name="CUSTOMERCODE" value="00000022"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e9ddbdbd-914f-4ade-944a-6de908168d19"/>
- <column name="ORGANISATION_ID" value="e7d22826-8d4c-428b-a45a-02b4257cc7f4"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e6f2aeba-ec06-4ebc-b6b3-43b3c977dc7e"/>
- <column name="NAME" value="KITAMURA MACHINERY CO., LTD."/>
- <column name="CUSTOMERCODE" value="00000023"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="de2733d3-e40a-4cb2-8c51-f02f36de0b7d"/>
- <column name="ORGANISATION_ID" value="e6f2aeba-ec06-4ebc-b6b3-43b3c977dc7e"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f71d811c-e7be-486f-95c4-6031dc3d8bbd"/>
- <column name="NAME" value="Bauunternehmen Wilhelm Huber GmbH"/>
- <column name="CUSTOMERCODE" value="00000024"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="da0463a5-10c4-4db1-9521-36c4e8d4894d"/>
- <column name="ORGANISATION_ID" value="f71d811c-e7be-486f-95c4-6031dc3d8bbd"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="efe2dc72-f8e9-42ce-858d-af597c66f9fd"/>
- <column name="NAME" value="Beck IT Support GmbH"/>
- <column name="CUSTOMERCODE" value="00000025"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e6b44ceb-2ec6-421f-b50f-33b1d7757cc8"/>
- <column name="ORGANISATION_ID" value="efe2dc72-f8e9-42ce-858d-af597c66f9fd"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="ff050ff3-ab15-4381-a911-a741425c73eb"/>
- <column name="NAME" value="Buchberger & Partner"/>
- <column name="CUSTOMERCODE" value="00000026"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="f97c4822-2157-4033-aa83-31c7704e6015"/>
- <column name="ORGANISATION_ID" value="ff050ff3-ab15-4381-a911-a741425c73eb"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f15728d5-acf6-4dd6-b3ee-27df76a3b91f"/>
- <column name="NAME" value="CCK GmbH"/>
- <column name="CUSTOMERCODE" value="00000027"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d6d540c1-3993-4037-98be-499486021b47"/>
- <column name="ORGANISATION_ID" value="f15728d5-acf6-4dd6-b3ee-27df76a3b91f"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="fbb39871-02d1-4912-86a7-796d261c88f8"/>
- <column name="NAME" value="Financial Group Chesterfield"/>
- <column name="CUSTOMERCODE" value="00000028"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="dc63e588-060b-441b-9790-b81574e2c544"/>
- <column name="ORGANISATION_ID" value="fbb39871-02d1-4912-86a7-796d261c88f8"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d3092cde-649d-4699-b0ae-52c93d639e78"/>
- <column name="NAME" value="Frankenmann Co.KG"/>
- <column name="CUSTOMERCODE" value="00000029"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="f89cbdb4-0dbf-4df0-8625-88cb4cc3fab1"/>
- <column name="ORGANISATION_ID" value="d3092cde-649d-4699-b0ae-52c93d639e78"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e5c0aa96-e196-4b5e-9e23-718b9bffc5d0"/>
- <column name="NAME" value="Friedrich & Frank GmbH"/>
- <column name="CUSTOMERCODE" value="00000030"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="f3641d66-a970-49a6-8143-340bc24cb352"/>
- <column name="ORGANISATION_ID" value="e5c0aa96-e196-4b5e-9e23-718b9bffc5d0"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d4f7cf2f-5f4f-4857-9f7c-fe3475b2803c"/>
- <column name="NAME" value="Lesser GmbH & Co.KG"/>
- <column name="CUSTOMERCODE" value="00000031"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="fea24840-5504-4c4c-86ba-84f0dc50f10e"/>
- <column name="ORGANISATION_ID" value="d4f7cf2f-5f4f-4857-9f7c-fe3475b2803c"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="d1aeaca7-96bc-4ef4-9aa5-b52e374df6b9"/>
- <column name="NAME" value="Förderverband Doritz"/>
- <column name="CUSTOMERCODE" value="00000032"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="dd0bf580-b86b-43c1-b202-fda20711c903"/>
- <column name="ORGANISATION_ID" value="d1aeaca7-96bc-4ef4-9aa5-b52e374df6b9"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f6763689-5cdc-47e3-97df-a3bdc579a383"/>
- <column name="NAME" value="GHG Consulting"/>
- <column name="CUSTOMERCODE" value="00000033"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e6ee4479-4f68-4002-a18b-b3cd0109fc18"/>
- <column name="ORGANISATION_ID" value="f6763689-5cdc-47e3-97df-a3bdc579a383"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f974fcf9-51f9-4469-b772-223ee625f5e2"/>
- <column name="NAME" value="Gorch Systems Engineering GmbH"/>
- <column name="CUSTOMERCODE" value="00000034"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="ecde89ab-4e30-484a-aec2-cff3069d25f6"/>
- <column name="ORGANISATION_ID" value="f974fcf9-51f9-4469-b772-223ee625f5e2"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e58a9160-d480-42c3-8ab3-7ca01f964570"/>
- <column name="NAME" value="Gußberg Software KG"/>
- <column name="CUSTOMERCODE" value="00000035"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="f0360f92-b881-4448-b250-d9f3cf18d9c1"/>
- <column name="ORGANISATION_ID" value="e58a9160-d480-42c3-8ab3-7ca01f964570"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e9c73782-7c8f-492e-8fa0-971b43f02710"/>
- <column name="NAME" value="Hartmann Großbau AG"/>
- <column name="CUSTOMERCODE" value="00000036"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="f191c170-84c3-4bcd-baf6-4b4b1e99bdf9"/>
- <column name="ORGANISATION_ID" value="e9c73782-7c8f-492e-8fa0-971b43f02710"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e717a3d3-9f83-45bc-8779-f17cee22ea5a"/>
- <column name="NAME" value="Immobilien & Vermögensberatung Steinmeier"/>
- <column name="CUSTOMERCODE" value="00000037"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d5dd7578-868e-4cc6-9c0f-27625c62c0be"/>
- <column name="ORGANISATION_ID" value="e717a3d3-9f83-45bc-8779-f17cee22ea5a"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="fd0da4f9-0898-48f7-bf35-b7d29a2e78d0"/>
- <column name="NAME" value="KPO Kernsysteme"/>
- <column name="CUSTOMERCODE" value="00000038"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="dae79c22-a04b-4948-97ee-a41d2d4c187b"/>
- <column name="ORGANISATION_ID" value="fd0da4f9-0898-48f7-bf35-b7d29a2e78d0"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f9842336-8544-4c58-9bac-f957e8ef22d6"/>
- <column name="NAME" value="Kfz Verkaufsgruppe PHK"/>
- <column name="CUSTOMERCODE" value="00000039"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="d1d6c1cd-23d9-46a5-a560-df7f11cc63ea"/>
- <column name="ORGANISATION_ID" value="f9842336-8544-4c58-9bac-f957e8ef22d6"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f7aaa4f6-340a-48e4-874f-7287e440f6e0"/>
- <column name="NAME" value="Marketingcenter Eyespace"/>
- <column name="CUSTOMERCODE" value="00000040"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e6b57b4e-3776-4e79-9998-3aba2ee46923"/>
- <column name="ORGANISATION_ID" value="f7aaa4f6-340a-48e4-874f-7287e440f6e0"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f61b71b4-9e5f-4fee-929c-c13ded95ece6"/>
- <column name="NAME" value="Rüdiger Marsenburg GmbH"/>
- <column name="CUSTOMERCODE" value="00000041"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="ed394880-74d7-4b2c-b781-b24b003b6871"/>
- <column name="ORGANISATION_ID" value="f61b71b4-9e5f-4fee-929c-c13ded95ece6"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f4bb9045-7280-4f21-a0f9-c909fac23b23"/>
- <column name="NAME" value="Van Hug Financial Service"/>
- <column name="CUSTOMERCODE" value="00000042"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="f4a95bcf-799f-41ab-b77c-8f05e3a66627"/>
- <column name="ORGANISATION_ID" value="f4bb9045-7280-4f21-a0f9-c909fac23b23"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e54e7d63-6bfc-46a6-a0c7-0fca2478331e"/>
- <column name="NAME" value="Versicherungen ABK AG"/>
- <column name="CUSTOMERCODE" value="00000043"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e808ba75-6c12-4b0a-88ae-779fb9894fda"/>
- <column name="ORGANISATION_ID" value="e54e7d63-6bfc-46a6-a0c7-0fca2478331e"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f6f65e33-95b2-4aeb-ac30-6b33ea00f595"/>
- <column name="NAME" value="Weinbuch Deutschland GmbH"/>
- <column name="CUSTOMERCODE" value="00000044"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e465cc10-0fb9-4a67-a135-e10c72c10f49"/>
- <column name="ORGANISATION_ID" value="f6f65e33-95b2-4aeb-ac30-6b33ea00f595"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="f1eabc20-c1b1-4865-aded-db902c3ab1f5"/>
- <column name="NAME" value="Wellington Wings Corp."/>
- <column name="CUSTOMERCODE" value="00000045"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e6d8384e-4ba1-4784-86b4-18e36e1b33d5"/>
- <column name="ORGANISATION_ID" value="f1eabc20-c1b1-4865-aded-db902c3ab1f5"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="dfaf3c29-5317-46e3-be83-cff4a52cd6fd"/>
- <column name="NAME" value="Zimmermann Logistik AG"/>
- <column name="CUSTOMERCODE" value="00000046"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="f7179fda-231d-40d4-a7b6-b2dab5cd76cf"/>
- <column name="ORGANISATION_ID" value="dfaf3c29-5317-46e3-be83-cff4a52cd6fd"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_andre.xml b/others/db_changes/data_alias/data/example_person/PERSON_andre.xml
deleted file mode 100644
index 1cd2295f16078c45252599c0a730f6cef626be03..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_andre.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Peter"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Andre"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="TITLE" value="Dr."/>
- <column name="DATEOFBIRTH" valueDate="1980-10-14"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be1a978-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be1a978-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be1a824-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_braun.xml b/others/db_changes/data_alias/data/example_person/PERSON_braun.xml
deleted file mode 100644
index d9b3f6058fecfb5ccedc4fdd18899fcef827cc98..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_braun.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Herbert"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Braun"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1994-04-08"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d73d3c-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d73d3c-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d73c10-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_carolin.xml b/others/db_changes/data_alias/data/example_person/PERSON_carolin.xml
deleted file mode 100644
index 5a1cec1c52b17b2b2a927f945b345ec79a85c22c..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_carolin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Carolin"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Schmitt"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="DATEOFBIRTH" valueDate="1960-12-16"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d73aee-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d73aee-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d739c2-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml b/others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml
deleted file mode 100644
index ffa0cd46f9e681d69a08b5a081d6036e4be67894..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_grenzer.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Peter"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Grenzer"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1982-08-25"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be18e20-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be18e20-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be18cf4-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_haller.xml b/others/db_changes/data_alias/data/example_person/PERSON_haller.xml
deleted file mode 100644
index 8bc9519adaa91bbc29adb66ad4cf830fdaf1c323..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_haller.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Erna"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Haller"/>
- <column name="SALUTATION" value="Mrs."/>
- <column name="DATEOFBIRTH" valueDate="1961-09-29"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d74ec6-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d74ec6-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d74d90-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_hamann.xml b/others/db_changes/data_alias/data/example_person/PERSON_hamann.xml
deleted file mode 100644
index a227f859dfcefa9de75e7a60b68f95c99798c036..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_hamann.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Suse"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Hamann"/>
- <column name="SALUTATION" value="Mrs."/>
- <column name="DATEOFBIRTH" valueDate="1985-03-24"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be1a0ae-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be1a0ae-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be19f82-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_hausler.xml b/others/db_changes/data_alias/data/example_person/PERSON_hausler.xml
deleted file mode 100644
index b13f079e828f12dc3c7ff6529a3637e46c277c29..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_hausler.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Gerd"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Hausler"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1988-12-23"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be17ffc-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be17ffc-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d75236-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml b/others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml
deleted file mode 100644
index 20a783b033e90d9549114ed305c3065b3a2e41cc..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_hinterecker.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Thomas"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Hinterecker"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1955-08-15"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be18402-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be18402-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be182a4-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml b/others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml
deleted file mode 100644
index ee624ba82d12e745345f4b211eb56614bdfd051c..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_hugenmaier.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Josef"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Hugenmaier"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1960-11-13"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be19532-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be19532-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be193fc-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_kormann.xml b/others/db_changes/data_alias/data/example_person/PERSON_kormann.xml
deleted file mode 100644
index f67fb96d8fd080672e781616b2ed87dfe34520f2..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_kormann.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Annette"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Kormann"/>
- <column name="SALUTATION" value="Madame"/>
- <column name="DATEOFBIRTH" valueDate="1986-02-17"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be19780-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be19780-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be19654-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_miller.xml b/others/db_changes/data_alias/data/example_person/PERSON_miller.xml
deleted file mode 100644
index 4ae837c5b06e8baafb3f3c0d4b79abeec107ff35..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_miller.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Berd"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Miller"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="TITLE" value="Dr."/>
- <column name="DATEOFBIRTH" valueDate="1971-05-21"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be18baa-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be18baa-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_petersen.xml b/others/db_changes/data_alias/data/example_person/PERSON_petersen.xml
deleted file mode 100644
index 5b8ad4496da078c71f1c2f3ef357131bd0dc12f1..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_petersen.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Peter"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Petersen"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1991-03-17"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d75114-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d75114-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d74ff2-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml b/others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml
deleted file mode 100644
index 3b1bfa89f37252ade6bd69781029489fd8436517..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_reisecker.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Claudia"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Reisecker"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="TITLE"/>
- <column name="DATEOFBIRTH" valueDate="1967-09-03"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be1906e-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be1906e-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be18f42-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_rieber.xml b/others/db_changes/data_alias/data/example_person/PERSON_rieber.xml
deleted file mode 100644
index 66b73d866d74cce15f941b214e00eb47d5e01cc5..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_rieber.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Mark"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Rieber"/>
- <column name="SALUTATION" value="Mr."/>
- <column name="DATEOFBIRTH" valueDate="1948-02-09"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d744f8-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d744f8-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d743a4-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml b/others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml
deleted file mode 100644
index 23abe3cf862f760d8905c726b75a15cc6a9bcce2..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_robert_sommer.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Robert"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Sommer"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1956-07-02"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d7478c-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d7478c-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d74660-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml b/others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml
deleted file mode 100644
index fcd1003977eee51351b0e6f9b6f1086344542059..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_saubermann.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Walter"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Saubermann"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1985-10-22"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d73f8a-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d73f8a-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d73e68-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml b/others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml
deleted file mode 100644
index 4d55e6d169ec2a21a444deb9aa0276683218d273..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_schmitt.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Paula"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Schmitt"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="DATEOFBIRTH" valueDate="1988-05-06"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d73864-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d73864-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d73530-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_stone.xml b/others/db_changes/data_alias/data/example_person/PERSON_stone.xml
deleted file mode 100644
index 83fe11ccd0450b587bed56ffd1adbfce824e5049..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_stone.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Sharon"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Stone"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="TITLE" value="Prof."/>
- <column name="DATEOFBIRTH" valueDate="1976-03-15"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be1892a-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be1892a-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be1852e-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_thaler.xml b/others/db_changes/data_alias/data/example_person/PERSON_thaler.xml
deleted file mode 100644
index 6e7e5dc09220adf13e16a4d7e104531d4d626106..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_thaler.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Kristiane"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Thaler"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="DATEOFBIRTH" valueDate="2001-02-23"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be199d8-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be199d8-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be198ac-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_traum.xml b/others/db_changes/data_alias/data/example_person/PERSON_traum.xml
deleted file mode 100644
index 040b5f4e190d81013c3d9beba1a4c20748e00866..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_traum.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Prinz"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Traum"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="2002-02-26"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be19e60-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be19e60-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be19d0c-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_vogel.xml b/others/db_changes/data_alias/data/example_person/PERSON_vogel.xml
deleted file mode 100644
index e0e8207a020c6d38da2ad0aa9b49d1f30bf2e2d1..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_vogel.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Franz"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Vogel"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="2011-10-16"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="73d74c3c-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d74c3c-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="73d748ae-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/example_person/PERSON_walter.xml b/others/db_changes/data_alias/data/example_person/PERSON_walter.xml
deleted file mode 100644
index 4b0b2b40869aa665ee5fefc3dfb4cfe7c5f17b18..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/example_person/PERSON_walter.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="FIRSTNAME" value="Fritz"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Walter"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1957-03-05"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="CONTACTID" value="6be1a2fc-e7fa-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="328b8a8b-c053-447a-bc69-17965b6a60ae"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="6be1a2fc-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="6be1a1d0-e7fa-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/others/db_changes/data_alias/data/readme.adoc b/others/db_changes/data_alias/data/readme.adoc
deleted file mode 100644
index cd184b938dd78eab57a32d0e3f7bbd9f61314e63..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/data/readme.adoc
+++ /dev/null
@@ -1 +0,0 @@
-== Readme
\ No newline at end of file
diff --git a/others/db_changes/data_alias/struct/readme.adoc b/others/db_changes/data_alias/struct/readme.adoc
deleted file mode 100644
index cd184b938dd78eab57a32d0e3f7bbd9f61314e63..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/struct/readme.adoc
+++ /dev/null
@@ -1 +0,0 @@
-== Readme
\ No newline at end of file
diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml
deleted file mode 100644
index fff9f3760f6b8cf8058fe0ddf467e9dc512cd56b..0000000000000000000000000000000000000000
--- a/others/db_changes/masterChangelog.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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">
- <include file="data_alias/struct/AditoBasic/create_ab_objectrelation.xml"/>
- <include file="data_alias/struct/AditoBasic/create_ab_attribute.xml"/>
- <include file="data_alias/struct/AditoBasic/create_ab_attributerelation.xml"/>
- <include file="data_alias/struct/AditoBasic/create_ab_attributeusage.xml"/>
- <include file="data_alias/struct/AditoBasic/create_ab_keyword_entry.xml"/>
- <include file="data_alias/struct/AditoBasic/create_ab_keyword_attribute.xml"/>
- <include file="data_alias/struct/AditoBasic/create_ab_keyword_attributerelation.xml"/>
- <include file="data_alias/struct/AditoBasic/create_ab_countryinfo.xml"/>
- <include file="data_alias/struct/AditoBasic/create_ab_language.xml"/>
-
- <include file="data_alias/struct/create_person.xml"/>
- <include file="data_alias/struct/create_organisation.xml"/>
- <include file="data_alias/struct/create_contact.xml"/>
- <include file="data_alias/struct/create_activity.xml"/>
- <include file="data_alias/struct/create_activitylink.xml"/>
- <include file="data_alias/struct/create_appointmentlink.xml"/>
- <include file="data_alias/struct/create_address.xml"/>
- <include file="data_alias/struct/create_communication.xml"/>
- <include file="data_alias/struct/create_contract.xml"/>
- <include file="data_alias/struct/create_product.xml"/>
- <include file="data_alias/struct/create_prod2prod.xml"/>
- <include file="data_alias/struct/create_productprice.xml"/>
- <include file="data_alias/struct/create_stock.xml"/>
- <include file="data_alias/struct/create_salesproject.xml"/>
- <include file="data_alias/struct/create_salesproject_classification.xml"/>
- <include file="data_alias/struct/create_salesproject_competition.xml"/>
- <include file="data_alias/struct/create_salesproject_cycle.xml"/>
- <include file="data_alias/struct/create_salesproject_forecast.xml"/>
- <include file="data_alias/struct/create_salesproject_member.xml"/>
- <include file="data_alias/struct/create_salesproject_source.xml"/>
- <include file="data_alias/struct/create_offer.xml"/>
- <include file="data_alias/struct/create_offeritem.xml"/>
- <include file="data_alias/struct/create_salesorder.xml"/>
- <include file="data_alias/struct/create_salesorderitem.xml"/>
- <include file="data_alias/struct/create_timetracking.xml"/>
- <include file="data_alias/struct/create_task.xml"/>
-
- <include file="data_alias/data/example_organisation/ORGANISATION_privat.xml"/>
- <include file="data_alias/data/example_organisation/ORGANISATION_gfk.xml"/>
- <include file="data_alias/data/example_organisation/ORGANISATION_mnf.xml"/>
- <include file="data_alias/data/example_organisation/ORGANISATION_lichtenstein.xml"/>
- <include file="data_alias/data/example_organisation/ORGANISATION_kaeltetechnik.xml"/>
- <include file="data_alias/data/example_organisation/ORGANISATION_pichelmaier.xml"/>
- <include file="data_alias/data/example_person/PERSON_pfiffig.xml"/>
- <include file="data_alias/data/example_person/PERSON_sommer.xml"/>
- <include file="data_alias/data/example_person/PERSON_muller.xml"/>
- <include file="data_alias/data/example_person/PERSON_leicht.xml"/>
- <include file="data_alias/data/example_person/PERSON_kanzler.xml"/>
- <include file="data_alias/data/example_person/PERSON_gruener.xml"/>
- <include file="data_alias/data/example_person/PERSON_obermeier.xml"/>
- <include file="data_alias/data/example_person/PERSON_smith.xml"/>
- <include file="data_alias/data/example_person/PERSON_lustig.xml"/>
- <include file="data_alias/data/example_contract/CONTRACT_1000.xml"/>
- <include file="data_alias/data/example_contract/CONTRACT_1001.xml"/>
- <include file="data_alias/data/example_contract/CONTRACT_1002.xml"/>
- <include file="data_alias/data/example_contract/CONTRACT_1003.xml"/>
- <include file="data_alias/data/example_contract/CONTRACT_1004.xml"/>
- <include file="data_alias/data/example_product/PRODUCT_42154311.xml"/>
- <include file="data_alias/data/example_salesproject/SALESPROJECT_gfk.xml"/>
- <include file="data_alias/data/example_salesproject/SALESPROJECT_jkl.xml"/>
- <include file="data_alias/data/example_activity/example_activity_gfk.xml"/>
- <include file="data_alias/data/example_offer/OFFER_1000.xml"/>
- <include file="data_alias/data/example_offer/OFFER_1001.xml"/>
- <include file="data_alias/data/example_offer/OFFER_1002.xml"/>
- <include file="data_alias/data/example_offer/OFFER_1003.xml"/>
- <include file="data_alias/data/example_offer/OFFER_1004.xml"/>
- <include file="data_alias/data/example_salesorder/SALESORDER_1000.xml"/>
- <include file="data_alias/data/example_salesorder/SALESORDER_1001.xml"/>
- <include file="data_alias/data/example_salesorder/SALESORDER_1002.xml"/>
- <include file="data_alias/data/example_salesorder/SALESORDER_1003.xml"/>
- <include file="data_alias/data/example_salesorder/SALESORDER_1004.xml"/>
- <include file="data_alias/data/example_task/base.xml"/>
-
- <!--reference files for keywords:-->
- <include file="data_alias/data/AditoBasic/ab_keyword_entry.xml"/>
- <include file="data_alias/data/AditoBasic/ab_keyword_attribute.xml"/>
- <!--special case countryinfo data-->
- <include file="data_alias/data/AditoBasic/ab_countryinfo/init_ab_countryinfo.xml"/>
-
- <include file="data_alias/data/AditoBasic/init_ab_language.xml"/>
-
- <include file="data_alias/struct/changes/1550581092255-OfferProbability.xml"/>
- <include file="data_alias/struct/changes/1550652606707-ActivityCategory.xml"/>
- <include file="data_alias/struct/changes/1550654673223-CommunicationMedium.xml"/>
- <include file="data_alias/struct/changes/1550658375344-AddressType.xml"/>
- <include file="data_alias/struct/changes/1550671004296-SalesProjectEstimation.xml"/>
- <include file="data_alias/struct/changes/1550663697843-SalesProjectStrength.xml"/>
- <include file="data_alias/struct/changes/15506733864429-SalesProjectState.xml"/>
- <include file="data_alias/struct/changes/1550659558300-SalesProjectWeakness.xml"/>
- <include file="data_alias/struct/changes/1550659558300-SalesProjectPricePolitics.xml"/>
- <include file="data_alias/struct/changes/1550732429916-TaskPriority.xml"/>
-</databaseChangeLog>
diff --git a/others/db_changes/readme.adoc b/others/db_changes/readme.adoc
index 0eb0f310d1afc59d57d5cff6b0ce5e84543ce4ed..e9bf2e4ff2a4a42d4252dc99c44fc2230751d85d 100644
--- a/others/db_changes/readme.adoc
+++ b/others/db_changes/readme.adoc
@@ -1,6 +1,8 @@
liquibase-readme
================
+== TODO: update to new Structure ==
+
== Structure within ADITO
=== in theory
diff --git a/others/db_changes/system_alias/EXPERIMENTAL_system_aliasDefault.xml b/others/db_changes/system_alias/EXPERIMENTAL_system_aliasDefault.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4e94f2543871caa8a6c85f12715d0856d3f6a6e2
--- /dev/null
+++ b/others/db_changes/system_alias/EXPERIMENTAL_system_aliasDefault.xml
@@ -0,0 +1,18 @@
+<?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">
+ <include file="struct/create_asys_aliasconfig.xml"/>
+ <include file="struct/create_asys_binaries.xml"/>
+ <include file="struct/create_asys_dashletconfigurations.xml"/>
+ <include file="struct/create_asys_dashlets.xml"/>
+ <include file="struct/create_asys_notifications.xml"/>
+ <include file="struct/create_asys_sequences.xml"/>
+ <include file="struct/create_asys_system.xml"/>
+ <include file="struct/create_asys_timer.xml"/>
+ <include file="struct/create_asys_users.xml"/>
+ <include file="struct/create_asys_calendarbackend.xml"/>
+ <include file="struct/create_asys_calendarlink.xml"/>
+
+ <include file="data/insert_asys_aliasconfig.xml"/>
+ <include file="data/insert_asys_system.xml"/>
+ <include file="data/insert_asys_users-admin.xml"/>
+</databaseChangeLog>
diff --git a/others/db_changes/system_alias/system_aliasTestdata.xml b/others/db_changes/system_alias/system_aliasTestdata.xml
new file mode 100644
index 0000000000000000000000000000000000000000..12e4b957ade3bd0f87acb1decb681cb98398f0df
--- /dev/null
+++ b/others/db_changes/system_alias/system_aliasTestdata.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">
+ <include file="data/example_asys_users/Birgit_Leicht.xml"/>
+ <include file="data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
+ <include file="data/example_asys_users/Harold_Smith.xml"/>
+ <include file="data/example_asys_binaries/Harold_Smith_Image.xml"/>
+ <include file="data/example_asys_users/Herbert_Obermeier.xml"/>
+ <include file="data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
+ <include file="data/example_asys_users/Lisa_Sommer.xml"/>
+ <include file="data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
+ <include file="data/example_asys_users/Susanne_Lustig.xml"/>
+ <include file="data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
+</databaseChangeLog>
diff --git a/others/db_changes/system_aliasTestdata.xml b/others/db_changes/system_aliasTestdata.xml
deleted file mode 100644
index bdd0d606f861dca732d8a5d61549711f09eba4f5..0000000000000000000000000000000000000000
--- a/others/db_changes/system_aliasTestdata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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">
- <include file="system_alias/data/example_asys_users/Birgit_Leicht.xml"/>
- <include file="system_alias/data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
- <include file="system_alias/data/example_asys_users/Harold_Smith.xml"/>
- <include file="system_alias/data/example_asys_binaries/Harold_Smith_Image.xml"/>
- <include file="system_alias/data/example_asys_users/Herbert_Obermeier.xml"/>
- <include file="system_alias/data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
- <include file="system_alias/data/example_asys_users/Lisa_Sommer.xml"/>
- <include file="system_alias/data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
- <include file="system_alias/data/example_asys_users/Susanne_Lustig.xml"/>
- <include file="system_alias/data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
-</databaseChangeLog>
diff --git a/others/guide/HowToDataLib.adoc b/others/guide/HowToDataLib.adoc
index b331b7eb20e5498b7591e27f8bf1c4fdb4a16aba..f16c4f8b74628f20c0a95c2799a747a8e7eb6cf0 100644
--- a/others/guide/HowToDataLib.adoc
+++ b/others/guide/HowToDataLib.adoc
@@ -36,7 +36,7 @@ var myDescriptiveNameOfTheTree = new DataTree(alias);
// or
var myDescriptiveNameOfTheTree = DataTree.begin(alias);
----
-* use the object, add conditions
+* use the object, add conditions with add(uid, parent, itemArray)
[source,javascript]
----
var myTree = myDescriptiveNameOfTheTree.add("1", "myRoot", ["itemId1", "value"])
@@ -44,7 +44,7 @@ var myTree = myDescriptiveNameOfTheTree.add("1", "myRoot", ["itemId1", "value"])
.add("3", "2", ["itemId3", "value"])
.add("4", "2", ["itemId4", "value"])
.add("5", "4", ["itemId5", "value"])
- .add("5", "3", ["itemId5", "value"]) // Now you added id "5" a seccond time.
+ .add("5", "3", ["itemId5", "value"]) // Now you added id "5" a second time, overrides previous entry with id 5
.getTreeObject();
var myArray = myDescriptiveNameOfTheTree.toArray();
@@ -92,7 +92,7 @@ var myTree = myDescriptiveName.add("1", "myRoot", ["itemId1", "value"])
Note that if you add an item two times, only the data-array of the second item is used! It will overwrite the data from the first one!
== When to use which ==
-If you only need a array with parent - child - structure e.g. for the treetable or charts, use
+If you only need an array with parent - child - structure e.g. for the treetable or charts, use
ReferencingData
If you need a tree object for your logic, use DataTree.
\ No newline at end of file
diff --git a/others/guide/HowToSqlConditionLib.adoc b/others/guide/HowToSqlConditionLib.adoc
index 82f29b1b846b875aee80c5eaa7052726dd50c010..51e953b5a3c983c2ce0a3ac82c36f998d48e95ce 100644
--- a/others/guide/HowToSqlConditionLib.adoc
+++ b/others/guide/HowToSqlConditionLib.adoc
@@ -29,8 +29,8 @@ var myDescriptiveNameOfTheCondition = SqlCondition.begin(alias);
* use the object, add conditions
[source,javascript]
----
-myDescriptiveNameOfTheCondition.orPrepare("PERSON.FIRSTNAME", "Bob")
- .orPrepare("PERSON.LASTNAME", "Meier");
+myDescriptiveNameOfTheCondition.orPrepare("PERSON.FIRSTNAME", "Bob")
+ .orPrepare("PERSON.LASTNAME", "Meier"); // orPrepare explained in "available methods" below
----
* You can also use table aliases, if you provide the table, column and alias as array.
The table name has to be provided for loading the data types but the alias is built into the sql.
@@ -82,11 +82,11 @@ The field name needs to be given with
Or if you use only COLUMNNAME, you have to provide the fieldType.
But keep in mind: Other than the original adito db. functions this lib caches the field types automatically (for the livetime of an SqlCondition Object).
-So most times it is save to use the first method. Even in loops or if you use the same Column several times.
+So most times it is save to use the first method. Even in loops or if you use the same column several times.
[source,javascript]
----
-myDescriptiveNameOfTheCondition.orPrepared("PERSON.FIRSTNAME", 'Bob', "#<?");
+myDescriptiveNameOfTheCondition.orPrepared("PERSON.FIRSTNAME", 'Bob', "#<?"); // #(field) < ?(value)
----
=== andPreparedVars / orPreparedVars ===
@@ -126,7 +126,7 @@ var myConditionSql = myDescriptiveNameOfTheCondition.toWhereString("1=0");
----
=== preparedValues ===
-This is no method but a membervariable.
+This is no method but a member variable.
It contains the array with the prepared values.
[source,javascript]
diff --git a/others/guide/PersonOrganisationContact.adoc b/others/guide/PersonOrganisationContact.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7d7a1b33f971b107ef28b8f4a6a5885a9e10a3f5
--- /dev/null
+++ b/others/guide/PersonOrganisationContact.adoc
@@ -0,0 +1,39 @@
+Person, Organisation, Contact
+=============================
+:toc2: left
+:numbered:
+
+== Differences to old Adito ==
+
+The old Adito basic had:
+
+- Pers
+- Org
+- Relation
+
+They are not gone, just renamed:
+
+- Pers = Person
+- Org = Organisation
+- Relation = Contact
+
+TODO: doku erweitern
+erson, Organisation, Contact
+===========================================
+:toc2: left
+:numbered:
+
+== Differences to old Adito ==
+
+The old Adito basic had:
+
+- Pers
+- Org
+- Relation
+
+They are not gone, just renamed:
+
+- Pers = Person
+- Org = Organisation
+- Relation = Contact
+
diff --git a/others/guide/ProviderConsumerParameter.adoc b/others/guide/ProviderConsumerParameter.adoc
index 67b427e998091baebd9d482c2de581b3d20d2dea..ee9ff59bc7d051dc069cd0ba1a409887036f8f8c 100644
--- a/others/guide/ProviderConsumerParameter.adoc
+++ b/others/guide/ProviderConsumerParameter.adoc
@@ -25,7 +25,7 @@ If you connect to *EmailCommunications* you get *only the Email* communication t
If you connect to *PhoneCommunications* you get *only the Phone* communication type of a contact.
*Important:*
-*Do not always create a new provider when connecting a new entity. Maybe u can use an already existing provider.*
+*Do not always create a new provider when connecting a new entity. Maybe you can use an already existing provider.*
*Try to reuse providers if you need similar data for two dependencies*
=== Consumer ===
diff --git a/others/guide/TargetContext.adoc b/others/guide/TargetContext.adoc
index 89155b20aa2879693555d901cf1f6f5445f002ab..1d466a0da9c53953491cf301711f745d6d8478e4 100644
--- a/others/guide/TargetContext.adoc
+++ b/others/guide/TargetContext.adoc
@@ -16,4 +16,4 @@ It is configured by two properties of the providers.
* targetContextField
* targetIdField
-You can provide an entity-field for each of them which contain the contextId (currently the contextName 13.02.2019) and the rowId (UID) which should be used to open the preview or main view.
\ No newline at end of file
+You can provide an entity-field for each of them which contains the contextId (currently the contextName 13.02.2019) and the rowId (UID) which should be used to open the preview or main view.
\ No newline at end of file
diff --git a/others/guide/how to copy objects with subitems.adoc b/others/guide/how to copy objects with subitems.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..63f85af69459e163f28844400e364f42d7ca8023
--- /dev/null
+++ b/others/guide/how to copy objects with subitems.adoc
@@ -0,0 +1,100 @@
+How to make an action for copying modules
+=========================================
+:toc2: left
+:numbered:
+
+== What this guide is for ==
+You want to create an action or process that should copy a module with
+related sub-items.
+(for example: Offer + OfferItems, Order + OrderItems)
+
+== How to do it ==
+There are two possibilities when it comes to creating a new dataset based on another one:
+
+* Save it directly and open the created dataset in show-mode
+* Open it in new-mode so that the user can make changes first or cancel the action
+
+=== Save it directly ===
+This is relatively easy to do with the functions in the Neon_lib.
+At first you have make the copy with the method "CopyModuleUtils.copyModule". It requires an InputMapping object that
+defines the structure of the module. For example:
+
+[source, javascript]
+----
+var InputMapping = {
+ "OFFER": {
+ condition: "OFFERID = '" + vars.get("$field.OFFERID") + "'"
+ , ValueMapping: {
+ "OFFER_ID": ""
+ , "OFFERCODE": OfferUtils.getNextOfferNumber()
+ , "VERSNR": "1"
+ }
+ , SubModules:{
+ "OFFERITEM": {
+ condition: "OFFER_ID = '" + vars.get("$field.OFFERID") + "' order by ITEMSORT"
+ }
+ }
+ }
+}
+----
+
+The root element of the object (in this case 'OFFER') defines what module is copied, the condition is used to select the specific dataset.
+'ValueMapping' should be used when some fields need new values (for example the offercode should not be the same as in the copied object).
+You can also set 'SubModules' in order to copy sub-elements like offerItems.
+Now you just have to use the following code:
+
+[source, javascript]
+----
+var ModulesMapping = CopyModuleUtils.copyModule(InputMapping);
+
+CopyModuleUtils.openNewModules("Offer", ModulesMapping);
+----
+
+The first line copies the module and the second line opens the newly created dataset.
+
+=== Open it in new-mode first ===
+For this case it needs a few more steps. For values that should be preset in the edit view, you will need to create
+parameters in the entity for every one (set them exposed, triggerRecalculation and not mandatory). After that you have to use these parameters in the valueProcess of the fields
+they should fill.
+The next step is to create an action that opens the context in new-mode. That could look like this:
+
+[source, javascript]
+----
+var params = {
+ "ContactId_param" : vars.get("$field.CONTACT_ID"),
+ "SalesprojectId_param" : vars.get("$field.SALESPROJECT_ID"),
+ "OfferLanguage_param" : vars.get("$field.LANGUAGE"),
+ "OfferOriginal_Id_param" : vars.get("$field.OFFERID"),
+ "OfferCode_param" : vars.get("$field.OFFERCODE"),
+ "OfferVersnr_param" : OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE")),
+ "OfferCurrency_param" : vars.get("$field.CURRENCY"),
+ "OfferAddress_param" : vars.get("$field.ADDRESS"),
+ "OfferHeader_param" : vars.get("$field.HEADER")
+}
+neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
+----
+
+Important: There has to be one parameter for the id, so that sub-items can be copied (see the following).
+
+Now we can preset values of the module, but what about related things like offerItems?
+For that we use the same function as in the section above. Because the offerItems should only be copied to the new offer when the user
+saved it, this has to be done in the onInsert-process of the recordcontainer.
+
+[source, javascript]
+----
+if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.OfferOriginal_Id_param"))
+{
+ var InputMapping = {
+ "OFFERITEM": {
+ condition: "OFFER_ID = '" + vars.getString("$param.OfferOriginal_Id_param") + "' order by ITEMSORT",
+ ValueMapping: {
+ "OFFER_ID" : vars.get("$field.OFFERID")
+ }
+ }
+ };
+ CopyModuleUtils.copyModule(InputMapping);
+}
+----
+
+The offer is already created, so that only offerItem is needed in the 'InputMapping'. The 'condition' should use the id of the offer
+that is copied and in 'ValueMapping' the foreign-key 'OFFER_ID' gets the value of the id of the newly created offer.
\ No newline at end of file
diff --git a/others/guide/how to write JDito code.adoc b/others/guide/how to write JDito code.adoc
index cd6e8b4d635476ced35c0911c5ce7dff43b6e02e..e8ab96aef63360b0994d45cb45de3fd07b45230a 100644
--- a/others/guide/how to write JDito code.adoc
+++ b/others/guide/how to write JDito code.adoc
@@ -1,4 +1,3 @@
-How to write JDito code
=======================
:toc2: left
:numbered:
@@ -115,7 +114,7 @@ function SqlCondition(pAlias) <4>
{
//setting null is only needed to provide autocomplete for the ADITO-designer
this.preparedValues = null;
- this._init();//the properties are initalized in an extra function because init is nearly the same as resetting (clearing) the SqlConditions
+ this._init();//the properties are initialized in an extra function because init is nearly the same as resetting (clearing) the SqlConditions
this.alias = alias;
}
/**
@@ -142,12 +141,12 @@ So just start your functions / methods name with a _ if you need private methods
--> do not use functions which start with a _ outside of the class!
-Add @ignore to the comment of the private functions.
+Add @ignore to the comment of those functions to prevent showing them in the generated jsdoc.
== JS-Doc ==
<1> JS-Doc comment: http://usejsdoc.org/
-<2> jsdoc-blocks have to start with /** because the tool to generate docs out of jsdoc only works with /**
+<2> jsdoc-blocks have to start with /** otherwise JSDoc cannot generate a documentation
<3> use the correct form for optional/required parameters: http://usejsdoc.org/tags-param.html
Optional parameter: [alias=the current alias]
Required parameter: alias
@@ -167,10 +166,9 @@ function SqlCondition(pAlias)
...
}
----
-<3> examples are useful on more complex functions
-<4> constructor function; init properties (do not set functions ("methods") here!)
-<5> add functions ("methods") to the prototype, they are available through the prototype chain
-<6> the comments have to start with /** not /* otherwise JSDoc cannot generate a documentation
+<4> examples are useful on more complex functions
+<5> constructor function; init properties (do not set functions ("methods") here!)
+<6> add functions ("methods") to the prototype, they are available through the prototype chain
And how to use it (normally you'd want to use preparedStatements but for the sake of an easy example it's a bit shorter here)
See also HowToSqlConditionLib.adoc for a full documentation.
diff --git a/others/guide/whichDatatype.adoc b/others/guide/whichDatatype.adoc
index 391d8709372ab4cfddd037ec2cfb0a60e244a571..092ae1bf6ae5c02d56ced4bf133b5e956a8f23e2 100644
--- a/others/guide/whichDatatype.adoc
+++ b/others/guide/whichDatatype.adoc
@@ -17,7 +17,7 @@ TINYINT
Add nullable="false" constraint, because for boolean null makes no sense and complicates searches and validations.
== Text ==
-Text should be saved as Unicode. For this prefix the datatype with a 'N' (there are some exceptions lik the UUID)
+Text should be saved as Unicode. For this prefix the datatype with a 'N' (there are some exceptions like the UUID)
=== Big text ===
For informations, descriptions, ...
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 100174eab9a13777611d079f565208841c187c07..8eebd273b16dbd3d55a1d322eb3cfba4472d2433 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -10,11 +10,15 @@
<value></value>
</entry>
<entry>
- <key>Privat</key>
+ <key>Organisation</key>
<value></value>
</entry>
<entry>
- <key>Organisation</key>
+ <key>auswärts</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>Urlaub</key>
<value></value>
</entry>
</calendarCategoriesEvent>
diff --git a/process/Activity_lib/process.js b/process/Activity_lib/process.js
index b9a50c73f494bd24a9771afa8ffcc40ed2396a79..8d8252e5b45e4f81ac8c237e5e5fa94478c45bb2 100644
--- a/process/Activity_lib/process.js
+++ b/process/Activity_lib/process.js
@@ -31,4 +31,28 @@ ActivityUtils.createNewActivity = function(pRowId)
params["ObjectId_param"] = ContextUtils.getCurrentContextId();
params["RowId_param"] = pRowId;
neon.openContext("Activity", null, null, neon.OPERATINGSTATE_NEW, params);
+}
+
+/*
+ * Gets the date of the last activity
+ *
+ * @param {String} pRowId the rowid of the dataset
+ *
+ * @return {number|null} the date of the last actvity as long
+ */
+ActivityUtils.getLastActivityDate = function (pRowId)
+{
+ var context = ContextUtils.getCurrentContextId();
+ var sqlUtil = new SqlMaskingUtils();
+ var activitySql = "select " + sqlUtil.max("ENTRYDATE") + " from ACTIVITY "
+ + " join ACTIVITYLINK on ACTIVITY.ACTIVITYID = ACTIVITYLINK.ACTIVITY_ID";
+ activitySql = SqlCondition.begin()
+ .andPrepare("ACTIVITYLINK.OBJECT_TYPE", context)
+ .andPrepare("ACTIVITYLINK.OBJECT_ROWID", pRowId)
+ .buildSql(activitySql);
+
+ var entryDate = db.cell(activitySql);
+ if (entryDate != "")
+ return parseInt(entryDate);
+ return null;
}
\ No newline at end of file
diff --git a/process/AddressEntity_lib/process.js b/process/AddressEntity_lib/process.js
index a4ac29d053fa3c7a8832fa965116729b6831bbe9..3f13bba906e672156c214fc934e47f0258f5fcb1 100644
--- a/process/AddressEntity_lib/process.js
+++ b/process/AddressEntity_lib/process.js
@@ -4,8 +4,19 @@ import("system.vars");
////when available: this should be outsourced within the Address_entity
//till then: keep entity specific Code here
+/**
+ * Methods used by the AddressEntity.
+ * Do not create an instance of this!
+ *
+ * @class
+ */
function AddressEntityValidation(){}
+/**
+ * check if the field, this function is called in is a mandatory field of the country
+ *
+ * @return {Boolean}
+ */
AddressEntityValidation.isMandatoryField = function()
{
var fieldName = vars.get("$this.name").replace(/^\$?field\./, "");
@@ -17,6 +28,11 @@ AddressEntityValidation.isMandatoryField = function()
return isMandatory;
};
+/**
+ * return the shorthand for an field name
+ *
+ * @return {String} ADDRESS: A, CITY: C, STATE: S, ZIP: Z
+ */
AddressEntityValidation.mapFieldToShorthand = function(fieldName)
{
var fieldCode;
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index e756e95ca39b8289d7bca081c1b3a9b760d07d2d..755d9c190519f25facadb77f0c98302f89293b33 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -5,8 +5,8 @@ import("system.db");
import("Sql_lib");
/**
- * Provides functions for the work with attributes, like setting or getting the value of an attribute
- * or listing the available attributes for a context.
+ * Provides functions for the work with attributes, like
+ * listing the available attributes for a context.
* Don't instanciate this!
*
* @class
@@ -18,37 +18,40 @@ function AttributeUtil () {}
* process for the attribute id in AttributeRelation
*
* @param {String} pObjectType the object type (= context)
+ * @param {boolean} pIncludeGroups
*
* @return {String[][]} two-dimensional array of attributeIds and names
*/
-AttributeUtil.getPossibleAttributes = function (pObjectType)
+AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups)
{
if (pObjectType == null)
return [];
var attrSql = "select AB_ATTRIBUTEID from AB_ATTRIBUTE"
+ " join AB_ATTRIBUTEUSAGE on AB_ATTRIBUTEID = AB_ATTRIBUTE_ID";
- attrSql = SqlCondition.begin()
+ attrCond = SqlCondition.begin()
.andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
- .and("ATTRIBUTE_TYPE != '" + AttributeTypes.GROUP + "'")
- .and("ATTRIBUTE_ACTIVE = 1")
- .buildSql(attrSql);
+ .and("ATTRIBUTE_TYPE != '" + $AttributeTypes.COMBOVALUE + "'")
+ .and("ATTRIBUTE_ACTIVE = 1");
+
+ if (!pIncludeGroups)
+ attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
- var attributes = db.array(db.COLUMN, attrSql).map(function (id)
+ var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql)).map(function (id)
{
- return [id, AttributeUtil.getAttributeNameById(id)];
+ return [id, AttributeUtil.getFullAttributeName(id)];
});
return attributes;
}
/**
- * returns the name of an attribute
+ * returns the name of an attribute with all parent attribute names
*
* @param {String} pAttributeId the id of the attribute
*
* @return {String} the name of the attribute
*/
-AttributeUtil.getAttributeNameById = function (pAttributeId)
+AttributeUtil.getFullAttributeName = function (pAttributeId)
{
var attributeNames = [];
var attribute;
@@ -57,11 +60,11 @@ AttributeUtil.getAttributeNameById = function (pAttributeId)
attribute = db.array(db.ROW, SqlCondition.begin()
.andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId, "# = ?", idType)
.buildSql("select ATTRIBUTE_NAME, ATTRIBUTE_PARENT_ID from AB_ATTRIBUTE")
- );
+ );
if (attribute.length > 0)
- {
+ {
attributeNames.push(attribute[0]);
- pAttributeId = attribute[1];
+ pAttributeId = attribute[1];
}
else
pAttributeId = "";
@@ -71,14 +74,72 @@ AttributeUtil.getAttributeNameById = function (pAttributeId)
}
/**
- * gets the value of an attribute for one dataset (e. g. a person)
+ * returns the name of an attribute
+ *
+ * @param {String} pAttributeId the id of the attribute
+ *
+ * @return {String} the name of the attribute
*/
-AttributeUtil.getAttribute = function (pAttributeId, pObjectType, pObjectRowId, pGetIdValue)
+AttributeUtil.getSimpleAttributeName = function (pAttributeId)
{
- //TODO: implement
+ var attributeName = db.cell(SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", pAttributeId)
+ .buildSql("select ATTRIBUTE_NAME from AB_ATTRIBUTE")
+ );
+
+ return attributeName;
+}
+
+/**
+ * returns the ids of all subordinated attributes of an attribute
+ *
+ * @param {String} pAttributeId the id of the attribute
+ *
+ * @result {String[]} array with the ids of every subordinated attribute
+ */
+AttributeUtil.getAllChildren = function (pAttributeId)
+{
+ var childIds = [];
+ var attributes= [pAttributeId];
+ while (attributes.length > 0)
+ {
+ attributes = db.array(db.COLUMN, SqlCondition.begin()
+ .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + attributes.join("','") + "')")
+ .buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
+ );
+ if (attributes.length > 0)
+ childIds = childIds.concat(attributes);
+ }
+ return childIds;
}
-AttributeUtil.getAttributes = function ()
+/*********************************************************************************************************************/
+
+/**
+ * Provides functions for the work with attributeRelations, getting the value of an attributeRelation for an object.
+ * Don't instanciate this!
+ *
+ * @class
+ */
+function AttributeRelationUtils () {}
+
+/**
+ * gets the value of an attributeRelation for one dataset (e. g. a person)
+ */
+AttributeRelationUtils.getAttribute = function (pAttributeId, pObjectRowId, pObjectType)
+{
+ 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);
+}
+
+AttributeRelationUtils.getAttributes = function ()
{
//TODO: implement maybe
}
@@ -86,17 +147,70 @@ AttributeUtil.getAttributes = function ()
/**
* sets the value of an attribute for one dataset (e. g. a person)
*/
-AttributeUtil.setAttribute = function ()
+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 types = Object.keys($AttributeTypes);
+ var sqlMap = {
+ columns : [],
+ typeColMap : {}
+ };
+ types.forEach(function (type)
+ {
+ var typeKey = type.toString();
+ var colIndex = this.columns.indexOf(type.databaseField);
+ if (colIndex == -1)
+ {
+ colIndex = this.columns.length;
+ this.columns.push(type.databaseField);
+ }
+ this.typeColMap[typeKey] = colIndex;
+ }, sqlMap);
+
+ 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;
+}
+
+/*********************************************************************************************************************/
/**
* This is used in the AttributeRelation enitiy to make the work with attributes there
* easier. You probaly won't need this for anything else.
*
* @param {String} pAttrId the id of the attribute
+ *
+ * @class
*/
function AttributeHandler (pAttrId) //TODO: find out if this class is necessary, maybe there is a more elegant solution, this could also be static
{
@@ -104,6 +218,9 @@ function AttributeHandler (pAttrId) //TODO: find out if this class is necessar
this._attributeType = null;
}
+/**
+ * Returns a new AttributeHandler for the given Attribute
+ */
AttributeHandler.begin = function (pAttrId)
{
return new AttributeHandler(pAttrId);
@@ -115,7 +232,7 @@ AttributeHandler.begin = function (pAttrId)
*
* @return {String} attribute type
*/
-AttributeHandler.prototype._getAttributeType = function () //TODO: maybe the type should be an own field in the entity instead of getting the type from the attribute id
+AttributeHandler.prototype.getAttributeType = function () //TODO: maybe the type should be an own field in the entity instead of getting the type from the attribute id
{
if (this._attributeType == null && this.attributeId != null)
{
@@ -135,7 +252,7 @@ AttributeHandler.prototype._getAttributeType = function () //TODO: maybe the typ
*/
AttributeHandler.prototype.getAttributeField = function ()
{
- return AttributeTypes.getEntityField(this._getAttributeType());
+ return $AttributeTypes.getEntityField(this.getAttributeType());
}
/**
@@ -145,9 +262,16 @@ AttributeHandler.prototype.getAttributeField = function ()
*/
AttributeHandler.prototype.getAttributeContentType = function ()
{
- return AttributeTypes.getContentType(this._getAttributeType());
+ return $AttributeTypes.getContentType(this.getAttributeType());
}
+/**
+ * Sets the value to the AttributeField and also return s the value again.
+ *
+ * @param pValue the value
+ *
+ * @return {Any} the value
+ */
AttributeHandler.prototype.setAttributeValue = function (pValue)
{
var field = "$field." + this.getAttributeField();
@@ -163,49 +287,63 @@ AttributeHandler.prototype.setAttributeValue = function (pValue)
* should be done in AttributeUtils.
* The values for each type are:
*
+ * keyword = the key of the corresponding keyword
* contentType = the value that is returned in the contentType process for the attribute
* databaseField = the database field that holds values of attributes with the type
* entityField = the field in the AttributeRelation enity that holds the value of the attribute for that type
*
* The display name is controlled by the keyword 'AttributeType'
*/
-var AttributeTypes = {
- TEXT : {
- toString : function () {return "TEXT"},
- contentType : "TEXT",
- databaseField : "CHAR_VALUE",
- entityField : "CHAR_VALUE"
- },
- DATE : {
- toString : function () {return "DATE"},
- contentType : "DATE",
- databaseField : "DATE_VALUE",
- entityField : "DATE_VALUE"
- },
- NUMBER : {
- toString : function () {return "NUMBER"},
- contentType : "NUMBER",
- databaseField : "NUMBER_VALUE",
- entityField : "NUMBER_VALUE"
- },
- BOOLEAN : {
- toString : function () {return "BOOLEAN"},
- contentType : "BOOLEAN",
- databaseField : "BOOL_VALUE",
- entityField : "BOOL_VALUE"
- },
- COMBO : {
- toString : function () {return "COMBO"},
- contentType : "TEXT",
- databaseField : "ID_VALUE",
- entityField : "ID_VALUE"
- },
- GROUP : {
- toString : function () {return "GROUP"},
- contentType : null,
- databaseField : null,
- entityField : null
- }
+function $AttributeTypes () {}
+
+$AttributeTypes.TEXT = {
+ toString : function () {return this.keyword},
+ keyword : "TEXT",
+ contentType : "TEXT",
+ databaseField : "CHAR_VALUE",
+ entityField : "CHAR_VALUE"
+};
+$AttributeTypes.DATE = {
+ toString : function () {return this.keyword},
+ keyword : "DATE",
+ contentType : "DATE",
+ databaseField : "DATE_VALUE",
+ entityField : "DATE_VALUE"
+};
+$AttributeTypes.NUMBER = {
+ toString : function () {return this.keyword},
+ keyword : "NUMBER",
+ contentType : "NUMBER",
+ databaseField : "NUMBER_VALUE",
+ entityField : "NUMBER_VALUE"
+};
+$AttributeTypes.BOOLEAN = {
+ toString : function () {return this.keyword},
+ keyword : "BOOLEAN",
+ contentType : "BOOLEAN",
+ databaseField : "BOOL_VALUE",
+ entityField : "BOOL_VALUE"
+};
+$AttributeTypes.COMBO = {
+ toString : function () {return this.keyword},
+ keyword : "COMBO",
+ contentType : "UNKNOWN",
+ databaseField : "ID_VALUE",
+ entityField : "ID_VALUE"
+};
+$AttributeTypes.COMBOVALUE = {
+ toString : function () {return this.keyword},
+ keyword : "COMBOVALUE",
+ contentType : null,
+ databaseField : null,
+ entityField : null
+};
+$AttributeTypes.GROUP = {
+ toString : function () {return this.keyword},
+ keyword : "GROUP",
+ contentType : null,
+ databaseField : null,
+ entityField : null
};
@@ -216,10 +354,10 @@ var AttributeTypes = {
* (use the values of the AttributeTypes object, e. g. AttributeTypes.TEXT)
* @return {String} the contentType for the attribute
*/
-AttributeTypes.getContentType = function (pAttributeType)
+$AttributeTypes.getContentType = function (pAttributeType)
{
- if (pAttributeType in AttributeTypes)
- return AttributeTypes[pAttributeType].contentType;
+ if (pAttributeType in $AttributeTypes)
+ return $AttributeTypes[pAttributeType].contentType;
return null;
}
@@ -230,10 +368,10 @@ 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)
+$AttributeTypes.getEntityField = function (pAttributeType)
{
- if (pAttributeType in AttributeTypes)
- return AttributeTypes[pAttributeType].entityField;
+ if (pAttributeType in $AttributeTypes)
+ return $AttributeTypes[pAttributeType].entityField;
return null;
}
@@ -244,10 +382,10 @@ 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)
+$AttributeTypes.getDatabaseField = function (pAttributeType)
{
- if (pAttributeType in AttributeTypes)
- return AttributeTypes[pAttributeType].databaseField;
+ if (pAttributeType in $AttributeTypes)
+ return $AttributeTypes[pAttributeType].databaseField;
return null;
}
@@ -258,9 +396,9 @@ 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)
+$AttributeTypes.getName = function (pAttributeType)
{
- if (pAttributeType in AttributeTypes)
- return translate.text(AttributeTypes[pAttributeType].displayName);
+ if (pAttributeType in $AttributeTypes)
+ return translate.text($AttributeTypes[pAttributeType].displayName);
return null;
}
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 5965deeba144c239e66f8c9b39bb81849957cc2e..058f498fa6c9b9fbff0404cc52c957ee07fc974c 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -1,3 +1,5 @@
+import("system.logging");
+import("system.translate");
import("system.project");
import("system.vars");
import("system.SQLTYPES");
@@ -105,18 +107,31 @@ ContextUtils._getSelectMap = function()
{
var maskingUtils = new SqlMaskingUtils();
return {
- // contextId nameField Tablename, IDField, isSystemAlias
- "Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID", false],
- "Person": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID", false],
- "Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID", false],
- "Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID", false],
+ // contextId nameField Tablename, IDField
+ "Organisation": ["\"NAME\"", "ORGANISATION", "ORGANISATIONID"],
+ "Person": [maskingUtils.concat(["FIRSTNAME", "LASTNAME"]), "PERSON", "PERSONID"],
+ "Activity": ["SUBJECT", "ACTIVITY", "ACTIVITYID"],
+ "Salesproject": [maskingUtils.concat([maskingUtils.cast("PROJECTCODE", SQLTYPES.VARCHAR, 10), "':'", "PROJECTTITLE"]), "SALESPROJECT", "SALESPROJECTID"],
// TODO: keywords sind noch nicht in der DB somit gibt es nichts ähnliches zu getKeySQL.
// maskingUtils.concat([SqlMaskingUtils.cast("CONTRACTCODE", "varchar", 10), getKeySQL("CONTRACTTYPE", "CONTRACTTYPE" )])
- "Contract": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID", false]
-// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID", true]
+ "Contract": [maskingUtils.cast("CONTRACTCODE", SQLTYPES.VARCHAR, 10), "CONTRACT", "CONTRACTID"],
+// "Appointment": ["SUMMARY", "ASYS_CALENDARBACKEND", "UID"]
+ "Offer": [maskingUtils.cast("OFFERCODE", SQLTYPES.VARCHAR, 10), "OFFER", "OFFERID"],
+ "Order": [maskingUtils.cast("SALESORDERCODE", SQLTYPES.VARCHAR, 10), "SALESORDER", "SALESORDERID"],
+ "Product": ["PRODUCTNAME", "PRODUCT", "PRODUCTID"],
+ "Task": ["SUBJECT", "TASK", "TASKID", translate.text("Task")]
}
}
+ContextUtils.getFieldTitle = function(pContextId, pDefault)
+{
+ if (ContextUtils._getSelectMap()[pContextId] != undefined && ContextUtils._getSelectMap()[pContextId].length >= 3)
+ return ContextUtils._getSelectMap()[pContextId][3];
+
+ return pDefault;
+}
+
+
/**
* TODO: !!!temporary function until you can get fields from another Entity!!!
*/
diff --git a/process/Date_lib/process.js b/process/Date_lib/process.js
index bbfc15c251e6d76b1702f4eb712dc76cc8987d7f..f4121551b8f86159b971b9e69247f8749f2c2df6 100644
--- a/process/Date_lib/process.js
+++ b/process/Date_lib/process.js
@@ -74,4 +74,24 @@ DateUtils.getMonthName = function(pMonth) {
return monthNames[pMonth];
-}
\ No newline at end of file
+}
+
+/**
+ * Calculates the passed days between two dates.
+ *
+ * @param {Number} pPastDate the first timestamp
+ * @param {Number} [pCurrentDate=currentTimestamp] the second timestamp
+ *
+ * @return {Number|null} the amount of days (value is always positive) or null if pPastDate is null
+ */
+DateUtils.getDayDifference = function (pPastDate, pCurrentDate)
+{
+ if (pPastDate == null)
+ return null;
+ if (pCurrentDate == null)
+ pCurrentDate = datetime.date();
+ var millisecDiff = Math.abs(pCurrentDate - pPastDate);
+ var dayDiff = Math.floor(millisecDiff / datetime.ONE_DAY);
+
+ return dayDiff;
+}
diff --git a/process/Money_lib/Money_lib.aod b/process/Money_lib/Money_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..61248fd244213806e7a23ebd44d8353bed49dc4b
--- /dev/null
+++ b/process/Money_lib/Money_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
+ <name>Money_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Money_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Money_lib/process.js b/process/Money_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b59e2d69db667b7904c12747574f8c20ed65ae8
--- /dev/null
+++ b/process/Money_lib/process.js
@@ -0,0 +1,70 @@
+import("system.logging");
+import("system.eMath");
+
+/**
+ * Class containing static utility functions for working with money
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function MoneyUtils() {}
+
+/**
+ * round a price with eMath.ROUND_HALF_UP
+ * @param {Double} pPrice
+ *
+ * @return rounded price
+ */
+MoneyUtils.round = function(pPrice)
+{
+ return eMath.roundDec(pPrice, 2, eMath.ROUND_HALF_UP);
+}
+
+/**
+ * get net price
+ * @param {Double} pPrice
+ * @param {Double} [pQuantity=0.0]
+ * @param {Double} [pDiscount=0.0]
+ *
+ * @return net of price
+ */
+MoneyUtils.getNet = function(pPrice, pQuantity, pDiscount)
+{
+ pQuantity = pQuantity || 0;
+ pDiscount = pDiscount || 0;
+ return MoneyUtils.round(pPrice * pQuantity * (100 - pDiscount) / 100);
+}
+
+/**
+ * get vat of a price
+ * @param {Double} pVat
+ * @param {Double} pPrice
+ * @param {Double} [pQuantity=0.0]
+ * @param {Double} [pDiscount=0.0]
+ *
+ * @return vat of price
+ */
+MoneyUtils.getVat = function(pVat, pPrice, pQuantity, pDiscount)
+{
+ pQuantity = pQuantity || 0;
+ pDiscount = pDiscount || 0;
+
+ return MoneyUtils.round(pPrice * pQuantity * (100 - pDiscount) / 100 * pVat / 100);
+}
+
+/**
+ * get gross of a price
+ * @param {Double} pVat
+ * @param {Double} pPrice
+ * @param {Double} [pQuantity=0.0]
+ * @param {Double} [pDiscount=0.0]
+ *
+ * @return gross of price
+ */
+MoneyUtils.getGross = function(pVat, pPrice, pQuantity, pDiscount) {
+
+ pQuantity = pQuantity || 0;
+ pDiscount = pDiscount || 0;
+
+ return eMath.addDec(MoneyUtils.getNet(pPrice, pQuantity, pDiscount), MoneyUtils.getVat(pVat, pPrice, pQuantity, pDiscount));
+}
\ No newline at end of file
diff --git a/process/Neon_lib/process.js b/process/Neon_lib/process.js
index c811a8f7be0193ac7efff4c6f214d742caebbb3d..65e019d7c4c2bc5f6789467daf8e527f652eccab 100644
--- a/process/Neon_lib/process.js
+++ b/process/Neon_lib/process.js
@@ -153,6 +153,7 @@ CopyModuleUtils.copyModule = function(pInputMapping)
var rootModule = Object.keys(pInputMapping)[0];
var ModuleMapping = _ModuleMapping(rootModule, pInputMapping[rootModule]);
var ModuleData = _getModuleData(rootModule, pInputMapping[rootModule].condition);
+ ModulesMapping[rootModule] = ModuleMapping;
for(var row in ModuleData)
{
@@ -282,7 +283,7 @@ CopyModuleUtils.copyModule = function(pInputMapping)
case "OFFERITEM":
{
//OFFER_ID mappen
- if(ModuleRowMapping.ParentModuleMapping.name == "OFFER")
+ if(ModuleRowMapping.ParentModuleMapping != null && ModuleRowMapping.ParentModuleMapping.name == "OFFER")
{
ModuleRowMapping.ColumnMapping["OFFER_ID"].newValue = ModulesMapping[ModuleRowMapping.ParentModuleMapping.name].DataRows[ModuleRowMapping.ColumnMapping["OFFER_ID"].oldValue].newPrimaryKey;
}
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index a2004d9bac18bdd97e1e977bd820063d6b1b879f..d96c87ce756caa5319eac5ad3ddba88aa09625e1 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -6,6 +6,7 @@ import("system.util");
import("system.eMath");
import("system.db");
import("Product_lib");
+import("Money_lib");
/**
* Abstract class that provides methods for dealing with offer / order items.
@@ -163,8 +164,8 @@ ItemUtils.prototype.getNetAndVat = function(itemIds) {
for (var i = 0; i < orderItems.length; i++)
{
- sum += this.getItemSum(orderItems[i][0], orderItems[i][1], orderItems[i][2], orderItems[i][4]);
- vat += this.getItemVAT(orderItems[i][0], orderItems[i][1], orderItems[i][2], orderItems[i][3], orderItems[i][4]);
+ sum = eMath.addDec(sum, this.getItemSum(orderItems[i][0], orderItems[i][1], orderItems[i][2], orderItems[i][4]));
+ vat = eMath.addDec(vat, this.getItemVAT(orderItems[i][0], orderItems[i][1], orderItems[i][2], orderItems[i][3], orderItems[i][4]));
}
return [sum, vat];
@@ -200,33 +201,33 @@ ItemUtils.prototype.initItemTree = function() {
/**
* @abstract
*/
-ItemUtils.prototype.getItemSum = function(quantity, price, discount, optional) {
- quantity = quantity || 0;
- price = price || 0;
- discount = discount || 0;
+ItemUtils.prototype.getItemSum = function(pQuantity, pPrice, pDiscount, pOptional) {
+ pQuantity = pQuantity || 0;
+ pPrice = pPrice || 0;
+ pDiscount = pDiscount || 0;
- return optional ? (parseFloat(quantity) * parseFloat(price) * ((100 - parseFloat(discount)) / 100))
+ return pOptional == "0" ? (MoneyUtils.getNet(parseFloat(pPrice), parseFloat(pQuantity), parseFloat(pDiscount)))
: 0;
}
/**
* @abstract
*/
-ItemUtils.prototype.getItemVAT = function(quantity, price, discount, vat, optional) {
- quantity = quantity || 0;
- price = price || 0;
- discount = discount || 0;
- vat = vat || 0;
-
- return optional ? (parseFloat(quantity) * parseFloat(price) * ((100 - parseFloat(discount)) / 100) * (parseFloat(vat) / 100))
+ItemUtils.prototype.getItemVAT = function(pQuantity, pPrice, pDiscount, pVat, pOptional) {
+ pQuantity = pQuantity || 0;
+ pPrice = pPrice || 0;
+ pDiscount = pDiscount || 0;
+ pVat = pVat || 0;
+ logging.log(pOptional.toSource())
+ return pOptional == "0" ? (MoneyUtils.getVat(parseFloat(pVat), parseFloat(pPrice), parseFloat(pQuantity), parseFloat(pDiscount)))
: 0;
}
/**
* @abstract
*/
-ItemUtils.prototype.roundPrice = function(price) {
- return eMath.roundDec(price, 2, eMath.ROUND_HALF_UP);
+ItemUtils.prototype.roundPrice = function(pPrice) {
+ return MoneyUtils.round(pPrice);
}
/**
@@ -236,7 +237,7 @@ ItemUtils.prototype.roundPrice = function(price) {
* @param {String} productId req UID of root product (selected product)
* @param {String} assignedTo opt UID of parent item
* @param {String} currency opt currency for price list to use
- * @param {String} relationId opt contactid for price list to use (custom price list)
+ * @param {String} contactId opt contactid for price list to use (custom price list)
* @param {String[][]} additionalProductInfo additional product info, which has to be copied from the product. (e.g. INFO field is only used by offer)
* has to be in the form: [["DESTINATION-DB-FIELD", "PRODUCT-DB-FIELD"], ...]
*
@@ -244,7 +245,7 @@ ItemUtils.prototype.roundPrice = function(price) {
*
* @abstract
*/
-ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, currency, relationId, additionalProductInfo) {
+ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, currency, contactId, additionalProductInfo) {
if (additionalProductInfo == undefined) { additionalProductInfo = [] }
var insertedItemIds = [];
@@ -256,8 +257,8 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
assignedTo = "";
if (currency == undefined)
currency = "";
- if (relationId == undefined)
- relationId = "";
+ if (contactId == undefined)
+ contactId = "";
var rootProdId = productId;
if (rootProdId != "") {
@@ -269,7 +270,7 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
columns = columns.concat(additionalProductInfo.map(function(item) {return item[0]}));
var colTypes = db.getColumnTypes(table, columns);
// partsList[rootProdId] = root node
- __itemInsertStatement(partsList[rootProdId], assignedTo, currency, relationId);
+ __itemInsertStatement(partsList[rootProdId], assignedTo, currency, contactId);
if (statements.length > 0)
db.inserts(statements);
@@ -278,7 +279,7 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
return insertedItemIds;
//recursive function for building item insert statements
- function __itemInsertStatement(partsListObj, assignedTo, currency, relationId) {
+ function __itemInsertStatement(partsListObj, assignedTo, currency, contactId) {
for (var i = 0; i < partsListObj.ids.length; i++) {
var newid = util.getNewUUID();
self._appendNode(newid, assignedTo);
@@ -290,7 +291,7 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
var prodid = partsList[p2pid].sourceid;
var ProductDetails = ProductUtils.getProductDetails(
prodid,
- { currency: currency, quantity: P2pObject.quantity, relationId: relationId },
+ { currency: currency, quantity: P2pObject.quantity, relationId: contactId },
additionalProductInfo.map(function(item) {return item[1]}));
var price = "";
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 9078239b376a950037bd77a5b54f12367a7399b3..716a56fb2ae06122dde7cf8903132805185f100f 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -13,6 +13,7 @@ import("Product_lib");
import("Report_lib");
import("OfferOrder_lib");
import("PostalAddress_lib");
+import("Neon_lib");
/**
* Methods used by Offer.
@@ -273,6 +274,54 @@ OfferUtils.openOfferReport = function(pOfferID)
offerReport.openReport();
}
+/**
+ * opens an offer in NEW mode with values from an offer
+ *
+ * @param pOfferId {String} id of the offer
+ * @param pContactId {String} contact id
+ * @param pLanguage {String} language
+ * @param pCurrency {String} [currency=""]
+ * @param pHeader {String} [header=""]
+ */
+OfferUtils.copyOffer = function (pOfferId, pContactId, pLanguage, pCurrency, pHeader)
+{
+ var params = {
+ "ContactId_param" : pContactId,
+ "OfferLanguage_param" : pLanguage,
+ "OfferOriginal_Id_param" : pOfferId,
+ "OfferCurrency_param" : pCurrency || "",
+ "OfferHeader_param" : pHeader || ""
+ };
+ neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
+}
+
+/**
+ * copies all offerItems from one offer to another
+ *
+ * @param {String} pSourceOfferId
+ * @param {String} pTargetOfferId
+ */
+OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
+{
+ var InputMapping = {
+ "OFFERITEM": {
+ condition: "OFFER_ID = '" + pSourceOfferId + "' order by ITEMSORT",
+ ValueMapping: {
+ "OFFER_ID" : pTargetOfferId
+ }
+ }
+ };
+ CopyModuleUtils.copyModule(InputMapping);
+
+ var oiUtils = new OfferItemUtils(pTargetOfferId);
+
+ //update order price
+ cols = ["NET", "VAT"];
+ var vals = oiUtils.getNetAndVat();
+
+ db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", pTargetOfferId, "1 = 2"));
+}
+
/**
* opens an order in NEW mode with values from an offer
*
@@ -315,27 +364,45 @@ function OfferItemUtils(pOfferId) {
OfferItemUtils.prototype.constructor = OfferItemUtils;
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.getNetAndVat = function(offeritemIdsToDel) {
return ItemUtils.prototype.getNetAndVat.apply(this, [offeritemIdsToDel]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.initItemTree = function() {
ItemUtils.prototype.initItemTree.apply(this);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.getItemSum = function(pQuantity, pPrice, pDiscount, pOptional) {
return ItemUtils.prototype.getItemSum.apply(this, [pQuantity, pPrice, pDiscount, pOptional]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.getItemVAT = function(pQuantity, pPrice, pDiscount, pVAT, pOptional) {
return ItemUtils.prototype.getItemVAT.apply(this, [pQuantity, pPrice, pDiscount, pVAT, pOptional]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.roundPrice = function(pPrice) {
return ItemUtils.prototype.roundPrice.apply(this, [pPrice]);
}
-OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pRelationId) {
+/**
+ * For documentation, see class ItemUtils.
+ */
+OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pContactId) {
this.initItemTree();
var cols = ["OFFERITEMID"
@@ -352,27 +419,39 @@ OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCu
, "ITEMPOSITION"
, "ITEMSORT"];
- return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pRelationId, [["INFO", "INFO"]]]);
+ return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, [["INFO", "INFO"]]]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.deletePartsList = function(pItemId) {
this.initItemTree();
return ItemUtils.prototype.deletePartsList.apply(this, [pItemId]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.getNextItemSort = function(pIds) {
this.initItemTree();
return ItemUtils.prototype.getNextItemSort.apply(this, [pIds]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.getNextItemPosition = function(pAssignedTo, pTree, pIds) {
this.initItemTree();
return ItemUtils.prototype.getNextItemPosition.apply(this, [pAssignedTo, pTree, pIds]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OfferItemUtils.prototype.reOrgItems = function() {
this.initItemTree();
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index d006db8a76a57988e82843bbeaeffcfdce37b6e9..818de7d7027bb5c0994fe4ae5743764e5a69c31f 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -82,62 +82,36 @@ OrderUtils.createNewOrder = function(pSalesprojectId, pRelationId)
*
* @param {String} pOfferId the offer to get the items from
* @param {String} pOrderId the order to create the items for
- *
- * @return {Number[]} Array with the ids of the inserted orderItems
*/
OrderUtils.copyOfferItemsToOrder = function (pOfferId, pOrderId)
{
- var cols = [
- "UNIT",
- "QUANTITY",
- "GROUPCODEID",
- "ASSIGNEDTO",
- "PRICE",
- "ITEMSORT",
- "PRODUCT_ID",
- "VAT",
- "ITEMNAME",
- "OPTIONAL",
- "DISCOUNT",
- "ITEMPOSITION",
- "INFO"
- ];
- var offerItemSql = SqlCondition.begin()
- .andPrepare("OFFERITEM.OFFER_ID", pOfferId)
- .buildSql("select " + cols.concat(["OFFERITEMID"]).join(", ") + " from OFFERITEM", "1=0");
- var offerItems = db.table(offerItemSql);
-
- var table = "SALESORDERITEM";
- cols = cols.concat(["SALESORDERITEMID", "SALESORDER_ID"]);
- var types = db.getColumnTypes(table, cols);
-
- //the rows need new UIDs, but because items can be related over ASSIGNEDTO, ASSIGNEDTO must also be
- //changed to the newly generated id of the parent item, so the "oldId : newId" pairs have to be stored
- //to set ASSIGNEDTO correctly
- var idMap = {};
-
- var toInsert = [];
- while (offerItems.length > 0)
- for (let i = 0; i < offerItems.length; i++)
- {
- var row = offerItems[i];
-
- //checks if the parent attribute has already been put into the insert-array,
- //otherwise the foreign-key ASSIGNEDTO could have the id of a row that hasn't been inserted yet
- // -> toInsert needs to be in the correct order
- if (row[3] == "" || row[3] in idMap)
- {
- row[3] = idMap[row[3]] || "";
- var newId = util.getNewUUID();
- idMap[row[13]] = newId;
- row[13] = newId; //replace the UID
- toInsert.push([table, cols, types, row.concat([pOrderId])]);
- offerItems.splice(i, 1); //remove the row from offerItems
- i--;
+ var InputMapping = {
+ "OFFERITEM": {
+ destinationModuleName : "SALESORDERITEM",
+ DestinationColumnMapping : {
+ "OFFERITEMID" : "SALESORDERITEMID",
+ "ITEMPOSITION" : "ITEMPOSITION",
+ "GROUPCODEID" : "GROUPCODEID",
+ "OFFER_ID" : "SALESORDER_ID",
+ "ASSIGNEDTO" : "ASSIGNEDTO",
+ "PRODUCT_ID" : "PRODUCT_ID",
+ "QUANTITY" : "QUANTITY",
+ "ITEMSORT" : "ITEMSORT",
+ "ITEMNAME" : "ITEMNAME",
+ "OPTIONAL" : "OPTIONAL",
+ "DISCOUNT" : "DISCOUNT",
+ "PRICE" : "PRICE",
+ "UNIT" : "UNIT",
+ "INFO" : "INFO",
+ "VAT" : "VAT"
+ },
+ condition: "OFFER_ID = '" + pOfferId + "' order by ITEMSORT",
+ ValueMapping: {
+ "OFFER_ID" : pOrderId
}
}
-
- db.inserts(toInsert);
+ };
+ CopyModuleUtils.copyModule(InputMapping);
var oiUtils = new OrderItemUtils(pOrderId);
@@ -146,11 +120,6 @@ OrderUtils.copyOfferItemsToOrder = function (pOfferId, pOrderId)
var vals = oiUtils.getNetAndVat();
db.updateData("SALESORDER", cols, null, vals, SqlCondition.equals("SALESORDER.SALESORDERID", pOrderId, "1 = 2"));
-
- return Object.keys(idMap).map(function (id)
- {
- return idMap[id];
- });
}
@@ -170,27 +139,45 @@ function OrderItemUtils(pOrderId) {
OrderItemUtils.prototype.constructor = OrderItemUtils;
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.getNetAndVat = function(orderitemIdsToDel) {
return ItemUtils.prototype.getNetAndVat.apply(this, [orderitemIdsToDel]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.initItemTree = function() {
ItemUtils.prototype.initItemTree.apply(this);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.getItemSum = function(pQuantity, pPrice, pDiscount, pOptional) {
return ItemUtils.prototype.getItemSum.apply(this, [pQuantity, pPrice, pDiscount, pOptional]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.getItemVAT = function(pQuantity, pPrice, pDiscount, pVAT, pOptional) {
return ItemUtils.prototype.getItemVAT.apply(this, [pQuantity, pPrice, pDiscount, pVAT, pOptional]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.roundPrice = function(pPrice) {
return ItemUtils.prototype.roundPrice.apply(this, [pPrice]);
}
-OrderItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pRelationId) {
+/**
+ * For documentation, see class ItemUtils.
+ */
+OrderItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pContactId) {
this.initItemTree();
var cols = ["SALESORDERITEMID"
@@ -207,27 +194,39 @@ OrderItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCu
, "ITEMPOSITION"
, "ITEMSORT"];
- return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pRelationId]);
+ return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.deletePartsList = function(pItemId) {
this.initItemTree();
return ItemUtils.prototype.deletePartsList.apply(this, [pItemId]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.getNextItemSort = function(pIds) {
this.initItemTree();
return ItemUtils.prototype.getNextItemSort.apply(this, [pIds]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.getNextItemPosition = function(pAssignedTo, pTree, pIds) {
this.initItemTree();
return ItemUtils.prototype.getNextItemPosition.apply(this, [pAssignedTo, pTree, pIds]);
}
+/**
+ * For documentation, see class ItemUtils.
+ */
OrderItemUtils.prototype.reOrgItems = function() {
this.initItemTree();
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index 3ca5cd3d006d00d888830cf349654874a82ee57d..479848b10d7f01270ceddc1a6456d9a040897b96 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -56,7 +56,7 @@ Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForec
[util.getNewUUID(), salesprojectId, type, value, vars.get("$sys.date")]);
if (notifyForecast) {
- this.notifyToUpdateForecast()
+ Salesproject.notifyToUpdateForecast()
}
return true;
}
diff --git a/process/Timetracking_lib/process.js b/process/Timetracking_lib/process.js
index 664d6574bedc18c220cea42395ecf787791d5e83..d2128cd195542977845b87086fe6bc0da1f74520 100644
--- a/process/Timetracking_lib/process.js
+++ b/process/Timetracking_lib/process.js
@@ -44,4 +44,19 @@ Timetracking.createNewTimeTracking = function (pRowId)
};
neon.openContext("Timetracking", null, null, neon.OPERATINGSTATE_NEW, params);
+}
+
+/*
+ * converts minutes tho hours and minuets. e.g. 105 to 1:45
+ *
+ * @param {integer} pMinutes req
+ *
+ * @return {String} Hours:Minutes
+ */
+Timetracking.minutesToReadableHour = function(pMinutes)
+{
+ var timeHour = parseInt(pMinutes / 60);
+ var minutes = parseInt(pMinutes % 60);
+
+ return "" + timeHour + ":" + ((minutes <= 9) ? "0" + minutes : minutes);
}
\ No newline at end of file