From 4d534b292d372a659bd939f0848a6902bef4e559 Mon Sep 17 00:00:00 2001
From: Mohamed Mansour <m.mansour@adito.de>
Date: Mon, 12 Aug 2019 15:13:22 +0200
Subject: [PATCH] Belege: Removed unnecessary address field. Fixed Header and
Footer bugs.
---
.../basic/init/struct/create_salesorder.xml | 1 -
entity/Order_entity/Order_entity.aod | 20 -------------------
.../entityfields/address/valueProcess.js | 7 -------
.../entityfields/footer/valueProcess.js | 3 +++
.../entityfields/header/valueProcess.js | 3 +++
5 files changed, 6 insertions(+), 28 deletions(-)
delete mode 100644 entity/Order_entity/entityfields/address/valueProcess.js
diff --git a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
index f6ca45a804b..031624d87e1 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_salesorder.xml
@@ -19,7 +19,6 @@
<column name="NET" type="NUMERIC(14,2)"/>
<column name="VAT" type="NUMERIC(14,2)"/>
<column name="CURRENCY" type="CHAR(36)"/>
- <column name="ADDRESS" type="NCLOB"/>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 5939fda7eb9..85a3012b379 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -265,16 +265,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>ADDRESS</name>
- <contentType>LONG_TEXT</contentType>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/address/valueProcess.js</valueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
<entityConsumer>
<name>KeywordCurrencies</name>
<dependency>
@@ -324,12 +314,6 @@
<mandatory v="false" />
<description>PARAMETER</description>
</entityParameter>
- <entityParameter>
- <name>OrderAddress_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
<entityConsumer>
<name>Languages</name>
<dependency>
@@ -1014,10 +998,6 @@
<name>CONTACT_PERSON_ID.value</name>
<recordfield>CONTACT.PERSON_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRESS.value</name>
- <recordfield>SALESORDER.ADDRESS</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
diff --git a/entity/Order_entity/entityfields/address/valueProcess.js b/entity/Order_entity/entityfields/address/valueProcess.js
deleted file mode 100644
index 4e0c4c185ea..00000000000
--- a/entity/Order_entity/entityfields/address/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OrderAddress_param"))
-{
- result.string(vars.get("$param.OrderAddress_param"));
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/footer/valueProcess.js b/entity/Order_entity/entityfields/footer/valueProcess.js
index ec49268cd82..a57f0c325bb 100644
--- a/entity/Order_entity/entityfields/footer/valueProcess.js
+++ b/entity/Order_entity/entityfields/footer/valueProcess.js
@@ -4,6 +4,8 @@ import("system.neon");
import("system.db");
import("system.util");
+if (vars.get("$this.value") == null)
+{
if (vars.exists("$param.OrderFooter_param"))
{
result.string(vars.get("$param.OrderFooter_param"));
@@ -20,4 +22,5 @@ if (vars.get("$field.ChosenTexFooter") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexFooter") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+}
}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/header/valueProcess.js b/entity/Order_entity/entityfields/header/valueProcess.js
index fb36eb5bfbd..35a345fc953 100644
--- a/entity/Order_entity/entityfields/header/valueProcess.js
+++ b/entity/Order_entity/entityfields/header/valueProcess.js
@@ -4,6 +4,8 @@ import("system.neon");
import("system.db");
import("system.util");
+if (vars.get("$this.value") == null)
+{
if(vars.exists("$param.OrderHeader_param") && vars.get("$param.OrderHeader_param"))
result.string(vars.get("$param.OrderHeader_param"));
@@ -17,4 +19,5 @@ if (vars.get("$field.ChosenTexHeader") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexHeader") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
+}
}
\ No newline at end of file
--
GitLab