From 445ddbbadfde617d9088927b92a21b647ce54a41 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Wed, 3 Feb 2021 14:02:55 +0100
Subject: [PATCH] =?UTF-8?q?#1067508-BaumtabellenOhneSinn=20Baumtabellen=20?=
=?UTF-8?q?entfernt=20oder=20gruppierung=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Leadimport_entity/Leadimport_entity.aod | 2 --
.../Productprice_entity.aod | 8 ++---
.../product_id.displayvalue/expression.js | 3 --
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 9 ++----
.../LeadimportFilter_view.aod | 27 -----------------
.../SerialLetterFilter_view.aod | 29 -------------------
6 files changed, 7 insertions(+), 71 deletions(-)
delete mode 100644 entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js
diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod
index 1f79a0d182..6dd8755383 100644
--- a/entity/Leadimport_entity/Leadimport_entity.aod
+++ b/entity/Leadimport_entity/Leadimport_entity.aod
@@ -68,7 +68,6 @@
<name>STATUS</name>
<title>Status</title>
<consumer>KeywordImportStatus</consumer>
- <groupable v="true" />
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/status/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
@@ -131,7 +130,6 @@
<entityField>
<name>IMPORTSOURCE</name>
<title>Import source</title>
- <groupable v="true" />
<mandatory v="true" />
</entityField>
<entityConsumer>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 20e53fc299..32ad155d44 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -25,6 +25,7 @@
<name>CURRENCY</name>
<title>Currency</title>
<consumer>KeywordCurrencies</consumer>
+ <groupable v="true" />
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
@@ -58,6 +59,7 @@
<name>PRODUCT_ID</name>
<title>Product</title>
<consumer>Products</consumer>
+ <groupable v="true" />
<linkedContext>Product</linkedContext>
<mandatory v="true" />
<stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/stateProcess.js</stateProcess>
@@ -93,6 +95,7 @@
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
+ <groupable v="true" />
<mandatory v="true" />
<stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/valueProcess.js</valueProcess>
@@ -104,6 +107,7 @@
<title>Price list</title>
<colorProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/colorProcess.js</colorProcess>
<consumer>KeywordPricelists</consumer>
+ <groupable v="true" />
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
@@ -316,10 +320,6 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.displayValue</name>
- <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FROMQUANTITY.displayValue</name>
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/fromquantity.displayvalue/expression.js</expression>
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js
deleted file mode 100644
index d43ca1490d..0000000000
--- a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string("select PRODUCT.PRODUCTNAME from PRODUCT where PRODUCT.PRODUCTID = PRODUCTPRICE.PRODUCT_ID");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index fc8c26f253..537332f81e 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1293,7 +1293,7 @@
</entry>
<entry>
<key>VAT</key>
- <value>UmsSt.</value>
+ <value>Ust.</value>
</entry>
<entry>
<key>The expiry date must be after the start date!</key>
@@ -4149,7 +4149,7 @@
</entry>
<entry>
<key>VAT in %</key>
- <value>UmsSt. in %</value>
+ <value>Ust. in %</value>
</entry>
<entry>
<key>Sales manager</key>
@@ -10477,10 +10477,7 @@ Bitte Datumseingabe prüfen</value>
<key>Marketing Workflow</key>
</entry>
<entry>
- <key>INSERT</key>
- </entry>
- <entry>
- <key>Automatically</key>
+ <key>INSERT</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonView/LeadimportFilter_view/LeadimportFilter_view.aod b/neonView/LeadimportFilter_view/LeadimportFilter_view.aod
index 5d877503ef..3e22dae8dc 100644
--- a/neonView/LeadimportFilter_view/LeadimportFilter_view.aod
+++ b/neonView/LeadimportFilter_view/LeadimportFilter_view.aod
@@ -36,32 +36,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeTableViewTemplate>
- <name>Treetable</name>
- <entityField>#ENTITY</entityField>
- <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
- <columns>
- <neonTreeTableColumn>
- <name>5b550d07-b92f-4429-a9f7-e18013aa3280</name>
- <entityField>#IMAGE</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>e25d671d-50c8-4c77-9a2b-8214b0b87814</name>
- <entityField>NAME</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>3ffd6131-6064-4ca2-958b-50f7eef0b3e1</name>
- <entityField>IMPORTSOURCE</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>5fe0eed1-ed45-478d-b84e-ad65e1e5fd0a</name>
- <entityField>LEADIMPORT_DATE</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>9563e615-fc93-406f-8cbb-2eceafc5bcc4</name>
- <entityField>STATUS</entityField>
- </neonTreeTableColumn>
- </columns>
- </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/SerialLetterFilter_view/SerialLetterFilter_view.aod b/neonView/SerialLetterFilter_view/SerialLetterFilter_view.aod
index 3d50021ba7..e4cd6299bc 100644
--- a/neonView/SerialLetterFilter_view/SerialLetterFilter_view.aod
+++ b/neonView/SerialLetterFilter_view/SerialLetterFilter_view.aod
@@ -38,34 +38,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeTableViewTemplate>
- <name>Treetable</name>
- <entityField>#ENTITY</entityField>
- <linkedColumns>
- <element>TITLE</element>
- </linkedColumns>
- <columns>
- <neonTreeTableColumn>
- <name>cae0d686-5109-4106-9b35-421e79e265db</name>
- <entityField>ICON</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>a5a9f4f1-14ad-4997-94c7-f76de7c5f8da</name>
- <entityField>TITLE</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>dc1a061a-95fa-499e-aee4-9b49aed28cfc</name>
- <entityField>STATUS</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>ec667f9a-65e3-482c-a459-87545b22af2a</name>
- <entityField>DOCUMENTTEMPLATE_ID</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>88b074e6-587a-477f-97d6-fde128cae267</name>
- <entityField>DESCRIPTION</entityField>
- </neonTreeTableColumn>
- </columns>
- </treeTableViewTemplate>
</children>
</neonView>
--
GitLab