From d3c585beb2cd3e38e19ad2dfcb74db845abcccd3 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 25 Mar 2019 16:52:01 +0100
Subject: [PATCH] Product Fixes
---
entity/Prod2prod_entity/Prod2prod_entity.aod | 1 +
entity/Product_entity/Product_entity.aod | 2 +
.../language/displayValueProcess.js | 10 +++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 1 +
neonContext/Prod2prod/Prod2prod.aod | 4 --
.../Prod2prodTable_view.aod | 38 -------------------
.../ProductMain_view/ProductMain_view.aod | 5 ---
.../data/example_attribute/Attribute.xml | 10 ++++-
8 files changed, 23 insertions(+), 48 deletions(-)
create mode 100644 entity/Product_entity/entityfields/language/displayValueProcess.js
delete mode 100644 neonView/Prod2prodTable_view/Prod2prodTable_view.aod
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index ff0f7aa649b..80bbc2d7cd3 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
<name>Prod2prod_entity</name>
+ <title>Parts list</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
<recordContainer>jdito</recordContainer>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index b7ab75cc4ee..5501274d100 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -280,7 +280,9 @@
<entityField>
<name>LANGUAGE</name>
<consumer>Languages</consumer>
+ <searchable v="false" />
<titleProcess>%aditoprj%/entity/Product_entity/entityfields/language/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
</entityField>
<entityConsumer>
<name>Languages</name>
diff --git a/entity/Product_entity/entityfields/language/displayValueProcess.js b/entity/Product_entity/entityfields/language/displayValueProcess.js
new file mode 100644
index 00000000000..de5246774fa
--- /dev/null
+++ b/entity/Product_entity/entityfields/language/displayValueProcess.js
@@ -0,0 +1,10 @@
+import("system.db");
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("Sql_lib");
+
+result.string(translate.text(db.cell(SqlCondition.begin().andPrepareVars("AB_LANGUAGE.ISO3", "$field.LANGUAGE")
+ .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=2"))));
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index c1f94617e2d..08fc72b7af6 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3317,6 +3317,7 @@
</entry>
<entry>
<key>VAT in %</key>
+ <value>UmsSt. in %</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonContext/Prod2prod/Prod2prod.aod b/neonContext/Prod2prod/Prod2prod.aod
index 5f3312e66db..3599d291141 100644
--- a/neonContext/Prod2prod/Prod2prod.aod
+++ b/neonContext/Prod2prod/Prod2prod.aod
@@ -16,9 +16,5 @@
<name>428b22a1-427f-4547-a478-964442078bc1</name>
<view>Prod2ProdEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>257aa20f-d6b4-4a64-8f61-bb62b6ef49c8</name>
- <view>Prod2prodTable_view</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/Prod2prodTable_view/Prod2prodTable_view.aod b/neonView/Prod2prodTable_view/Prod2prodTable_view.aod
deleted file mode 100644
index 7b14b322f32..00000000000
--- a/neonView/Prod2prodTable_view/Prod2prodTable_view.aod
+++ /dev/null
@@ -1,38 +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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>Prod2prodTable_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>data</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>1a1880db-4a23-4c0f-9a87-7da546461cca</name>
- <entityField>PARENTID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>40710edc-b8ef-43fa-8f8c-99add3946c47</name>
- <entityField>SOURCE_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>673daab5-c779-49db-aaf4-851f2d0a2c95</name>
- <entityField>QUANTITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>0c99aadc-0798-45eb-b015-8cdef16bf0f1</name>
- <entityField>OPTIONAL</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>da0abba6-9ea0-4503-9b51-8d232f345aa8</name>
- <entityField>TAKEPRICE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index ed9d388e264..7ac4a87c4db 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -29,11 +29,6 @@
<entityField>#ENTITY</entityField>
<view>ProductDescription_view</view>
</neonViewReference>
- <neonViewReference>
- <name>cbcf23d7-1d80-41c5-8041-8e768fa91487</name>
- <entityField>ProductLinks</entityField>
- <view>Prod2prodTable_view</view>
- </neonViewReference>
<neonViewReference>
<name>7f416115-ff89-45ca-be10-ed568cac266c</name>
<entityField>ProductLinks</entityField>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index 7ad3f95ced0..6c2c36f53f6 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -889,12 +889,20 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="ATTRIBUTE_LEVEL" valueNumeric="1"/>
<column name="ATTRIBUTE_NAME" value="Preisliste"/>
<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
<column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
</insert>
+<insert tableName="AB_ATTRIBUTEUSAGE">
+ <column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
+ <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
+ <column name="OBJECT_TYPE" value="Organisation"/>
+ <column name="MIN_COUNT"/>
+ <column name="MAX_COUNT"/>
+</insert>
+
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="e7886e41-252e-414c-a169-5d1481d010c8"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
--
GitLab