From f673b6025df65b0dffcbe068214ca75e0c8194cc Mon Sep 17 00:00:00 2001
From: "a.voegl" <a.voegl@adito.de>
Date: Wed, 17 Jun 2020 10:23:38 +0200
Subject: [PATCH] Orderrework
---
.../Data_alias/basic/2020.1.0/changelog.xml | 2 +
.../basic/2020.1.0/drop_salesorder_unpaid.xml | 8 ++++
.../basic/2020.1.0/drop_salesorder_versnr.xml | 8 ++++
.../_demoData/generatedData/salesorder.xml | 17 --------
.liquibase/Data_alias/changelog.xml | 2 +-
entity/Order_entity/Order_entity.aod | 4 --
.../entityfields/unpaid/valueProcess.js | 7 ----
neonContext/Order/Order.aod | 4 --
.../OrderClassification_view.aod | 39 -------------------
.../OrderDetail_view/OrderDetail_view.aod | 4 ++
10 files changed, 23 insertions(+), 72 deletions(-)
create mode 100644 .liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml
create mode 100644 .liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml
delete mode 100644 entity/Order_entity/entityfields/unpaid/valueProcess.js
delete mode 100644 neonView/OrderClassification_view/OrderClassification_view.aod
diff --git a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
index 1a5cbcf1263..9ff22e7eeaf 100644
--- a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
@@ -11,4 +11,6 @@
<include relativeToChangelogFile="true" file="add_WorkflowSignal_variables.xml"/>
<include relativeToChangelogFile="true" file="AlterTablesForTranslation/changelog.xml"/>
<include relativeToChangelogFile="true" file="update_Salutation_headline.xml"/>
+ <include relativeToChangelogFile="true" file="drop_salesorder_unpaid.xml"/>
+ <include relativeToChangelogFile="true" file="drop_salesorder_versnr.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml b/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml
new file mode 100644
index 00000000000..0f1f60e4c2f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_unpaid.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="a.voegl" id="6d0c57b1-309f-4d60-a801-2107b3c2480e">
+ <dropColumn tableName="SALESORDER">
+ <column name="UNPAID"/>
+ </dropColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml b/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml
new file mode 100644
index 00000000000..7e385b320c3
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.0/drop_salesorder_versnr.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="a.voegl" id="97c84d76-8c2d-4db7-8151-8ef5d70fd7d4">
+ <dropColumn tableName="SALESORDER">
+ <column name="VERSNR"/>
+ </dropColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
index d7fcac18bbb..224f7fea667 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
@@ -24,7 +24,6 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -42,7 +41,6 @@
<column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
<column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
<column name="VAT" valueNumeric="39.90"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="1"/>
@@ -61,7 +59,6 @@
<column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
<column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
<column name="VAT" valueNumeric="119.70"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="1"/>
@@ -80,7 +77,6 @@
<column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
<column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -102,7 +98,6 @@
<column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
<column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -120,7 +115,6 @@
<column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
<column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -143,7 +137,6 @@
<column name="SALESORDERDATE" valueDate="2018-09-11T12:00:00"/>
<column name="SALESORDERID" value="50c64e0f-6a21-4842-ab41-b27c70d0939a"/>
<column name="VAT" valueNumeric="10070.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -162,7 +155,6 @@
<column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
<column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -181,7 +173,6 @@
<column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
<column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -208,7 +199,6 @@
<column name="SALESORDERDATE" valueDate="2017-10-10T12:00:00"/>
<column name="SALESORDERID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
<column name="VAT" valueNumeric="10165.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="1"/>
@@ -231,7 +221,6 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -252,7 +241,6 @@
<column name="SALESORDERDATE" valueDate="2019-05-17T02:00:00"/>
<column name="SALESORDERID" value="a846d596-b9ce-4a73-a842-e9084ebf612a"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -271,7 +259,6 @@
<column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
<column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
<column name="VAT" valueNumeric="39.90"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -290,7 +277,6 @@
<column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
<column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
<column name="VAT" valueNumeric="79.80"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -312,7 +298,6 @@
<column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
<column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
<column name="VAT" valueNumeric="119.70"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -338,7 +323,6 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
<insert tableName="salesorder">
<column name="CANCELLATION" valueNumeric="0"/>
@@ -362,7 +346,6 @@
<column name="SALESORDERDATE" valueDate="2019-11-15T12:00:00"/>
<column name="SALESORDERID" value="ff049e6e-06ef-4c27-bcce-5b5b244e4054"/>
<column name="VAT" valueNumeric="0.00"/>
- <column name="VERSNR" valueNumeric="1"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index eee29581d9d..da270f17329 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,5 +14,5 @@
<include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
- <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
+ <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index e725eb70edf..7e1fda9c718 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -416,10 +416,6 @@
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/paid/stateProcess.js</stateProcess>
<displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paid/displayValueProcess.js</displayValueProcess>
</entityField>
- <entityField>
- <name>Unpaid</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/unpaid/valueProcess.js</valueProcess>
- </entityField>
<entityField>
<name>CANCELLATION</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/cancellation/documentation.adoc</documentation>
diff --git a/entity/Order_entity/entityfields/unpaid/valueProcess.js b/entity/Order_entity/entityfields/unpaid/valueProcess.js
deleted file mode 100644
index 1439939a0c2..00000000000
--- a/entity/Order_entity/entityfields/unpaid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.eMath");
-
-result.string(eMath.subDec(
- vars.get("$field.TotalGross"),
- vars.get("$field.PAID")));
\ No newline at end of file
diff --git a/neonContext/Order/Order.aod b/neonContext/Order/Order.aod
index ea7e701bba2..d3f8ba0860f 100644
--- a/neonContext/Order/Order.aod
+++ b/neonContext/Order/Order.aod
@@ -35,10 +35,6 @@
<name>ac222647-40b8-43e3-a054-edfc3d69106b</name>
<view>OrderLink_view</view>
</neonViewReference>
- <neonViewReference>
- <name>e8fb5f3b-e166-4ee3-9752-e20d9aec0e75</name>
- <view>OrderClassification_view</view>
- </neonViewReference>
<neonViewReference>
<name>cea44230-2a80-4a3e-9dc4-3d199f8f6edc</name>
<view>OrderDunning_view</view>
diff --git a/neonView/OrderClassification_view/OrderClassification_view.aod b/neonView/OrderClassification_view/OrderClassification_view.aod
deleted file mode 100644
index d5b6896eeb6..00000000000
--- a/neonView/OrderClassification_view/OrderClassification_view.aod
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>OrderClassification_view</name>
- <title>Classifications</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Classifications</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>6c01c691-c587-438c-9c92-77682c4fd34e</name>
- <entityField>PAYMENTTERMS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>16f9e458-eab5-4ed1-954c-0f2f8cb474e3</name>
- <entityField>DELIVERYTERMS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>aed251c9-caa6-462f-9b22-6a87f5998b4e</name>
- <entityField>PAYMENTADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>52dd0767-3a92-4d13-9f72-1bd9e7745b79</name>
- <entityField>DELIVERYADDRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>7c486c49-22e2-4d61-ac86-b599adbf9522</name>
- <entityField>NOTICE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 9e876a6e5cb..44791968d06 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -27,6 +27,10 @@
<name>6c1b2311-f15f-4d03-9301-0839b504d24a</name>
<entityField>DUNNINGTEXT</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>a488b7cc-bd0e-404a-bb7a-057410a1466d</name>
+ <entityField>NOTICE</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
--
GitLab