diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 98ed5ca48930d5bc1279c9a6168420fc5e7f0d22..c75d5629ea6f0ef9d2dafecc3698b77b6bc68615 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -35,14 +35,6 @@
<contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>LANGUAGE</name>
- <tableName>OFFER</tableName>
- <columnName>LANGUAGE</columnName>
- <caption>Language</caption>
- <mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
- </entityField>
<entityField>
<name>OFFERCODE</name>
<tableName>OFFER</tableName>
@@ -218,6 +210,15 @@
</entityDependency>
</dependencies>
</entityIncomingField>
+ <entityField>
+ <name>LANGUAGE</name>
+ <tableName>OFFER</tableName>
+ <columnName>LANGUAGE</columnName>
+ <caption>Language</caption>
+ <mandatory v="true" />
+ <outgoingField></outgoingField>
+ <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
</entityFields>
<linkInformation>
<linkInformation>
diff --git a/entity/Offer_entity/entityfields/offercode/onValidation.js b/entity/Offer_entity/entityfields/offercode/onValidation.js
index 8880dadb94fa375b76280c41a8889147bfa88cf2..c2f733568d6821237b66fdd31a38a894370a3d18 100644
--- a/entity/Offer_entity/entityfields/offercode/onValidation.js
+++ b/entity/Offer_entity/entityfields/offercode/onValidation.js
@@ -9,5 +9,5 @@ var OfferUtils = new OfferUtils();
if( vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW
&& !OfferUtils.validateOfferNumber(ProcessHandlingUtil.getOnValidationValue(vars.get("$field.OFFERCODE"))) )
{
- vars.set( "$field.PROJECTCODE", SalesprojectUtils.getNextOfferNumber().toString() );
+ vars.set( "$field.OFFERCODE", SalesprojectUtils.getNextOfferNumber().toString() );
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/relation_id/onValueChange.js b/entity/Offer_entity/entityfields/relation_id/onValueChange.js
index b5114f0629a5559a1d22ca88393dd79967bbd4d5..4c3220606c52acb4eb2ee09d69427060bbd987e8 100644
--- a/entity/Offer_entity/entityfields/relation_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/relation_id/onValueChange.js
@@ -7,5 +7,5 @@ if(relid != "")
{
var relData = db.array(db.ROW, "select LANGUAGE from RELATION where RELATIONID = '" + relid + "'");
- vars.set("$field.LANGUAGE", relData[0]);
+ if(relData[0] != "") vars.set("$field.LANGUAGE", relData[0]);
}
\ No newline at end of file
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 7742c30a61227a250767a0e0c1c567076102c33b..62458b8b8a9d899383163aacb719aff011ead42b 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -4,19 +4,18 @@
<title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainerType>DB</recordContainerType>
- <caption>Contact</caption>
- <captionProcess>%aditoprj%/entity/Pers_entity/captionProcess.js</captionProcess>
<iconId>VAADIN:USERS</iconId>
<imageProcess>%aditoprj%/entity/Pers_entity/imageProcess.js</imageProcess>
+ <titleProcess>%aditoprj%/entity/Pers_entity/titleProcess.js</titleProcess>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/Pers_entity/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Pers_entity/conditionProcess.js</conditionProcess>
<entityFields>
<entityField>
<name>DATEOFBIRTH</name>
+ <title>Date of birth</title>
<tableName>PERS</tableName>
<columnName>DATEOFBIRTH</columnName>
- <caption>Date of birth</caption>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
</entityField>
@@ -39,29 +38,30 @@
</entityField>
<entityField>
<name>FIRSTNAME</name>
+ <title>Firstname</title>
<tableName>PERS</tableName>
<columnName>FIRSTNAME</columnName>
- <caption>Firstname</caption>
+ <caption></caption>
</entityField>
<entityField>
<name>GENDER</name>
+ <title>Gender</title>
<tableName>PERS</tableName>
<columnName>GENDER</columnName>
- <caption>Gender</caption>
<outgoingField>PersGender_dfo</outgoingField>
</entityField>
<entityField>
<name>LASTNAME</name>
+ <title>Lastname</title>
<tableName>PERS</tableName>
<columnName>LASTNAME</columnName>
- <caption>Lastname</caption>
<mandatory v="true" />
</entityField>
<entityField>
<name>MIDDLENAME</name>
+ <title>Middlename</title>
<tableName>PERS</tableName>
<columnName>MIDDLENAME</columnName>
- <caption>Middlename</caption>
</entityField>
<entityField>
<name>PERSID</name>
@@ -71,15 +71,16 @@
</entityField>
<entityField>
<name>SALUTATION</name>
+ <title>Salutation</title>
<tableName>PERS</tableName>
<columnName>SALUTATION</columnName>
- <caption>Salutation</caption>
+ <caption></caption>
</entityField>
<entityField>
<name>TITLE</name>
+ <title>Title</title>
<tableName>PERS</tableName>
<columnName>TITLE</columnName>
- <caption>Title</caption>
</entityField>
<entityField>
<name>TITLESUFFIX</name>
@@ -203,7 +204,6 @@
<name>PersAddress_dfo</name>
<title>Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Addresses</caption>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
@@ -221,7 +221,6 @@
<name>PersComm_dfo</name>
<title>Communication</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Communication</caption>
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
@@ -237,9 +236,9 @@
</entityOutgoingField>
<entityField>
<name>ORGNAME</name>
+ <title>Company</title>
<tableName>ORG</tableName>
<columnName>NAME</columnName>
- <caption>Company</caption>
<linkedContextProcess>%aditoprj%/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<outgoingField>PersOrg_dfo</outgoingField>
@@ -258,8 +257,8 @@
</entityField>
<entityOutgoingField>
<name>OrgAddress_dfo</name>
+ <title>Company Addresses</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Company Addresses</caption>
<dependency>
<name>dependency</name>
<entityName>Address_entity</entityName>
@@ -289,8 +288,8 @@
</entityOutgoingField>
<entityOutgoingField>
<name>PersCommPhone_dfo</name>
+ <title>Communication Phone</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Communication Phone</caption>
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
@@ -311,8 +310,8 @@
</entityOutgoingField>
<entityOutgoingField>
<name>PersCommEmail_dfo</name>
+ <title>Communication E-Mail</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Communication E-Mail</caption>
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
@@ -333,8 +332,8 @@
</entityOutgoingField>
<entityOutgoingField>
<name>PersCommOthers_dfo</name>
+ <title>Communication Other</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Communication Other</caption>
<dependency>
<name>dependency</name>
<entityName>Comm_entity</entityName>
@@ -373,7 +372,6 @@
<name>PersPricelist_dfo</name>
<title>Conditions</title>
<fieldType>DEPENDENCY_OUT</fieldType>
- <caption>Conditions</caption>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js</stateProcess>
<dependency>
@@ -402,15 +400,15 @@
</entityIncomingField>
<entityField>
<name>LANGUAGE</name>
+ <title>Language</title>
<tableName>RELATION</tableName>
<columnName>LANGUAGE</columnName>
- <caption>Language</caption>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Pers_entity/entityfields/language/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityOutgoingField>
<name>PersDocument_dfo</name>
- <title>Dokumente</title>
+ <title>Documents</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/Pers_entity/captionProcess.js b/entity/Pers_entity/titleProcess.js
similarity index 51%
rename from entity/Pers_entity/captionProcess.js
rename to entity/Pers_entity/titleProcess.js
index f99c0aa246ef59013790ba841696338121974d3f..372d4df696fbd5406b278fe4abd70fad37668305 100644
--- a/entity/Pers_entity/captionProcess.js
+++ b/entity/Pers_entity/titleProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.PREVIEWTITLE"))
\ No newline at end of file
+result.string(vars.get("$field.PREVIEWTITLE"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 5cced7e1ea3dcd47672c43077abbc103b00569f5..69912e334bb46a1ee99159fae41eed2fe2e4cef2 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/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index fc6c2ad73511b9fbd4d8510cbf2ccb4c47bdedce..52ce916b3967bd083b6ce3291df7efae957241b0 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -26,7 +26,7 @@
<entityField>OFFERDATE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>ca883d2e-f391-4681-b9f7-72040d4b9669</name>
+ <name>7ab3eb65-b713-4251-9eb1-3119432565f5</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index c9b1bb992940cd5becb6ce76339038340b54a6b9..d50f003cb7bc35534ab0067c4fd0013b2fd48e46 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -29,7 +29,7 @@
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>7a145c84-dc49-4af2-870f-44960dd89d12</name>
+ <name>423cf3fa-49d7-4c48-bd8f-1fc05a14cb1a</name>
<entityField>LANGUAGE</entityField>
</entityFieldLink>
<entityFieldLink>
@@ -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/neonView/PersEdit_view/PersEdit_view.aod b/neonView/PersEdit_view/PersEdit_view.aod
index 20752a8b3b0205ba1be123e694746505b0f07224..8ac4f651867aafa7ae64b103209b863e3ad748d1 100644
--- a/neonView/PersEdit_view/PersEdit_view.aod
+++ b/neonView/PersEdit_view/PersEdit_view.aod
@@ -1,7 +1,7 @@
<?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>PersEdit_view</name>
- <title>Kontakt</title>
+ <title>Contact</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<quickAdd v="true" />
<layout>
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>