From 8c5ebe3bdac197b9209427d2112b5e90893c9f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Schr=C3=B6ger?= <m.schroeger@adito.de>
Date: Tue, 23 Oct 2018 15:32:44 +0200
Subject: [PATCH] Angebotsposten: Liquibase, Entity, Context, Filter-View
---
aliasDefinition/Data_alias/Data_alias.aod | 294 +++++++++++++++++-
entity/Offer_entity/Offer_entity.aod | 24 ++
entity/Offeritem_entity/Offeritem_entity.aod | 150 +++++++++
.../entityfields/date_edit/valueProcess.js | 6 +
.../entityfields/date_new/valueProcess.js | 6 +
.../entityfields/offer_id/valueProcess.js | 10 +
.../entityfields/user_edit/valueProcess.js | 6 +
.../entityfields/user_new/valueProcess.js | 6 +
.../_____LANGUAGE_EXTRA.aod | 33 ++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 41 +++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 33 ++
.../Offeritem_context/Offeritem_context.aod | 16 +
neonView/OfferMain_view/OfferMain_view.aod | 5 +
.../OfferitemFilter_view.aod | 50 +++
.../OfferitemPreview_view.aod | 17 +
.../SalesprojectMain_view.aod | 8 +
.../SalesprojectPreview_view.aod | 5 +
others/db_changes/masterChangelog.xml | 2 +
others/db_changes/struct/create_offeritem.xml | 38 +++
others/db_changes/struct/offerChangesText.xml | 11 +
20 files changed, 760 insertions(+), 1 deletion(-)
create mode 100644 entity/Offeritem_entity/Offeritem_entity.aod
create mode 100644 entity/Offeritem_entity/entityfields/date_edit/valueProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/date_new/valueProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/offer_id/valueProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/user_edit/valueProcess.js
create mode 100644 entity/Offeritem_entity/entityfields/user_new/valueProcess.js
create mode 100644 neonContext/Offeritem_context/Offeritem_context.aod
create mode 100644 neonView/OfferitemFilter_view/OfferitemFilter_view.aod
create mode 100644 neonView/OfferitemPreview_view/OfferitemPreview_view.aod
create mode 100644 others/db_changes/struct/create_offeritem.xml
create mode 100644 others/db_changes/struct/offerChangesText.xml
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 3e69267134..f2c30380e7 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -2392,7 +2392,7 @@
<name>LANGUAGE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
+ <columnType v="12" />
<size v="5" />
<scale v="0" />
<notNull v="false" />
@@ -2570,6 +2570,298 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>FOOTER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>HEADER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>OFFERITEM</name>
+ <dbName></dbName>
+ <idColumn>OFFERITEMID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>UNIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PRICE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2" />
+ <size v="14" />
+ <scale v="2" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>QUANTITY</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2" />
+ <size v="14" />
+ <scale v="2" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>VAT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2" />
+ <size v="14" />
+ <scale v="2" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OFFER_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="true" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OFFERITEMID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PRODUCT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="true" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DISCOUNT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2" />
+ <size v="14" />
+ <scale v="2" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ITEMPOSITION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OPTIONAL</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>GROUPCODEID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ITEMSORT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="2005" />
+ <size v="2147483647" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ASSIGNEDTO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ITEMNAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="250" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
</entities>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 696f09f949..f18450b286 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -121,6 +121,30 @@
<contentType>IMAGE</contentType>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>HEADER</name>
+ <tableName>OFFER</tableName>
+ <columnName>HEADER</columnName>
+ <caption>Header text</caption>
+ </entityField>
+ <entityField>
+ <name>FOOTER</name>
+ <tableName>OFFER</tableName>
+ <columnName>FOOTER</columnName>
+ <caption>Footer text</caption>
+ </entityField>
+ <entityOutgoingField>
+ <name>OfferOfferitem_dfo</name>
+ <title>Offeritems</title>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <description></description>
+ <caption>Offeritems</caption>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>#INCOMING</fieldName>
+ </dependency>
+ </entityOutgoingField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
new file mode 100644
index 0000000000..31c42f1dd7
--- /dev/null
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -0,0 +1,150 @@
+<?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.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.0.3">
+ <name>Offeritem_entity</name>
+ <title>Offeritem</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <alias>Data_alias</alias>
+ <recordContainerType>DB</recordContainerType>
+ <caption>Offeritem</caption>
+ <entityFields>
+ <entityIncomingField>
+ <name>#INCOMING</name>
+ <dependencies>
+ <entityDependency>
+ <name>724942e9-6290-48a4-8179-2efcf3cb1f61</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>OfferOfferitem_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityIncomingField>
+ <entityField>
+ <name>ASSIGNEDTO</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>ASSIGNEDTO</columnName>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>DATE_EDIT</columnName>
+ <contentType>DATE</contentType>
+ <outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>DATE_NEW</columnName>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>DESCRIPTION</columnName>
+ <caption>Description</caption>
+ </entityField>
+ <entityField>
+ <name>DISCOUNT</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>DISCOUNT</columnName>
+ <caption>Rabatt</caption>
+ </entityField>
+ <entityField>
+ <name>GROUPCODEID</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>GROUPCODEID</columnName>
+ <caption>Commodity group</caption>
+ </entityField>
+ <entityField>
+ <name>ITEMNAME</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>ITEMNAME</columnName>
+ <caption>Designation</caption>
+ </entityField>
+ <entityField>
+ <name>ITEMPOSITION</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>ITEMPOSITION</columnName>
+ <caption>Position</caption>
+ </entityField>
+ <entityField>
+ <name>ITEMSORT</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>ITEMSORT</columnName>
+ </entityField>
+ <entityField>
+ <name>OFFERITEMID</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>OFFERITEMID</columnName>
+ </entityField>
+ <entityField>
+ <name>OFFER_ID</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>OFFER_ID</columnName>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPTIONAL</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>OPTIONAL</columnName>
+ <caption>Optional</caption>
+ </entityField>
+ <entityField>
+ <name>PRICE</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>PRICE</columnName>
+ <caption>Unit price</caption>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>PRODUCT_ID</columnName>
+ <caption>Article</caption>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>QUANTITY</columnName>
+ <caption>Quantity</caption>
+ </entityField>
+ <entityField>
+ <name>UNIT</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>UNIT</columnName>
+ <caption>Unit</caption>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>USER_EDIT</columnName>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>USER_NEW</columnName>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <tableName>OFFERITEM</tableName>
+ <columnName>VAT</columnName>
+ <caption>VAT</caption>
+ </entityField>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <linkInformation>
+ <linkInformation>
+ <name>a5db2791-160d-476b-9bf1-bab082c05ae3</name>
+ <tableName>OFFERITEM</tableName>
+ <primaryKey>OFFERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ </linkInformation>
+</entity>
diff --git a/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js b/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000..00e95d744e
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/date_new/valueProcess.js b/entity/Offeritem_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000..7ace625314
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js b/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js
new file mode 100644
index 0000000000..bcd432a09f
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+{
+ if(vars.exists("$param.OfferId_param") && vars.get("$param.OfferId_param") != null && vars.get("$param.OfferId_param") != "")
+ result.string(vars.getString("$param.OfferId_param"));
+}
+
diff --git a/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js b/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000..67c86b14ca
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/user_new/valueProcess.js b/entity/Offeritem_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000..81966a3fbc
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 5e43abff3d..d8e5298e71 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -660,6 +660,39 @@
<entry>
<key>Sent</key>
</entry>
+ <entry>
+ <key>Offeritems</key>
+ </entry>
+ <entry>
+ <key>Header text</key>
+ </entry>
+ <entry>
+ <key>Rabatt</key>
+ </entry>
+ <entry>
+ <key>Commodity group</key>
+ </entry>
+ <entry>
+ <key>Footer text</key>
+ </entry>
+ <entry>
+ <key>Designation</key>
+ </entry>
+ <entry>
+ <key>Position</key>
+ </entry>
+ <entry>
+ <key>Optional</key>
+ </entry>
+ <entry>
+ <key>Unit price</key>
+ </entry>
+ <entry>
+ <key>Article</key>
+ </entry>
+ <entry>
+ <key>Offeritem</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 527dfbf942..833f8d7e1f 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -864,6 +864,47 @@
<key>Sent</key>
<value>Versendet</value>
</entry>
+ <entry>
+ <key>Offeritems</key>
+ <value>Angebotsposten</value>
+ </entry>
+ <entry>
+ <key>Header text</key>
+ </entry>
+ <entry>
+ <key>Rabatt</key>
+ </entry>
+ <entry>
+ <key>Commodity group</key>
+ <value>Warengruppe</value>
+ </entry>
+ <entry>
+ <key>Footer text</key>
+ </entry>
+ <entry>
+ <key>Designation</key>
+ <value>Bezeichnung</value>
+ </entry>
+ <entry>
+ <key>Position</key>
+ <value>Position</value>
+ </entry>
+ <entry>
+ <key>Optional</key>
+ <value>Optional</value>
+ </entry>
+ <entry>
+ <key>Unit price</key>
+ <value>Einzelpreis</value>
+ </entry>
+ <entry>
+ <key>Article</key>
+ <value>Artikel</value>
+ </entry>
+ <entry>
+ <key>Offeritem</key>
+ <value>Angebotsposten</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index d2c0fea478..5ca99d946d 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -668,6 +668,39 @@
<entry>
<key>Sent</key>
</entry>
+ <entry>
+ <key>Offeritems</key>
+ </entry>
+ <entry>
+ <key>Header text</key>
+ </entry>
+ <entry>
+ <key>Rabatt</key>
+ </entry>
+ <entry>
+ <key>Commodity group</key>
+ </entry>
+ <entry>
+ <key>Footer text</key>
+ </entry>
+ <entry>
+ <key>Designation</key>
+ </entry>
+ <entry>
+ <key>Position</key>
+ </entry>
+ <entry>
+ <key>Optional</key>
+ </entry>
+ <entry>
+ <key>Unit price</key>
+ </entry>
+ <entry>
+ <key>Article</key>
+ </entry>
+ <entry>
+ <key>Offeritem</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Offeritem_context/Offeritem_context.aod b/neonContext/Offeritem_context/Offeritem_context.aod
new file mode 100644
index 0000000000..bbfcab9649
--- /dev/null
+++ b/neonContext/Offeritem_context/Offeritem_context.aod
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+ <name>Offeritem_context</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>Offeritem_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>67982f26-ac82-4a24-8dcf-5b3db4d21f33</name>
+ <view>OfferitemFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3439b9ca-cc68-47f7-bfae-676280b28cdf</name>
+ <view>OfferitemPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index 957c32ed2f..d3263633c5 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -14,5 +14,10 @@
<entityField>#ENTITY</entityField>
<view>OfferPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>da7c8cef-a4f0-4614-a330-d81221abe566</name>
+ <entityField>OfferOfferitem_dfo</entityField>
+ <view>OfferitemFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
new file mode 100644
index 0000000000..ec94cab9be
--- /dev/null
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -0,0 +1,50 @@
+<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>OfferitemFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>OfferitemFilter_table</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>8c74810d-d127-4e64-8fbf-1b3db1835232</name>
+ <entityField>ITEMPOSITION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>545f79bf-2fee-4112-9541-0889d0e514eb</name>
+ <entityField>ITEMNAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2a907da4-b48d-4933-bc17-a40e7d4556f9</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
+ <entityField>UNIT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
+ <entityField>PRICE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
+ <entityField>DISCOUNT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
+ <entityField>OPTIONAL</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
new file mode 100644
index 0000000000..467fadca47
--- /dev/null
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -0,0 +1,17 @@
+<?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.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>OfferitemPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>OfferitemPreview_header</name>
+ <titleField>ITEMNAME</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ </cardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index b8ddc1dc4d..2966e1024d 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -5,6 +5,14 @@
<layout>
<masterSlaveLayout>
<name>layout</name>
+ <master>04b5a305-b2a6-481a-83a5-1d94bee08143</master>
</masterSlaveLayout>
</layout>
+ <children>
+ <neonViewReference>
+ <name>04b5a305-b2a6-481a-83a5-1d94bee08143</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectPreview_view</view>
+ </neonViewReference>
+ </children>
</neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 8262da274e..c406941ccb 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -7,4 +7,9 @@
<name>layout</name>
</boxLayout>
</layout>
+ <children>
+ <cardViewTemplate>
+ <name>SalesprojectPreview_header</name>
+ </cardViewTemplate>
+ </children>
</neonView>
diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml
index eb33b63d87..f7675a5a11 100644
--- a/others/db_changes/masterChangelog.xml
+++ b/others/db_changes/masterChangelog.xml
@@ -15,9 +15,11 @@
<include file="struct/create_stock.xml"/>
<include file="struct/create_salesproject.xml"/>
<include file="struct/create_offer.xml"/>
+ <include file="struct/create_offeritem.xml"/>
<include file="struct/contractChanges.xml"/>
<include file="struct/offerChanges.xml"/>
<include file="struct/productChanges.xml"/>
+ <include file="struct/offerChangesText.xml"/>
<include file="misc/1535533490181_persChanges.xml"/>
<include file="struct/1535612802325_addressChange.xml"/>
<include file="data/example_org/ORG_privat.xml"/>
diff --git a/others/db_changes/struct/create_offeritem.xml b/others/db_changes/struct/create_offeritem.xml
new file mode 100644
index 0000000000..c36bcd5a2b
--- /dev/null
+++ b/others/db_changes/struct/create_offeritem.xml
@@ -0,0 +1,38 @@
+<?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="m.schroeger" id="7bc6ec3a-bc67-4f5b-9b1e-501b44a7b75c">
+ <createTable tableName="OFFERITEM">
+ <column name="OFFERITEMID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_OFFERITEM_OFFERITEMID"/>
+ </column>
+ <column name="OFFER_ID" type="CHAR(36)">
+ <constraints nullable="false" foreignKeyName="FK_OFFERITEM_OFFER_ID" references="OFFER(OFFERID)"/>
+ </column>
+ <column name="UNIT" type="INTEGER"/>
+ <column name="QUANTITY" type="NUMERIC(14,2)"/>
+ <column name="GROUPCODEID" type="INTEGER"/>
+ <column name="DESCRIPTION" type="CLOB"/>
+ <column name="ASSIGNEDTO" type="CHAR(36)">
+ <constraints foreignKeyName="FK_OFFERITEM_ASSIGNEDTO" references="OFFERITEM(OFFERITEMID)"/>
+ </column>
+ <column name="PRICE" type="NUMERIC(14,2)"/>
+ <column name="ITEMSORT" type="INTEGER"/>
+ <column name="PRODUCT_ID" type="CHAR(36)">
+ <constraints nullable="false" foreignKeyName="FK_OFFERITEM_PRODUCT_ID" references="PRODUCT(PRODUCTID)"/>
+ </column>
+ <column name="VAT" type="NUMERIC(14,2)"/>
+ <column name="ITEMNAME" type="VARCHAR(250)"/>
+ <column name="OPTIONAL" type="INTEGER"/>
+ <column name="DISCOUNT" type="NUMERIC(14,2)"/>
+ <column name="ITEMPOSITION" type="VARCHAR(10)"/>
+ <column name="DATE_EDIT" type="TIMESTAMP"/>
+ <column name="DATE_NEW" type="TIMESTAMP">
+ <constraints nullable="false"/>
+ </column>
+ <column name="USER_EDIT" type="VARCHAR(50)"/>
+ <column name="USER_NEW" type="VARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ </createTable>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/struct/offerChangesText.xml b/others/db_changes/struct/offerChangesText.xml
new file mode 100644
index 0000000000..48bd619663
--- /dev/null
+++ b/others/db_changes/struct/offerChangesText.xml
@@ -0,0 +1,11 @@
+<?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="m.schroeger" id="af4fdc63-1563-424d-b604-6342dc486842">
+ <addColumn tableName="OFFER">
+ <column name="HEADER" type="CLOB"/>
+ </addColumn>
+ <addColumn tableName="OFFER">
+ <column name="FOOTER" type="CLOB"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
--
GitLab