diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index bb8def2741701cec0837496df47408b5dbae2eaf..d128f9c2dc8c2353fb5e5e59892e22194adeaa3f 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -849,6 +849,7 @@ </entry> <entry> <key>Header text</key> + <value>Kopftext</value> </entry> <entry> <key>Commodity group</key> @@ -856,6 +857,7 @@ </entry> <entry> <key>Footer text</key> + <value>Fußtext</value> </entry> <entry> <key>Designation</key> diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod index 7563c1e23ea6ef95705a23c4372f7c696536aebd..d50f003cb7bc35534ab0067c4fd0013b2fd48e46 100644 --- a/neonView/OfferPreview_view/OfferPreview_view.aod +++ b/neonView/OfferPreview_view/OfferPreview_view.aod @@ -60,6 +60,10 @@ <name>683e3a86-0f9f-4b40-85c0-ae102a5a4a9a</name> <entityField>HEADER</entityField> </entityFieldLink> + <entityFieldLink> + <name>2ca09b0d-bdee-49e0-a022-cb4a4d891752</name> + <entityField>FOOTER</entityField> + </entityFieldLink> </fields> </genericViewTemplate> </children> diff --git a/others/db_changes/data/example_offer/OFFER_1000.xml b/others/db_changes/data/example_offer/OFFER_1000.xml new file mode 100644 index 0000000000000000000000000000000000000000..6759240a393a5b32a642a9c0f1669b51242e1793 --- /dev/null +++ b/others/db_changes/data/example_offer/OFFER_1000.xml @@ -0,0 +1,133 @@ +<?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="2b4fb594-d1ad-4057-a695-bff99e49ab40"> + <insert tableName="OFFER"> + <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/> + <column name="RELATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/> + <column name="OFFERDATE" valueDate="2018-11-21T00:00:00"/> + <column name="OFFERCODE" valueNumeric="1000"/> + <column name="STATUS" valueNumeric="1"/> + <column name="PROBABILITY" valueNumeric="5"/> + <column name="NET" valueNumeric="210.00"/> + <column name="VAT" valueNumeric="39.90"/> + <column name="CURRENCY" valueNumeric="1"/> + <column name="LANGUAGE" value="de-DE"/> + <column name="USER_NEW" value="Admin"/> + <column name="DATE_NEW" valueDate="2018-11-21T14:11:19"/> + </insert> + + <insert tableName="OFFERITEM"> + <column name="OFFERITEMID" value="aea44090-b57a-4620-ae65-12c9ade05c79"/> + <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/> + <column name="UNIT" valueNumeric="1"/> + <column name="QUANTITY" valueNumeric="1"/> + <column name="GROUPCODEID" valueNumeric="1"/> + <column name="PRICE" valueNumeric="210.00"/> + <column name="ITEMSORT" valueNumeric="1"/> + <column name="PRODUCT_ID" value="P101 "/> + <column name="VAT" valueNumeric="19.00"/> + <column name="ITEMNAME" value="AX45"/> + <column name="OPTIONAL" valueNumeric="1"/> + <column name="ITEMPOSITION" value="1"/> + <column name="USER_NEW" value="Admin"/> + <column name="DATE_NEW" valueDate="2018-11-21T14:32:19"/> + </insert> + + <insert tableName="OFFERITEM"> + <column name="OFFERITEMID" value="306997c2-212f-4ee3-97a2-525320c67f67"/> + <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/> + <column name="UNIT" valueNumeric="1"/> + <column name="QUANTITY" valueNumeric="1"/> + <column name="GROUPCODEID" valueNumeric="1"/> + <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/> + <column name="ITEMSORT" valueNumeric="2"/> + <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/> + <column name="ITEMNAME" value="AX47"/> + <column name="OPTIONAL" valueNumeric="1"/> + <column name="ITEMPOSITION" value="1.1"/> + <column name="USER_NEW" value="Admin"/> + <column name="DATE_NEW" valueDate="2018-11-21T14:32:29"/> + </insert> + + <insert tableName="OFFERITEM"> + <column name="OFFERITEMID" value="44b75a12-ae8b-4003-9347-9952843425a9"/> + <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/> + <column name="UNIT" valueNumeric="1"/> + <column name="QUANTITY" valueNumeric="3"/> + <column name="GROUPCODEID" valueNumeric="5"/> + <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/> + <column name="ITEMSORT" valueNumeric="3"/> + <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/> + <column name="ITEMNAME" value="Produktname4.1"/> + <column name="OPTIONAL" valueNumeric="1"/> + <column name="ITEMPOSITION" value="1.1.1"/> + <column name="USER_NEW" value="Admin"/> + <column name="DATE_NEW" valueDate="2018-11-21T14:32:35"/> + </insert> + + <insert tableName="OFFERITEM"> + <column name="OFFERITEMID" value="564b5ba4-05ef-4702-b6d8-35417b94abae"/> + <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/> + <column name="UNIT" valueNumeric="1"/> + <column name="QUANTITY" valueNumeric="3"/> + <column name="GROUPCODEID" valueNumeric="4"/> + <column name="ASSIGNEDTO" value="44b75a12-ae8b-4003-9347-9952843425a9"/> + <column name="ITEMSORT" valueNumeric="4"/> + <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/> + <column name="ITEMNAME" value="Sonderrabatt"/> + <column name="OPTIONAL" valueNumeric="1"/> + <column name="ITEMPOSITION" value="1.1.1.1"/> + <column name="USER_NEW" value="Admin"/> + <column name="DATE_NEW" valueDate="2018-11-21T14:32:38"/> + </insert> + + <insert tableName="OFFERITEM"> + <column name="OFFERITEMID" value="58ce593c-a1af-41ad-91ee-df7c8a27e142"/> + <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/> + <column name="UNIT" valueNumeric="1"/> + <column name="QUANTITY" valueNumeric="3"/> + <column name="GROUPCODEID" valueNumeric="5"/> + <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/> + <column name="ITEMSORT" valueNumeric="5"/> + <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/> + <column name="ITEMNAME" value="Produktname4.2a"/> + <column name="OPTIONAL" valueNumeric="1"/> + <column name="ITEMPOSITION" value="1.1.2"/> + <column name="USER_NEW" value="Admin"/> + <column name="DATE_NEW" valueDate="2018-11-21T14:32:48"/> + </insert> + + <insert tableName="OFFERITEM"> + <column name="OFFERITEMID" value="50cd83bc-f7ad-46aa-82a2-fca1a506c0ee"/> + <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/> + <column name="UNIT" valueNumeric="1"/> + <column name="QUANTITY" valueNumeric="2"/> + <column name="GROUPCODEID" valueNumeric="5"/> + <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/> + <column name="ITEMSORT" valueNumeric="6"/> + <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/> + <column name="ITEMNAME" value="Produktname1.1"/> + <column name="OPTIONAL" valueNumeric="1"/> + <column name="ITEMPOSITION" value="1.2"/> + <column name="USER_NEW" value="Admin"/> + <column name="DATE_NEW" valueDate="2018-11-21T14:32:51"/> + </insert> + + <insert tableName="OFFERITEM"> + <column name="OFFERITEMID" value="1b70642f-dc5a-4073-b10a-2eeb52f4dbba"/> + <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/> + <column name="UNIT" valueNumeric="1"/> + <column name="QUANTITY" valueNumeric="3"/> + <column name="GROUPCODEID" valueNumeric="5"/> + <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/> + <column name="ITEMSORT" valueNumeric="7"/> + <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/> + <column name="ITEMNAME" value="Produktname1.2"/> + <column name="OPTIONAL" valueNumeric="1"/> + <column name="ITEMPOSITION" value="1.3"/> + <column name="USER_NEW" value="Admin"/> + <column name="DATE_NEW" valueDate="2018-11-21T14:32:55"/> + </insert> + + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/others/db_changes/masterChangelog.xml b/others/db_changes/masterChangelog.xml index f838fc14cc310a81cbedc2e8e4c8f4e86469c95e..824085f9821514ac792e719daef4777c488733fd 100644 --- a/others/db_changes/masterChangelog.xml +++ b/others/db_changes/masterChangelog.xml @@ -63,4 +63,5 @@ <include file="data/example_org/ORG_mass.xml"/> <include file="data/example_salesproject/SALESPROJECT_gfk.xml"/> <include file="data/example_history/example_history_gfk.xml"/> + <include file="data/example_offer/OFFER_1000.xml"/> </databaseChangeLog>