From 9aab5412660aba2c2b93bc30d98a049156145d22 Mon Sep 17 00:00:00 2001
From: Mohamed Mansour <m.mansour@adito.de>
Date: Mon, 12 Aug 2019 10:20:47 +0200
Subject: [PATCH] Removed unnecessary field status from database.
---
.../basic/init/struct/create_salesorder.xml | 1 -
aliasDefinition/Data_alias/Data_alias.aod | 26 -------------------
entity/Order_entity/Order_entity.aod | 15 -----------
.../status/displayValueProcess.js | 6 -----
.../status.displayvalue/expression.js | 5 ----
.../recordcontainers/index/query.js | 2 +-
6 files changed, 1 insertion(+), 54 deletions(-)
delete mode 100644 entity/Order_entity/entityfields/status/displayValueProcess.js
delete mode 100644 entity/Order_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
index b451ca3ea3..f6ca45a804 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 3a1e06039e..6811ae18ad 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 c0486dc13b..f5fd1d04d5 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 4a9b7bcc8b..0000000000
--- 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 aa54f4f9ef..0000000000
--- 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 2a452fc682..08e86cb7a0 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_" '
--
GitLab