From 87bd19705936b27678e0142e141f2f16bf19976e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 11 Feb 2019 15:49:31 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201032312][Keywords=20f=C3=BCr=20bestehende=20Module=20anlegen?=
=?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
aliasDefinition/Data_alias/Data_alias.aod | 38 ++--
entity/Keyword_entity/Keyword_entity.aod | 42 +++++
entity/Offeritem_entity/Offeritem_entity.aod | 21 ++-
.../children/containername_param/code.js | 4 +
.../entityfields/unit/possibleItemsProcess.js | 7 -
.../unit.displayvalue/expression.js | 5 +
entity/Order_entity/Order_entity.aod | 21 ++-
.../entityfields/image/valueProcess.js | 2 +-
.../children/containername_param/code.js | 4 +
.../status/possibleItemsProcess.js | 16 --
.../status.displayvalue/expression.js | 5 +
entity/Orderitem_entity/Orderitem_entity.aod | 21 ++-
.../children/containername_param/code.js | 4 +
.../entityfields/unit/possibleItemsProcess.js | 7 -
.../unit.displayvalue/expression.js | 5 +
entity/Product_entity/Product_entity.aod | 21 ++-
.../children/containername_param/code.js | 4 +
.../entityfields/unit/possibleItemsProcess.js | 7 -
.../unit.displayvalue/expression.js | 5 +
.../Productprice_entity.aod | 21 ++-
.../children/containername_param/code.js | 4 +
.../pricelist/possibleItemsProcess.js | 17 --
.../pricelist.displayvalue/expression.js | 5 +
.../SalesprojectMember_entity.aod | 21 ++-
.../children/containername_param/code.js | 4 +
.../salesproject_role/possibleItemsProcess.js | 7 -
.../expression.js | 5 +
.../SalesprojectSource_entity.aod | 21 ++-
.../children/containername_param/code.js | 4 +
.../source/possibleItemsProcess.js | 7 -
.../source.displayvalue/expression.js | 5 +
.../data/AditoBasic/ab_keyword_entry.xml | 6 +-
...jectState.xml => init_SalesorderState.xml} | 8 +-
.../init_SalesprojectEstimation.xml | 172 ------------------
...le.xml => init_SalesprojectMemberRole.xml} | 12 +-
.../init_SalesprojectPhase.xml | 142 ---------------
.../data/example_offer/OFFER_1000.xml | 14 +-
.../data/example_offer/OFFER_1001.xml | 2 +-
.../data/example_offer/OFFER_1002.xml | 2 +-
.../data/example_offer/OFFER_1003.xml | 2 +-
.../data/example_offer/OFFER_1004.xml | 2 +-
.../data/example_product/PRODUCT_42154311.xml | 26 +--
.../example_salesorder/SALESORDER_1000.xml | 16 +-
.../example_salesorder/SALESORDER_1001.xml | 4 +-
.../example_salesorder/SALESORDER_1002.xml | 4 +-
.../example_salesorder/SALESORDER_1003.xml | 4 +-
.../example_salesorder/SALESORDER_1004.xml | 4 +-
.../example_salesproject/SALESPROJECT_gfk.xml | 4 +-
.../data_alias/struct/create_offeritem.xml | 2 +-
.../data_alias/struct/create_product.xml | 2 +-
.../data_alias/struct/create_productprice.xml | 2 +-
.../data_alias/struct/create_salesorder.xml | 2 +-
.../struct/create_salesorderitem.xml | 2 +-
.../struct/create_salesproject_member.xml | 2 +-
.../struct/create_salesproject_source.xml | 2 +-
process/Keyword_lib/process.js | 39 +---
56 files changed, 331 insertions(+), 506 deletions(-)
create mode 100644 entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
delete mode 100644 entity/Offeritem_entity/entityfields/unit/possibleItemsProcess.js
create mode 100644 entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
create mode 100644 entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
delete mode 100644 entity/Order_entity/entityfields/status/possibleItemsProcess.js
create mode 100644 entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
create mode 100644 entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
delete mode 100644 entity/Orderitem_entity/entityfields/unit/possibleItemsProcess.js
create mode 100644 entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
create mode 100644 entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
delete mode 100644 entity/Product_entity/entityfields/unit/possibleItemsProcess.js
create mode 100644 entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
create mode 100644 entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
delete mode 100644 entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js
create mode 100644 entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
create mode 100644 entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
delete mode 100644 entity/SalesprojectMember_entity/entityfields/salesproject_role/possibleItemsProcess.js
create mode 100644 entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
create mode 100644 entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
delete mode 100644 entity/SalesprojectSource_entity/entityfields/source/possibleItemsProcess.js
create mode 100644 entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
rename others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/{init_SalesprojectState.xml => init_SalesorderState.xml} (92%)
delete mode 100644 others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectEstimation.xml
rename others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/{init_SalesprojectRole.xml => init_SalesprojectMemberRole.xml} (92%)
delete mode 100644 others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPhase.xml
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index d751bf7656..bd0cc07ae6 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -385,7 +385,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
- <size v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -864,8 +864,8 @@
<name>UNIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -1178,8 +1178,8 @@
<name>PRICELIST</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -1784,8 +1784,8 @@
<name>UNIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -2203,8 +2203,8 @@
<name>SOURCE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -2657,8 +2657,8 @@
<name>SALESPROJECT_ROLE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3153,8 +3153,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3270,8 +3270,8 @@
<name>UNIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3569,8 +3569,8 @@
<name>STATUS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3653,8 +3653,8 @@
<name>TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
diff --git a/entity/Keyword_entity/Keyword_entity.aod b/entity/Keyword_entity/Keyword_entity.aod
index afc39b04e7..fef0c9e712 100644
--- a/entity/Keyword_entity/Keyword_entity.aod
+++ b/entity/Keyword_entity/Keyword_entity.aod
@@ -172,6 +172,48 @@
<fieldName>KeywordStates</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>KeywordPricelists</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
+ <entityName>Orderitem_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
+ <entityName>SalesprojectMember_entity</entityName>
+ <fieldName>KeywordMemberRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
+ <entityName>SalesprojectSource_entity</entityName>
+ <fieldName>KeywordSources</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>36a72192-902f-431b-8f43-0bef311678f7</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index c3be284bd5..aa48571dce 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -82,7 +82,7 @@
<entityField>
<name>UNIT</name>
<title>Unit</title>
- <possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>KeywordQuantityUnits</consumer>
</entityField>
<entityField>
<name>VAT</name>
@@ -163,6 +163,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Keyword_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -248,6 +263,10 @@
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.displayValue</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
new file mode 100644
index 0000000000..c21537814b
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/unit/possibleItemsProcess.js b/entity/Offeritem_entity/entityfields/unit/possibleItemsProcess.js
deleted file mode 100644
index fe799afc5e..0000000000
--- a/entity/Offeritem_entity/entityfields/unit/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("UNIT");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
new file mode 100644
index 0000000000..6804ff9fe0
--- /dev/null
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "OFFERITEM.UNIT");
+result.string(sql);
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 7ade315812..ed0c9b650a 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -63,7 +63,7 @@
<entityField>
<name>STATUS</name>
<title>Status</title>
- <possibleItemsProcess>%aditoprj%/entity/Order_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>KeywordStates</consumer>
<state>EDITABLE</state>
</entityField>
<entityField>
@@ -293,6 +293,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordStates</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Keyword_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -401,6 +416,10 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.displayValue</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Order_entity/entityfields/image/valueProcess.js b/entity/Order_entity/entityfields/image/valueProcess.js
index 8594bedb0b..ccc48faa05 100644
--- a/entity/Order_entity/entityfields/image/valueProcess.js
+++ b/entity/Order_entity/entityfields/image/valueProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Keyword_lib");
-result.string("TEXT:" + KeywordUtils.getViewValue("SALESORDER.STATUS", vars.getString("$field.STATUS")) );
\ No newline at end of file
+result.string("TEXT:" + KeywordUtils.getViewValue($KeywordRegistry.get.SalesprojectState, vars.getString("$field.STATUS")) );
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js b/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
new file mode 100644
index 0000000000..cd95c55b92
--- /dev/null
+++ b/entity/Order_entity/entityfields/keywordstates/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesorderState);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/status/possibleItemsProcess.js b/entity/Order_entity/entityfields/status/possibleItemsProcess.js
deleted file mode 100644
index 56cc1c910f..0000000000
--- a/entity/Order_entity/entityfields/status/possibleItemsProcess.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("system.vars");
-import("Order_lib");
-
-var items = KeywordUtils.getStandardArray("SALESORDER.STATUS");
-
-
-if (!OrderUtils.isEditable(vars.get("$field.STATUS")))
-{
- items = items.filter(function(pItem)
- {
- return !OrderUtils.isEditable(pItem[0]);
- });
-}
-result.object(items);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
new file mode 100644
index 0000000000..57efdee546
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesorderState, "SALESORDER.STATUS");
+result.string(sql);
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 6fa012d218..487257e4ae 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -82,7 +82,7 @@
<entityField>
<name>UNIT</name>
<title>Unit</title>
- <possibleItemsProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>KeywordQuantityUnits</consumer>
</entityField>
<entityField>
<name>VAT</name>
@@ -167,6 +167,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Keyword_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -252,6 +267,10 @@
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
new file mode 100644
index 0000000000..c21537814b
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/unit/possibleItemsProcess.js b/entity/Orderitem_entity/entityfields/unit/possibleItemsProcess.js
deleted file mode 100644
index fe799afc5e..0000000000
--- a/entity/Orderitem_entity/entityfields/unit/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("UNIT");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
new file mode 100644
index 0000000000..23be3ff92a
--- /dev/null
+++ b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "SALESORDERITEM.UNIT");
+result.string(sql);
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 7cccaceb0c..735e6bcbc3 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -58,8 +58,8 @@
<entityField>
<name>UNIT</name>
<title>Unit</title>
+ <consumer>KeywordQuantityUnits</consumer>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Product_entity/entityfields/unit/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>currentPurchasePriceId</name>
@@ -247,6 +247,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Keyword_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -348,6 +363,10 @@
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.displayValue</name>
+ <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js b/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
new file mode 100644
index 0000000000..c21537814b
--- /dev/null
+++ b/entity/Product_entity/entityfields/keywordquantityunits/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.QuantityUnit);
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/unit/possibleItemsProcess.js b/entity/Product_entity/entityfields/unit/possibleItemsProcess.js
deleted file mode 100644
index fe799afc5e..0000000000
--- a/entity/Product_entity/entityfields/unit/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("UNIT");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js b/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
new file mode 100644
index 0000000000..9a7de90427
--- /dev/null
+++ b/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.QuantityUnit, "PRODUCT.UNIT");
+result.string(sql);
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 8c553e3c08..98199055d8 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -81,8 +81,8 @@
<name>PRICELIST</name>
<documentation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/documentation.adoc</documentation>
<title>Price list</title>
+ <consumer>KeywordPricelists</consumer>
<mandatoryProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/mandatoryProcess.js</mandatoryProcess>
- <possibleItemsProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js</possibleItemsProcess>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
@@ -160,6 +160,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordPricelists</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Keyword_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -225,6 +240,10 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICELIST.displayValue</name>
+ <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js b/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
new file mode 100644
index 0000000000..df8bbcf76e
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.ProductPricelist);
diff --git a/entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js b/entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js
deleted file mode 100644
index 4da9244ba5..0000000000
--- a/entity/Productprice_entity/entityfields/pricelist/possibleItemsProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("PRICELIST");
-
-if(vars.get("$field.RELATION_ID") != "")
-{
- var orgname = db.cell("select NAME from ORG join RELATION on ORG_ID = ORGID where RELATIONID = '" + vars.get("$field.RELATION_ID") + "'");
- items.push(["", orgname]);
-}
-
-result.object(items);
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
new file mode 100644
index 0000000000..2b365d5dbf
--- /dev/null
+++ b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.ProductPricelist, "PRODUCTPRICE.PRICELIST");
+result.string(sql);
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 099e31be7c..db9622a1a6 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -25,7 +25,7 @@
<entityField>
<name>SALESPROJECT_ROLE</name>
<title>Role</title>
- <possibleItemsProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/salesproject_role/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>KeywordMemberRoles</consumer>
</entityField>
<entityProvider>
<name>SalesprojectMembers</name>
@@ -130,6 +130,21 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordMemberRoles</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Keyword_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -224,6 +239,10 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
<name>RELATION_ID.displayValue</name>
<expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESPROJECT_ROLE.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js b/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
new file mode 100644
index 0000000000..fcae12d10e
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/keywordmemberroles/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectMemberRole);
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/entityfields/salesproject_role/possibleItemsProcess.js b/entity/SalesprojectMember_entity/entityfields/salesproject_role/possibleItemsProcess.js
deleted file mode 100644
index 5377db7fd3..0000000000
--- a/entity/SalesprojectMember_entity/entityfields/salesproject_role/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("SALESPROJECT.ROLE");
-result.object(items);
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
new file mode 100644
index 0000000000..c336643dcf
--- /dev/null
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectMemberRole, "SALESPROJECT_MEMBER.SALESPROJECT_ROLE");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index c669dd9a75..c12188160e 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -49,8 +49,23 @@
<entityField>
<name>SOURCE</name>
<title>Source</title>
- <possibleItemsProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/source/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>KeywordSources</consumer>
</entityField>
+ <entityConsumer>
+ <name>KeywordSources</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Keyword_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -87,6 +102,10 @@
<name>SOURCE.value</name>
<recordfield>SALESPROJECT_SOURCE.SOURCE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SOURCE.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js b/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
new file mode 100644
index 0000000000..5cda1338b7
--- /dev/null
+++ b/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.string($KeywordRegistry.get.SalesprojectSource);
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/entityfields/source/possibleItemsProcess.js b/entity/SalesprojectSource_entity/entityfields/source/possibleItemsProcess.js
deleted file mode 100644
index 7c84b7abc7..0000000000
--- a/entity/SalesprojectSource_entity/entityfields/source/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = KeywordUtils.getStandardArray("SALESPROJECT.SOURCE");
-result.object(items);
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
new file mode 100644
index 0000000000..940b47fc5d
--- /dev/null
+++ b/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.SalesprojectSource, "SALESPROJECT_SOURCE.SOURCE");
+result.string(sql);
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
index 1fa2ad1be6..d807e68f21 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry.xml
@@ -12,15 +12,13 @@
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_PersonGender.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_ProductPricelist.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_QuantityUnit.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectEstimation.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectPhase.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectPricePolitics.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectRole.xml"/>
+ <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectMemberRole.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectSource.xml"/>
- <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectState.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectStrength.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectWeakness.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectWonLost.xml"/>
+ <include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesorderState.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_StockWarehouse.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskStatus.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskType.xml"/>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectState.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
similarity index 92%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectState.xml
rename to others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
index 8139008635..53e8f7814b 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectState.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
@@ -5,7 +5,7 @@
<column name="AB_KEYWORD_ENTRYID" value="8d9b0416-fee2-44d0-9334-1864ff78a824"/>
<column name="KEYID" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
<column name="TITLE" value="Checked"/>
- <column name="CONTAINER" value="SalesprojectState"/>
+ <column name="CONTAINER" value="SalesorderState"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<column name="AB_KEYWORD_ENTRYID" value="6f5c01ad-f9d9-43b9-834b-139974a75115"/>
<column name="KEYID" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
<column name="TITLE" value="Sent"/>
- <column name="CONTAINER" value="SalesprojectState"/>
+ <column name="CONTAINER" value="SalesorderState"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
@@ -23,7 +23,7 @@
<column name="AB_KEYWORD_ENTRYID" value="8bac5a6d-7810-469b-8fdb-0d3a0bf8e122"/>
<column name="KEYID" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
<column name="TITLE" value="Won"/>
- <column name="CONTAINER" value="SalesprojectState"/>
+ <column name="CONTAINER" value="SalesorderState"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
@@ -32,7 +32,7 @@
<column name="AB_KEYWORD_ENTRYID" value="f54b3c0b-bd80-4bc5-8a5c-55be2fd57017"/>
<column name="KEYID" value="5527bf9b-2cf8-49ea-bd1e-91a36f4f78e1"/>
<column name="TITLE" value="Lost"/>
- <column name="CONTAINER" value="SalesprojectState"/>
+ <column name="CONTAINER" value="SalesorderState"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectEstimation.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectEstimation.xml
deleted file mode 100644
index c30ffc5a4e..0000000000
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectEstimation.xml
+++ /dev/null
@@ -1,172 +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="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="8a850f25-e307-4522-a914-b693e453871c"/>
- <column name="KEYID" value="ee0451ac-ca9b-421f-aadc-23232d1477ff"/>
- <column name="TITLE" value="Project_volume sufficient"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <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="e7dd35cc-f150-43ae-9b08-d055eff6bf11"/>
- <column name="KEYID" value="145cb6f1-06c2-492b-8508-4cb4c3cb1ca6"/>
- <column name="TITLE" value="Project_budget available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <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="ed300490-73df-48a4-9e07-402982d5dadc"/>
- <column name="KEYID" value="10991ded-f4bc-4d73-aee3-1c06c058d8fc"/>
- <column name="TITLE" value="Project_specifications available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <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="e0118080-13f4-4ce6-bb23-44db2bb32976"/>
- <column name="KEYID" value="7639b53d-e8f6-4188-aa69-d85ae672d55a"/>
- <column name="TITLE" value="Project_timeframe critical"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <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="180addff-a67d-4a13-8b07-e18a51756282"/>
- <column name="KEYID" value="be6e7c8f-8e9a-4de2-be13-f4cd015a77fa"/>
- <column name="TITLE" value="Project_payment default/penalty critical"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <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="cd70d44d-4a70-4176-b62c-45caec4c1a76"/>
- <column name="KEYID" value="b6555f52-2503-4f0b-896b-dd7263f66ac0"/>
- <column name="TITLE" value="Project_references available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="5"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="1d2ebc23-5737-4794-830d-c0f1cf00c9ea"/>
- <column name="KEYID" value="89f8be66-4219-4750-87ce-2a893e17159d"/>
- <column name="TITLE" value="Product_requirements suitable"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="6"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="956eb587-0291-4eae-b091-2b20cc32feb2"/>
- <column name="KEYID" value="36894c4c-72de-4c0b-b269-195f451dd3dc"/>
- <column name="TITLE" value="Product_philosophy fitting"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="7"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="1c7658a7-9dc0-4c71-bfe1-8ab14020a51e"/>
- <column name="KEYID" value="a607a17a-b0c8-4542-b60a-2f0e4c07bb21"/>
- <column name="TITLE" value="Product_industry template available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="8"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="f1c4a607-dec3-432f-bed6-624be294c025"/>
- <column name="KEYID" value="c1fd6a58-50ec-4680-9446-5e5b7830d25e"/>
- <column name="TITLE" value="Other_sympathy available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="9"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="ff2e3e22-9104-4b76-bcc1-8db1bb1481ba"/>
- <column name="KEYID" value="42034c24-1d27-4243-ab78-d993425633d5"/>
- <column name="TITLE" value="Other_advocate available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="10"/>
- <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="8a850f25-e307-4522-a914-b693e453871c"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="e7dd35cc-f150-43ae-9b08-d055eff6bf11"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="ed300490-73df-48a4-9e07-402982d5dadc"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="e0118080-13f4-4ce6-bb23-44db2bb32976"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="180addff-a67d-4a13-8b07-e18a51756282"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="cd70d44d-4a70-4176-b62c-45caec4c1a76"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="1d2ebc23-5737-4794-830d-c0f1cf00c9ea"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="956eb587-0291-4eae-b091-2b20cc32feb2"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="1c7658a7-9dc0-4c71-bfe1-8ab14020a51e"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="f1c4a607-dec3-432f-bed6-624be294c025"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="ff2e3e22-9104-4b76-bcc1-8db1bb1481ba"/>
- </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_SalesprojectRole.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
similarity index 92%
rename from others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectRole.xml
rename to others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
index 0a6f75a04d..6bb21bcdb6 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectRole.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
@@ -5,7 +5,7 @@
<column name="AB_KEYWORD_ENTRYID" value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
<column name="KEYID" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
<column name="TITLE" value="Project manager"/>
- <column name="CONTAINER" value="SalesprojectRole"/>
+ <column name="CONTAINER" value="SalesprojectMemberRole"/>
<column name="SORTING" valueNumeric="0"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<column name="AB_KEYWORD_ENTRYID" value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
<column name="KEYID" value="8fb09614-5dc4-4d68-ac66-bf7bbebcb3ad"/>
<column name="TITLE" value="Project assistant"/>
- <column name="CONTAINER" value="SalesprojectRole"/>
+ <column name="CONTAINER" value="SalesprojectMemberRole"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
@@ -23,7 +23,7 @@
<column name="AB_KEYWORD_ENTRYID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
<column name="KEYID" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
<column name="TITLE" value="Adviser"/>
- <column name="CONTAINER" value="SalesprojectRole"/>
+ <column name="CONTAINER" value="SalesprojectMemberRole"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
@@ -32,7 +32,7 @@
<column name="AB_KEYWORD_ENTRYID" value="3d603fe3-1b06-43fc-9e20-2efd6e9e4afd"/>
<column name="KEYID" value="70cbad1b-eac6-4369-ba50-4946e0fbcb3a"/>
<column name="TITLE" value="Decision maker"/>
- <column name="CONTAINER" value="SalesprojectRole"/>
+ <column name="CONTAINER" value="SalesprojectMemberRole"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
@@ -41,7 +41,7 @@
<column name="AB_KEYWORD_ENTRYID" value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
<column name="KEYID" value="a8460c8e-24bd-4410-9704-e4865fdd57bf"/>
<column name="TITLE" value="External sales manager"/>
- <column name="CONTAINER" value="SalesprojectRole"/>
+ <column name="CONTAINER" value="SalesprojectMemberRole"/>
<column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
@@ -50,7 +50,7 @@
<column name="AB_KEYWORD_ENTRYID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
<column name="KEYID" value="67baabb5-abd0-43bd-aea1-cf7e606814a6"/>
<column name="TITLE" value="Internal sales manager"/>
- <column name="CONTAINER" value="SalesprojectRole"/>
+ <column name="CONTAINER" value="SalesprojectMemberRole"/>
<column name="SORTING" valueNumeric="5"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPhase.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPhase.xml
deleted file mode 100644
index 19efe9bd26..0000000000
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_SalesprojectPhase.xml
+++ /dev/null
@@ -1,142 +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="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="ce8555bc-240a-43f6-a3f8-848a7eac39a3"/>
- <column name="KEYID" value="a4dac73a-19f4-4e0b-9866-12e04d387160"/>
- <column name="TITLE" value="Lead"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <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="f8ad8ba2-0122-4d8a-a131-23041a56038a"/>
- <column name="KEYID" value="c3208dab-5ae9-4c4f-8e79-6bad630b24fb"/>
- <column name="TITLE" value="Waiting for requirements"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <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="e11e0484-6f9b-4e9a-ad2c-c852c7485e6e"/>
- <column name="KEYID" value="c2d1e9b1-e2ac-49af-8e6a-ce1b4b6a2d50"/>
- <column name="TITLE" value="Specifications in progress"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <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="abed0f11-2b8a-47bf-918c-b3eb77be513f"/>
- <column name="KEYID" value="df4655a0-cc0e-49c2-b418-ec34baa24693"/>
- <column name="TITLE" value="Deliver opinion"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <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="95ba863d-cf4c-429c-90e7-aa99457595d2"/>
- <column name="KEYID" value="40cc9816-d4c8-4309-9b5c-01a96450c2fd"/>
- <column name="TITLE" value="Presentation preparation"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <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="56a27bea-a283-459e-ab08-de28120287b3"/>
- <column name="KEYID" value="2e2477a7-aa91-407e-9338-cfc6ab376543"/>
- <column name="TITLE" value="Presentation follow-up"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <column name="SORTING" valueNumeric="5"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="991a53e9-c740-4a9c-b522-921e564f31e2"/>
- <column name="KEYID" value="39009ecf-0d3b-4f06-8927-37d7c6ef509d"/>
- <column name="TITLE" value="Workshop"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <column name="SORTING" valueNumeric="6"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="ffdeb522-4fe1-48db-ae0e-a2317aa4a6f1"/>
- <column name="KEYID" value="a7edc75b-83c3-40af-bd96-c74a085c6d29"/>
- <column name="TITLE" value="Negotiation"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <column name="SORTING" valueNumeric="7"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="66fd1f76-dbcc-413d-9391-96a0a61c3286"/>
- <column name="KEYID" value="ff4d15bb-9dc3-4e90-b5b0-70c3e5b3cdff"/>
- <column name="TITLE" value="Project decision"/>
- <column name="CONTAINER" value="SalesprojectPhase"/>
- <column name="SORTING" valueNumeric="8"/>
- <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="ce8555bc-240a-43f6-a3f8-848a7eac39a3"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="f8ad8ba2-0122-4d8a-a131-23041a56038a"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="e11e0484-6f9b-4e9a-ad2c-c852c7485e6e"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="abed0f11-2b8a-47bf-918c-b3eb77be513f"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="95ba863d-cf4c-429c-90e7-aa99457595d2"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="56a27bea-a283-459e-ab08-de28120287b3"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="991a53e9-c740-4a9c-b522-921e564f31e2"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="ffdeb522-4fe1-48db-ae0e-a2317aa4a6f1"/>
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="66fd1f76-dbcc-413d-9391-96a0a61c3286"/>
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
index 1db01af0b7..521fda5a9d 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1000.xml
@@ -19,7 +19,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
<column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="1"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
@@ -34,7 +34,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
<column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="1"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
@@ -48,7 +48,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
<column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
<column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
@@ -62,7 +62,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="564b5ba4-05ef-4702-b6d8-35417b94abae"/>
<column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
<column name="ASSIGNEDTO" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
@@ -76,7 +76,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="58ce593c-a1af-41ad-91ee-df7c8a27e142"/>
<column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
<column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
@@ -90,7 +90,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="50cd83bc-f7ad-46aa-82a2-fca1a506c0ee"/>
<column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
<column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
@@ -104,7 +104,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="1b70642f-dc5a-4073-b10a-2eeb52f4dbba"/>
<column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
<column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
index ecc6cc3d07..752248cd95 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1001.xml
@@ -19,7 +19,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="bb444090-b57a-4620-ae65-12c9ade05c79"/>
<column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
index 313d5556c1..ae957f8083 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1002.xml
@@ -19,7 +19,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="bb444090-b57a-4620-ae65-12c9ade05caa"/>
<column name="OFFER_ID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
index 72947481ec..5f7661ab29 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1003.xml
@@ -19,7 +19,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="42444090-b57a-4620-ae65-12c9ade05c79"/>
<column name="OFFER_ID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
diff --git a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml b/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
index 322eaf4bfc..d4821f4a6a 100644
--- a/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
+++ b/others/db_changes/data_alias/data/example_offer/OFFER_1004.xml
@@ -19,7 +19,7 @@
<insert tableName="OFFERITEM">
<column name="OFFERITEMID" value="bb444011-b57a-4620-ae65-12c9ade05c79"/>
<column name="OFFER_ID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="UNIT" valueNumeric="4"/>
+ <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
diff --git a/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml b/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml
index 29cbb4f99a..1a5dedcbe3 100644
--- a/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml
+++ b/others/db_changes/data_alias/data/example_product/PRODUCT_42154311.xml
@@ -9,7 +9,7 @@
<column name="PRODUCTCODE" value="ProduktNr1"/>
<column name="PRODUCTNAME" value="AX45"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
</insert>
<insert tableName="PRODUCT">
<column name="PRODUCTID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
@@ -19,7 +19,7 @@
<column name="PRODUCTCODE" value="ProduktNr1.1"/>
<column name="PRODUCTNAME" value="Produktname1.1"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
</insert>
<insert tableName="PRODUCT">
<column name="PRODUCTID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
@@ -29,7 +29,7 @@
<column name="PRODUCTCODE" value="ProduktNr1.2"/>
<column name="PRODUCTNAME" value="Produktname1.2"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
</insert>
<insert tableName="PRODUCT">
<column name="PRODUCTID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
@@ -39,7 +39,7 @@
<column name="PRODUCTCODE" value="ProduktNr4.1"/>
<column name="PRODUCTNAME" value="Produktname4.1"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
</insert>
<insert tableName="PRODUCT">
<column name="PRODUCTID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
@@ -49,7 +49,7 @@
<column name="PRODUCTCODE" value="ProduktNr4.2"/>
<column name="PRODUCTNAME" value="Produktname4.2a"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
</insert>
<insert tableName="PRODUCT">
<column name="PRODUCTID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
@@ -59,7 +59,7 @@
<column name="PRODUCTCODE" value="R01"/>
<column name="PRODUCTNAME" value="Sonderrabatt"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
</insert>
<insert tableName="PRODUCT">
<column name="PRODUCTID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
@@ -69,7 +69,7 @@
<column name="PRODUCTCODE" value="AX47-2233"/>
<column name="PRODUCTNAME" value="AX47"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
</insert>
<insert tableName="PROD2PROD">
@@ -138,7 +138,7 @@
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" valueNumeric="1"/>
+ <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
<column name="BUYSELL" value="SP"/>
</insert>
<insert tableName="PRODUCTPRICE">
@@ -150,7 +150,7 @@
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="FROMQUANTITY" valueNumeric="50.00"/>
<column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" valueNumeric="1"/>
+ <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
<column name="BUYSELL" value="SP"/>
</insert>
<insert tableName="PRODUCTPRICE">
@@ -162,7 +162,7 @@
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" valueNumeric="1"/>
+ <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
<column name="BUYSELL" value="SP"/>
</insert>
<insert tableName="PRODUCTPRICE">
@@ -174,7 +174,7 @@
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" valueNumeric="2"/>
+ <column name="PRICELIST" value="40564efc-ce12-456c-a461-3bb3c9c269be"/>
<column name="BUYSELL" value="SP"/>
</insert>
<insert tableName="PRODUCTPRICE">
@@ -186,7 +186,7 @@
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="FROMQUANTITY" valueNumeric="50.00"/>
<column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" valueNumeric="2"/>
+ <column name="PRICELIST" value="40564efc-ce12-456c-a461-3bb3c9c269be"/>
<column name="BUYSELL" value="SP"/>
</insert>
<insert tableName="PRODUCTPRICE">
@@ -198,7 +198,7 @@
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="FROMQUANTITY" valueNumeric="50.00"/>
<column name="CURRENCY" value="USD"/>
- <column name="PRICELIST" valueNumeric="1"/>
+ <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
<column name="BUYSELL" value="SP"/>
</insert>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
index e1786e1f22..4a5583a226 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1000.xml
@@ -8,7 +8,7 @@
<column name="SALESORDERDATE" valueDate="2017-11-21T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1000"/>
<column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" valueNumeric="2"/>
+ <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
<column name="NET" valueNumeric="210.00"/>
<column name="VAT" valueNumeric="39.90"/>
<column name="CURRENCY" value="EUR"/>
@@ -18,7 +18,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="1"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
@@ -33,7 +33,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="1"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
@@ -47,7 +47,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
<column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
@@ -61,7 +61,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="8772eb20-dbe8-4e12-8ea8-21fb28474c3e"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
<column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
@@ -75,7 +75,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="8c60146f-e950-47ad-8fed-d7bb88947789"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
<column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
@@ -89,7 +89,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="21ee4b39-876e-44a8-8153-dc7f38957fc7"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
@@ -103,7 +103,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="f268cf96-7ba6-44aa-8357-42e0469afe79"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
index 4a2217e227..096d345b46 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1001.xml
@@ -8,7 +8,7 @@
<column name="SALESORDERDATE" valueDate="2018-08-12T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1001"/>
<column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" valueNumeric="2"/>
+ <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
<column name="NET" valueNumeric="420.00"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="CURRENCY" value="EUR"/>
@@ -18,7 +18,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="ed7dcd27-0369-4196-894c-bfcce94b9e73"/>
<column name="SALESORDER_ID" value="41197800-027b-47f5-923a-f1004d09a969"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
index c785f001ab..a49f76b892 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1002.xml
@@ -8,7 +8,7 @@
<column name="SALESORDERDATE" valueDate="2016-06-14T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1002"/>
<column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" valueNumeric="2"/>
+ <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
<column name="NET" valueNumeric="630.00"/>
<column name="VAT" valueNumeric="119.70"/>
<column name="CURRENCY" value="EUR"/>
@@ -18,7 +18,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="17856c63-10f8-46c6-9295-5ad5bedff8ba"/>
<column name="SALESORDER_ID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="3"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
index 24cb562bc9..d87c8d58c6 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1003.xml
@@ -8,7 +8,7 @@
<column name="SALESORDERDATE" valueDate="2018-08-23T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1003"/>
<column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" valueNumeric="1"/>
+ <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
<column name="NET" valueNumeric="420.00"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="CURRENCY" value="EUR"/>
@@ -18,7 +18,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="3b25eeb9-ea52-4c62-a22c-041a1a2a41c2"/>
<column name="SALESORDER_ID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
- <column name="UNIT" valueNumeric="1"/>
+ <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
diff --git a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
index f75a87d11c..8f91aa3dfd 100644
--- a/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
+++ b/others/db_changes/data_alias/data/example_salesorder/SALESORDER_1004.xml
@@ -8,7 +8,7 @@
<column name="SALESORDERDATE" valueDate="2017-05-09T00:00:00"/>
<column name="SALESORDERCODE" valueNumeric="1004"/>
<column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" valueNumeric="1"/>
+ <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
<column name="NET" valueNumeric="840.00"/>
<column name="VAT" valueNumeric="159.60"/>
<column name="CURRENCY" value="EUR"/>
@@ -18,7 +18,7 @@
<insert tableName="SALESORDERITEM">
<column name="SALESORDERITEMID" value="45422c17-9626-4435-80ef-58c24fdf7559"/>
<column name="SALESORDER_ID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
- <column name="UNIT" valueNumeric="4"/>
+ <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
<column name="QUANTITY" valueNumeric="2"/>
<column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
<column name="PRICE" valueNumeric="210.00"/>
diff --git a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
index 3edff36d08..9118178c8e 100644
--- a/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
+++ b/others/db_changes/data_alias/data/example_salesproject/SALESPROJECT_gfk.xml
@@ -29,7 +29,7 @@
<column name="ENTRYDATE" valueDate="2017-08-21T09:03:43"/>
<column name="INFO" value="Initialeintrag"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SOURCE" valueNumeric="1"/>
+ <column name="SOURCE" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
</insert>
<insert tableName="SALESPROJECT_CYCLE">
@@ -106,7 +106,7 @@
<column name="SALESPROJECT_MEMBERID" value="f9dc15c0-91b8-43d3-ba98-80ca581db3a3"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
<column name="RELATION_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="SALESPROJECT_ROLE" valueNumeric="1"/>
+ <column name="SALESPROJECT_ROLE" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
</insert>
<insert tableName="SALESPROJECT_CLASSIFICATION">
diff --git a/others/db_changes/data_alias/struct/create_offeritem.xml b/others/db_changes/data_alias/struct/create_offeritem.xml
index 3f34c928db..a01d49bdd3 100644
--- a/others/db_changes/data_alias/struct/create_offeritem.xml
+++ b/others/db_changes/data_alias/struct/create_offeritem.xml
@@ -6,7 +6,7 @@
<constraints primaryKey="true" primaryKeyName="PK_OFFERITEM_OFFERITEMID"/>
</column>
<column name="OFFER_ID" type="CHAR(36)"/>
- <column name="UNIT" type="INTEGER"/>
+ <column name="UNIT" type="CHAR(36)"/>
<column name="QUANTITY" type="NUMERIC(14,2)"/>
<column name="GROUPCODEID" type="CHAR(36)"/>
<column name="ASSIGNEDTO" type="CHAR(36)">
diff --git a/others/db_changes/data_alias/struct/create_product.xml b/others/db_changes/data_alias/struct/create_product.xml
index 94ebd50dd9..2356a9ec1e 100644
--- a/others/db_changes/data_alias/struct/create_product.xml
+++ b/others/db_changes/data_alias/struct/create_product.xml
@@ -15,7 +15,7 @@
<column name="PRODUCTNAME" type="NVARCHAR(50)"/>
<column name="INFO" type="NCLOB"/>
<column name="STATUS" type="INTEGER"/>
- <column name="UNIT" type="INTEGER"/>
+ <column name="UNIT" type="CHAR(36)"/>
<column name="STANDARD" type="INTEGER"/>
</createTable>
</changeSet>
diff --git a/others/db_changes/data_alias/struct/create_productprice.xml b/others/db_changes/data_alias/struct/create_productprice.xml
index a0aa03824b..33e01126c0 100644
--- a/others/db_changes/data_alias/struct/create_productprice.xml
+++ b/others/db_changes/data_alias/struct/create_productprice.xml
@@ -18,7 +18,7 @@
<column name="CURRENCY" type="CHAR(36)">
<constraints nullable="false"/>
</column>
- <column name="PRICELIST" type="INTEGER"/>
+ <column name="PRICELIST" type="CHAR(36)"/>
<column name="BUYSELL" type="NVARCHAR(5)"/>
</createTable>
</changeSet>
diff --git a/others/db_changes/data_alias/struct/create_salesorder.xml b/others/db_changes/data_alias/struct/create_salesorder.xml
index 8e02e12b72..a54667da2b 100644
--- a/others/db_changes/data_alias/struct/create_salesorder.xml
+++ b/others/db_changes/data_alias/struct/create_salesorder.xml
@@ -16,7 +16,7 @@
<column name="LANGUAGE" type="CHAR(5)"/>
<column name="SALESORDERCODE" type="INTEGER"/>
<column name="VERSNR" type="INTEGER"/>
- <column name="STATUS" type="INTEGER"/>
+ <column name="STATUS" type="CHAR(36)"/>
<column name="NET" type="NUMERIC(14,2)"/>
<column name="VAT" type="NUMERIC(14,2)"/>
<column name="CURRENCY" type="CHAR(36)"/>
diff --git a/others/db_changes/data_alias/struct/create_salesorderitem.xml b/others/db_changes/data_alias/struct/create_salesorderitem.xml
index e44b2f9356..60caa27923 100644
--- a/others/db_changes/data_alias/struct/create_salesorderitem.xml
+++ b/others/db_changes/data_alias/struct/create_salesorderitem.xml
@@ -6,7 +6,7 @@
<constraints primaryKey="true" primaryKeyName="PK_SALESORDERITEM_SALESORDERITEMID"/>
</column>
<column name="SALESORDER_ID" type="CHAR(36)"/>
- <column name="UNIT" type="INTEGER"/>
+ <column name="UNIT" type="CHAR(36)"/>
<column name="QUANTITY" type="NUMERIC(14,2)"/>
<column name="GROUPCODEID" type="CHAR(36)"/>
<column name="ASSIGNEDTO" type="CHAR(36)">
diff --git a/others/db_changes/data_alias/struct/create_salesproject_member.xml b/others/db_changes/data_alias/struct/create_salesproject_member.xml
index 919a5b74ce..36645336b5 100644
--- a/others/db_changes/data_alias/struct/create_salesproject_member.xml
+++ b/others/db_changes/data_alias/struct/create_salesproject_member.xml
@@ -12,7 +12,7 @@
<constraints nullable="false"/>
</column>
<column name="RELATIONSHIP" type="INTEGER"/>
- <column name="SALESPROJECT_ROLE" type="INTEGER"/>
+ <column name="SALESPROJECT_ROLE" type="CHAR(36)"/>
</createTable>
</changeSet>
diff --git a/others/db_changes/data_alias/struct/create_salesproject_source.xml b/others/db_changes/data_alias/struct/create_salesproject_source.xml
index 106f70388d..d9145d4f8c 100644
--- a/others/db_changes/data_alias/struct/create_salesproject_source.xml
+++ b/others/db_changes/data_alias/struct/create_salesproject_source.xml
@@ -11,7 +11,7 @@
<column name="SALESPROJECT_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
- <column name="SOURCE" type="INTEGER"/>
+ <column name="SOURCE" type="CHAR(36)"/>
</createTable>
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index b8492b5071..57705e0db0 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -32,6 +32,11 @@ $KeywordRegistry.get = {
PersonGender: "PersonGender",
TaskStatus: "TaskStatus",
TaskType: "TaskType",
+ ProductPricelist: "ProductPricelist",
+ QuantityUnit: "QuantityUnit",
+ SalesprojectMemberRole: "SalesprojectMemberRole",
+ SalesprojectSource: "SalesprojectSource",
+ SalesorderState: "SalesorderState",
"null": null
};
@@ -214,22 +219,6 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
,_createKeywordEntry("6", translate.text("Service", locale))
]);
break;
- case "UNIT":
- valueContainer = _createKeywordEntriesContainer([
- _createKeywordEntry("1", translate.text("Pieces", locale))
- ,_createKeywordEntry("2", translate.text("Kgs", locale))
- ,_createKeywordEntry("3", translate.text("Liter", locale))
- ,_createKeywordEntry("4", translate.text("Hours", locale))
- ]);
- break;
- case "PRICELIST":
- valueContainer = _createKeywordEntriesContainer([
- _createKeywordEntry("1", translate.text("${PRICELIST_DEFAULT}", locale))
- ,_createKeywordEntry("2", translate.text("Key account", locale))
- ,_createKeywordEntry("3", translate.text("Special price list1", locale))
- ,_createKeywordEntry("4", translate.text("${PRICELIST_SERVICE}", locale))
- ]);
- break;
case "STOCK.WAREHOUSE":
valueContainer = _createKeywordEntriesContainer([
_createKeywordEntry("1", translate.text("Warehouse 1", locale))
@@ -273,14 +262,6 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
,_createKeywordEntry("11", translate.text("Other_advocate available", locale))
]);
break;
- case "SALESPROJECT.SOURCE":
- valueContainer = _createKeywordEntriesContainer([
- _createKeywordEntry("1", translate.text("Own website", locale))
- ,_createKeywordEntry("2", translate.text("Customer recommendation", locale))
- ,_createKeywordEntry("3", translate.text("Address purchase", locale))
- ,_createKeywordEntry("4", translate.text("Fair", locale))
- ]);
- break;
case "SALESPROJECT.STATE":
valueContainer = _createKeywordEntriesContainer([
_createKeywordEntry("1", translate.text("Open", locale))
@@ -322,16 +303,6 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL
,_createKeywordEntry("14", translate.text("Other_unknown", locale))
]);
break;
- case "SALESPROJECT.ROLE":
- valueContainer = _createKeywordEntriesContainer([
- _createKeywordEntry("1", translate.text("Project manager", locale))
- ,_createKeywordEntry("2", translate.text("Project assistant", locale))
- ,_createKeywordEntry("3", translate.text("Adviser", locale))
- ,_createKeywordEntry("4", translate.text("Decision maker", locale))
- ,_createKeywordEntry("5", translate.text("External sales manager", locale))
- ,_createKeywordEntry("6", translate.text("Internal sales manager", locale))
- ]);
- break;
case "SALESPROJECT.CYCLE.TYPE":
valueContainer = _createKeywordEntriesContainer([
_createKeywordEntry("1", translate.text("Phase", locale), null, {keyword: "SALESPROJECT.PHASE"})
--
GitLab