diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml index b451ca3ea3eb8f188f3979a7696d4dd3206a8299..f6ca45a804b26e028edd7c944f40d427b4c1993d 100644 --- a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml +++ b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml @@ -16,7 +16,6 @@ <column name="ISOLANGUAGE" type="CHAR(3)"/> <column name="SALESORDERCODE" type="INTEGER"/> <column name="VERSNR" 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/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 3a1e06039ed4f7d26e3b4d28a998808143623352..6811ae18ada4f4857af87307af289a3f131d568e 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -4162,32 +4162,6 @@ </customBooleanProperty> </customProperties> </entityFieldDb> - <entityFieldDb> - <name>STATUS</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title>Status</title> - <description></description> - <customProperties> - <customBooleanProperty> - <name>log</name> - <global v="false" /> - <property v="true" /> - </customBooleanProperty> - <customStringProperty> - <name>keyword</name> - <global v="false" /> - <property>SalesorderState</property> - </customStringProperty> - </customProperties> - </entityFieldDb> <entityFieldDb> <name>SALESORDERDATE</name> <dbName></dbName> diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index c0486dc13b1e30e7dbbc2984807f2d9038794b76..f5fd1d04d5b4ca4c2e816630926ed19c8371f19c 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -68,13 +68,6 @@ <element>MASK</element> </onValueChangeTypes> </entityField> - <entityField> - <name>STATUS</name> - <title>Status</title> - <consumer>KeywordStates</consumer> - <state>EDITABLE</state> - <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/status/displayValueProcess.js</displayValueProcess> - </entityField> <entityField> <name>VAT</name> <title>Total VAT</title> @@ -992,10 +985,6 @@ <name>SALESORDERID.value</name> <recordfield>SALESORDER.SALESORDERID</recordfield> </dbRecordFieldMapping> - <dbRecordFieldMapping> - <name>STATUS.value</name> - <recordfield>SALESORDER.STATUS</recordfield> - </dbRecordFieldMapping> <dbRecordFieldMapping> <name>VAT.value</name> <recordfield>SALESORDER.VAT</recordfield> @@ -1024,10 +1013,6 @@ <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> <dbRecordFieldMapping> <name>OFFER_ID.value</name> <recordfield>SALESORDER.OFFER_ID</recordfield> diff --git a/entity/Order_entity/entityfields/status/displayValueProcess.js b/entity/Order_entity/entityfields/status/displayValueProcess.js deleted file mode 100644 index 4a9b7bcc8b2f66e295eafc8c09f796d693249001..0000000000000000000000000000000000000000 --- a/entity/Order_entity/entityfields/status/displayValueProcess.js +++ /dev/null @@ -1,6 +0,0 @@ -import("system.result"); -import("system.vars"); -import("Keyword_lib"); -import("KeywordRegistry_basic"); - -result.string(KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.get("$field.STATUS"))); diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js deleted file mode 100644 index aa54f4f9efa30b7b8af672c9c43e70ed29d54b6c..0000000000000000000000000000000000000000 --- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js +++ /dev/null @@ -1,5 +0,0 @@ -import("system.result"); -import("Keyword_lib"); -import("KeywordRegistry_basic"); - -result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")); diff --git a/entity/Order_entity/recordcontainers/index/query.js b/entity/Order_entity/recordcontainers/index/query.js index 2a452fc682912d0f352095e584df3f3ad05a161a..08e86cb7a0765cc9bfd3ff0b59086f184c63a439 100644 --- a/entity/Order_entity/recordcontainers/index/query.js +++ b/entity/Order_entity/recordcontainers/index/query.js @@ -16,7 +16,7 @@ if (vars.exists("$local.idvalue")) { } sqlHelper = new SqlMaskingUtils(); sqlQuery = 'select SALESORDERID as "_uid_", ' - + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")], " | ") + + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10)], " | ") + ' as "_title_", ' + sqlHelper.concat(["ORGANISATION.NAME"], " | ") + ' as "_description_" '