diff --git a/.liquibase/Data_alias/basic/2020.2.3/Offer/addColumnOffer.xml b/.liquibase/Data_alias/basic/2020.2.3/Offer/addColumnOffer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1ae38fd53a3e8cd90aa3ae2a373c704004c016f7
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.3/Offer/addColumnOffer.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.garb" id="995a11c7-fb16-4c33-b5ad-0c35f44905c3">
+        <addColumn tableName="OFFER">
+            <column name="DISCOUNT"  type="NUMERIC(14,2)" />
+            <column name="DISCOUNTED_NET"  type="NUMERIC(14,2)" />
+        </addColumn>
+    </changeSet> 
+    <changeSet author="s.garb" id="801708bd-91f0-4468-bed9-0bbab7e46997">
+        <addColumn tableName="OFFER">
+            <column name="DISCOUNTED_VAT"  type="NUMERIC(14,2)" />
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.3/Offer/changelog.xml b/.liquibase/Data_alias/basic/2020.2.3/Offer/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..86ddb71fe50db74127c2f6397e78cfffbacf5740
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.3/Offer/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include file="addColumnOffer.xml" relativeToChangelogFile="true" />
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.2.3/changelog.xml b/.liquibase/Data_alias/basic/2020.2.3/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c2a68fc34547cb7edcb594b4a2e5eccac52948b0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.2.3/changelog.xml
@@ -0,0 +1,5 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <include relativeToChangelogFile="true" file="Offer/changelog.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index faf7b4d858a31a26f2aad2e735685c967f95a989..12d0865aebe1c4bc81cb8563000a34e896ec8998 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -18,6 +18,7 @@
     <include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.2.1/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2020.2.2/changelog.xml"/>
+    <include relativeToChangelogFile="true" file="basic/2020.2.3/changelog.xml"/>
     <include relativeToChangelogFile="true" file="basic/2021.0.0/changelog.xml"/>
 
     <!--enable this only when you definetly want to overwrite the existing data with demo records:-->
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 9cdc11adb5e12a53850bacf05385b1ad5606aace..b876bcf50b17a9d2c7c4de1bd099860f752d5c91 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -3108,6 +3108,48 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>DISCOUNT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISCOUNTED_NET</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DISCOUNTED_VAT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="3" />
+                <size v="14" />
+                <scale v="2" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 12e1b3dbc18300005affb2292a9d4bf03fadb450..1cdffd7223648bab029e0f8bcb9024abe867b04a 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -38,10 +38,6 @@
                 <name>Task</name>
                 <kind v="10077" />
               </entityNode>
-              <entityNode>
-                <name>Favorite</name>
-                <kind v="10077" />
-              </entityNode>
             </childNodes>
           </entityNode>
         </childNodes>
diff --git a/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js b/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js
index 828bf3fc5838fa000ec45ce424e0b3d9e16aeae8..2708ddc1ec8a3c626e049d0956bd4b116ed2c10b 100644
--- a/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js
+++ b/entity/Activity_entity/entityfields/msteamsactions/stateProcess.js
@@ -4,4 +4,4 @@ import("system.result");
 import("MSTeams_lib");
 
 var isTeamsEnabled = vars.get("$param.ObjectId_param") in MSTeamsUtils.getTeamLinkContexts() && MSTeamsUtils.isTeamsEnabled();
-result.string(/*isTeamsEnabled ? neon.COMPONENTSTATE_EDITABLE : */neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
+result.string(isTeamsEnabled ? neon.COMPONENTSTATE_EDITABLE : neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newoffer/onActionProcess.js b/entity/Activity_entity/entityfields/newoffer/onActionProcess.js
index 2973002c2cfac6ea1cf0ff1bc79b0c50aa31d5db..73cd9c4d17edf67a358563f95030f6ce963e1859 100644
--- a/entity/Activity_entity/entityfields/newoffer/onActionProcess.js
+++ b/entity/Activity_entity/entityfields/newoffer/onActionProcess.js
@@ -1,4 +1,21 @@
+import("Sql_lib");
 import("system.vars");
 import("Offer_lib");
 
-OfferUtils.createNewOffer(null, null, null, vars.get("$field.ACTIVITYID"));
\ No newline at end of file
+var activityId = vars.get("$field.ACTIVITYID");
+var activityLinks = newSelect("ACTIVITYLINK.OBJECT_TYPE, ACTIVITYLINK.OBJECT_ROWID")
+                                .from("ACTIVITYLINK")
+                                .where("ACTIVITYLINK.ACTIVITY_ID", activityId)
+                                .and("ACTIVITYLINK.OBJECT_TYPE", ["Person", "Organisation", "Salesproject"], SqlBuilder.IN())
+                                .table();
+
+//make a map from the 2d-array to easily access the ids by objectType
+var linkMap = new Map(activityLinks);
+
+//if we only have one Person: that person is the contact.
+//otherwise: we check for organisations: if we only have one then we use that one.
+//same logic for salesprojects: if we have only one: use that one
+var contactId = linkMap.get("Person") || linkMap.get("Organisation");
+var salesprojectId = linkMap.get("Salesproject");
+
+OfferUtils.createNewOffer("Salesproject", salesprojectId, contactId, activityId);
\ No newline at end of file
diff --git a/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js b/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js
index 9a5657456f3a131ca47d303d21a17b46ada862d1..f782309d32349f8320ada9dd3aa91588f3069e4e 100644
--- a/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/imminent_appointments/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.tools");
 import("system.SQLTYPES");
 import("system.db");
 import("system.datetime");
@@ -8,45 +9,49 @@ import("Sql_lib");
 import("system.calendars");
 import("Calendar_lib");
 
-var pFilter =  CalendarUtil.reset_filterEvent();
-var conditions = [];
-var conditioncount = 0;
-var user = undefined;
-var stati = [];
-var entries = [];
+var calendarId = tools.getCurrentUser()[tools.PARAMS][tools.CALENDARID];
+if(calendarId != "" && calendarId != null && calendarId != undefined)
+{
+    var pFilter =  CalendarUtil.reset_filterEvent();
+    var conditions = [];
+    var conditioncount = 0;
+    var user = undefined;
+    var stati = [];
+    var entries = [];
 
-var startnumber = Number(vars.get("$sys.date"));
-var endnumber = startnumber + 43200000 ;
+    var startnumber = Number(vars.get("$sys.date"));
+    var endnumber = startnumber + 43200000 ;
 
-var start = startnumber + "";
-var end = endnumber + "";
+    var start = startnumber + "";
+    var end = endnumber + "";
 
-if ( pFilter.tentative == "true" )    
-    stati.push(calendars.STATUS_TENTATIVE);
+    if ( pFilter.tentative == "true" )    
+        stati.push(calendars.STATUS_TENTATIVE);
 
-if ( pFilter.cancelled == "true" )    
-    stati.push(calendars.STATUS_CANCELLED);
+    if ( pFilter.cancelled == "true" )    
+        stati.push(calendars.STATUS_CANCELLED);
 
-if ( pFilter.confirmed == "true" )
-    stati.push(CalendarUtil.mapCalendarStatus(calendars.STATUS_CONFIRMED, calendars.getBackendType() ));
+    if ( pFilter.confirmed == "true" )
+        stati.push(CalendarUtil.mapCalendarStatus(calendars.STATUS_CONFIRMED, calendars.getBackendType() ));
 
-if (CalendarUtil.getCalendarSystemType(calendars.VEVENT) == calendars.BACKEND_EXCHANGEWS && pFilter.free == "true")
-    stati.push(calendars.STATUS_FREE);
+    if (CalendarUtil.getCalendarSystemType(calendars.VEVENT) == calendars.BACKEND_EXCHANGEWS && pFilter.free == "true")
+        stati.push(calendars.STATUS_FREE);
 
-if ( pFilter.user != "" )	
-    user = (pFilter.user).trim();
+    if ( pFilter.user != "" )	
+        user = (pFilter.user).trim();
 
-for ( var z = 0; z < stati.length; z++ )
-    CalendarUtil.addEntryCondition(conditions, ++conditioncount,
-    {
-        TYPE: calendars.VEVENT,
-        START: start,
-        END: end,
-        USER: user,
-        STATUS: stati[z]
-    });
+    for ( var z = 0; z < stati.length; z++ )
+        CalendarUtil.addEntryCondition(conditions, ++conditioncount,
+        {
+            TYPE: calendars.VEVENT,
+            START: start,
+            END: end,
+            USER: user,
+            STATUS: stati[z]
+        });
 
-conditions["COUNT"] = String(conditioncount);
-entries = calendars.getEntries(conditions);
+    conditions["COUNT"] = String(conditioncount);
+    entries = calendars.getEntries(conditions);
 
-result.string(entries.length);
+    result.string(entries.length);
+}
\ No newline at end of file
diff --git a/entity/Document_entity/entityfields/msteam/children/synchronizedocuments/onActionProcess.js b/entity/Document_entity/entityfields/msteam/children/synchronizedocuments/onActionProcess.js
index 841ff10b1844fa44c81a817f99987d1ff2f42db7..aef50aebaf302304a699c6713ceeec227d70350b 100644
--- a/entity/Document_entity/entityfields/msteam/children/synchronizedocuments/onActionProcess.js
+++ b/entity/Document_entity/entityfields/msteam/children/synchronizedocuments/onActionProcess.js
@@ -1,7 +1,7 @@
 import("system.neon");
 import("system.vars");
 
-neon.openContext("MSTTeamsDocument", "MSTeamsDocumentEdit_view", null, neon.OPERATINGSTATE_VIEW, {
+neon.openContext("MSTeamsDocument", "MSTeamsDocumentEdit_view", null, neon.OPERATINGSTATE_VIEW, {
     "MSTTeamId_param" : vars.get("$param.MSTTeamId_param"),
     "ObjectRowId_param" : vars.get("$param.AssignmentRowId_param"),
     "AssignmentName_param" : vars.get("$param.AssignmentName_param"),
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index 63ec8c14576769c9f89e4cedc7152fb2fc92b02c..e8f4ac96e66e694bab194186688c63f7c8bfa300 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
@@ -6,6 +6,7 @@
   <siblings>
     <element>Address_entity</element>
   </siblings>
+  <onValidation>%aditoprj%/entity/LetterRecipient_entity/onValidation.js</onValidation>
   <titlePlural>Recipients</titlePlural>
   <recordContainer>db</recordContainer>
   <entityFields>
diff --git a/entity/LetterRecipient_entity/onValidation.js b/entity/LetterRecipient_entity/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..b165c8bd18fd2983e52e191b2ec9e71b404cbb7f
--- /dev/null
+++ b/entity/LetterRecipient_entity/onValidation.js
@@ -0,0 +1,16 @@
+import("system.translate");
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+
+var contactId = vars.get("$field.CONTACT_ID");
+
+var standardAddress = newSelect("CONTACT.ADDRESS_ID")
+                                .from("CONTACT")
+                                .where("CONTACT.CONTACTID", contactId)
+                                .cell();
+
+if(!standardAddress)
+{
+    result.string(translate.text("The selected Contact doesn't have an address set."));
+}
\ No newline at end of file
diff --git a/entity/MSTTeamMember_entity/entityfields/invite/valueProcess.js b/entity/MSTTeamMember_entity/entityfields/invite/valueProcess.js
index ed9e6312969780d3a2d8a791bf78c23bbb453f1e..516e09d60f21ed6d91e8f27b41593afec8f686ff 100644
--- a/entity/MSTTeamMember_entity/entityfields/invite/valueProcess.js
+++ b/entity/MSTTeamMember_entity/entityfields/invite/valueProcess.js
@@ -1,5 +1,6 @@
+import("system.neon");
 import("system.vars");
 import("system.result");
 
-if (vars.get("$this.value") == null)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     result.string(false);
\ No newline at end of file
diff --git a/entity/MSTTeamMember_entity/entityfields/role/valueProcess.js b/entity/MSTTeamMember_entity/entityfields/role/valueProcess.js
index 4abbf36fdb805dcfb19158974e995e0f61b1a7ad..d79978a6cbc07884ec953adb3be3de3d78997b78 100644
--- a/entity/MSTTeamMember_entity/entityfields/role/valueProcess.js
+++ b/entity/MSTTeamMember_entity/entityfields/role/valueProcess.js
@@ -1,5 +1,6 @@
+import("system.neon");
 import("system.vars");
 import("system.result");
 
-if (vars.get("$this.value") == null)
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
     result.string("member");
\ No newline at end of file
diff --git a/entity/MSTTeam_entity/entityfields/teammembers/onValidation.js b/entity/MSTTeam_entity/entityfields/teammembers/onValidation.js
index 0629031e507398d3f502728590e967582d74fc50..ab18aabd0ba1fb0f4c2d93a91aa191b29ba2c352 100644
--- a/entity/MSTTeam_entity/entityfields/teammembers/onValidation.js
+++ b/entity/MSTTeam_entity/entityfields/teammembers/onValidation.js
@@ -1,8 +1,20 @@
+import("system.vars");
+import("system.entities");
 import("Entity_lib");
 import("system.result");
 import("system.translate");
 
-var members = EntityConsumerRowsHelper.getCurrentConsumerRows("TeamMembers", ["ROLE"]);
+//this is a workaround, EntityConsumerRowsHelper.getCurrentConsumerRows should be used here
+var loadRowsConfig = entities.createConfigForLoadingRows()
+    .entity("MSTTeamMember_entity")
+    .provider("MembersOfTeam")
+    .fields(["#UID", "ROLE"])
+    .addParameter("MSTTeamId_param", vars.get("$field.UID"));
+var savedRows = entities.getRows(loadRowsConfig);
+var members = new EntityConsumerRowsHelper(savedRows)
+    .consumer("TeamMembers")
+    .applyConsumerRowChanges()
+    .getRows();
 var hasOwner = members.some(function (member)
 {
     return member["ROLE"] == "owner";
diff --git a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
index 2f279cf23fb22d886b2a3a7bce9c60edcf83206c..17cde5886a40df0410dcd5b3c9ea721f13d32cf1 100644
--- a/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
+++ b/entity/MSTeamsActivityImport_entity/MSTeamsActivityImport_entity.aod
@@ -78,9 +78,11 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
-    <entityActionField>
-      <name>importMessages</name>
-    </entityActionField>
+    <entityField>
+      <name>TeamMessages</name>
+      <consumer>Messages</consumer>
+      <selectionMode>MULTI</selectionMode>
+    </entityField>
   </entityFields>
   <recordContainers>
     <datalessRecordContainer>
diff --git a/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod b/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
index 7b63c5f0e10641d17d6bc056c6f771d217cc1e7d..282dfbc5ff907b3da341b62f9a5079a3628c3645 100644
--- a/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
+++ b/entity/MSTeamsDocument_entity/MSTeamsDocument_entity.aod
@@ -63,6 +63,7 @@
     </entityProvider>
     <entityActionField>
       <name>importDocuments</name>
+      <title>Import Documents</title>
       <onActionProcess>%aditoprj%/entity/MSTeamsDocument_entity/entityfields/importdocuments/onActionProcess.js</onActionProcess>
     </entityActionField>
   </entityFields>
diff --git a/entity/MSTeamsDocument_entity/entityfields/importdocuments/onActionProcess.js b/entity/MSTeamsDocument_entity/entityfields/importdocuments/onActionProcess.js
index 7237c6c01de74d5355cde59d84173d56989b55b0..23dcd6873c5979acde3412cd24bc618244881c17 100644
--- a/entity/MSTeamsDocument_entity/entityfields/importdocuments/onActionProcess.js
+++ b/entity/MSTeamsDocument_entity/entityfields/importdocuments/onActionProcess.js
@@ -1,14 +1,11 @@
 import("system.text");
-import("system.teams");
 import("system.vars");
 import("system.db");
-import("system.util")
+import("system.util");
 import("Sql_lib");
-import("system.net")
-import("system.logging");
+import("system.net");
 import("system.neon");
 
-var rowData = vars.get("$local.rowdata");
 var documents = text.decodeMS(vars.get("$field.DOCUMENTS"));
 
 documents.forEach(function (document)
@@ -25,3 +22,5 @@ documents.forEach(function (document)
         file, documentName, "", "", alias, util.getNewUUID());    
 });
 
+neon.closeImage(vars.get("$sys.currentimage"), true);
+neon.refreshAll();
\ No newline at end of file
diff --git a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
index 437ba4f01752bc9a118f40f47ce80f9fdb5b7e3c..8100af9bbee696961ab43850b8e49906237b4f00 100644
--- a/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
+++ b/entity/MSTeamsMessage_entity/MSTeamsMessage_entity.aod
@@ -57,6 +57,20 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityActionField>
+      <name>importMessages</name>
+      <title>Import</title>
+      <onActionProcess>%aditoprj%/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>loadNext</name>
+      <title>Next</title>
+      <onActionProcess>%aditoprj%/entity/MSTeamsMessage_entity/entityfields/loadnext/onActionProcess.js</onActionProcess>
+    </entityActionField>
+    <entityActionField>
+      <name>loadPrevious</name>
+      <title>Prev</title>
+    </entityActionField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
diff --git a/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js b/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b5a94d660b9cbd5ef4a49457965ad8bd4767f0e
--- /dev/null
+++ b/entity/MSTeamsMessage_entity/entityfields/importmessages/onActionProcess.js
@@ -0,0 +1,23 @@
+import("Sql_lib");
+import("system.datetime");
+import("system.neon");
+import("Util_lib");
+import("system.vars");
+
+var messages = vars.get("$sys.selection");
+var description = messages.map(function (id)
+{
+    var [user, date, message] = JSON.parse(id);
+    date = Date.parse(date).valueOf();
+    return "[" + datetime.toDate(date, "dd.MM.yyyy HH:mm") + "] " + user + "<br>" + message + "<br>";
+}).join("<br>");
+
+var links = newSelect(["OBJECT_TYPE", "OBJECT_ROWID"])
+    .from("MST_TEAMLINK")
+    .where("MST_TEAMLINK.MST_TEAM_ID", vars.get("$param.TeamId_param"))
+    .table();
+
+neon.openContext("Activity", "ActivityEdit_view", null, neon.OPERATINGSTATE_NEW, {
+    "Info_param": description,
+    "PresetLinks_param": JSON.stringify(links)
+});
\ No newline at end of file
diff --git a/entity/MSTeamsMessage_entity/entityfields/loadnext/onActionProcess.js b/entity/MSTeamsMessage_entity/entityfields/loadnext/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/MSTeamsMessage_entity/recordcontainers/jdito/contentProcess.js b/entity/MSTeamsMessage_entity/recordcontainers/jdito/contentProcess.js
index d8c0bad8a65f7fb8ad38753f002d20f1eb5f505a..0007cf9a2d5994cbbf002e496d12620d49ee358c 100644
--- a/entity/MSTeamsMessage_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/MSTeamsMessage_entity/recordcontainers/jdito/contentProcess.js
@@ -31,7 +31,7 @@ else if (vars.get("$param.TeamId_param") && vars.get("$param.Channel_param"))
 messages = messages.map(function (message)
 {
     return [
-        util.getNewUUID(), 
+        JSON.stringify([message.author.userName, message.createdDateTime, message.message.message]), 
         message.author.userName, 
         message.message.message, 
         Date.parse(message.createdDateTime).toString()
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 5349b4d8fd4c116790e08f7527679c5de5f74b5f..16bc1d967bbb1e7d6dea78d43d65f8985b06327a 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -98,6 +98,7 @@
       <contentType>NUMBER</contentType>
       <inputFormat>#,##0.00</inputFormat>
       <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/stateProcess.js</stateProcess>
       <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -145,6 +146,10 @@
           <name>Language_param</name>
           <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/language_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>Discount_param</name>
+          <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/discount_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
       <dependency>
         <name>dependency</name>
@@ -164,7 +169,7 @@
       <contentType>NUMBER</contentType>
       <outputFormat>#,##0.00</outputFormat>
       <inputFormat>#,##0.00</inputFormat>
-      <groupable v="true" />
+      <groupable v="false" />
       <state>READONLY</state>
       <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
     </entityField>
@@ -1056,6 +1061,45 @@
     <entityField>
       <name>ACTIVE</name>
     </entityField>
+    <entityField>
+      <name>DISCOUNT</name>
+      <title>Discount</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>0.00'%'</outputFormat>
+      <inputFormat>0.00</inputFormat>
+      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/discount/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/discount/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
+      <onValidation>%aditoprj%/entity/Offer_entity/entityfields/discount/onValidation.js</onValidation>
+    </entityField>
+    <entityField>
+      <name>DISCOUNTED_NET</name>
+      <title>discounted Price</title>
+      <contentType>NUMBER</contentType>
+      <outputFormat>#,##0.00</outputFormat>
+      <inputFormat>#,##0.00</inputFormat>
+      <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js</displayValueProcess>
+    </entityField>
+    <entityParameter>
+      <name>Discount_param</name>
+      <expose v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityField>
+      <name>DiscountChanged</name>
+    </entityField>
+    <entityField>
+      <name>DISCOUNTED_VAT</name>
+      <title>discounted Vat</title>
+      <contentType>NUMBER</contentType>
+      <inputFormat>#,##0.00</inputFormat>
+      <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_vat/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_vat/displayValueProcess.js</displayValueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -1308,6 +1352,18 @@
           <name>ACTIVE.value</name>
           <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/active.value/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISCOUNTED_NET.value</name>
+          <recordfield>OFFER.DISCOUNTED_NET</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISCOUNT.value</name>
+          <recordfield>OFFER.DISCOUNT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DISCOUNTED_VAT.value</name>
+          <recordfield>OFFER.DISCOUNTED_VAT</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
index d610943f3409687827462179063e28df0aa3dde8..1b596584b051bec97da19e07429f38fecb1a9894 100644
--- a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
@@ -1,8 +1,8 @@
 import("system.vars");
+import("system.neon");
 import("Offer_lib");
 
 var offerId = vars.getString("$field.OFFERID");
-
 var fieldValues = {
     contactId: vars.getString("$field.CONTACT_ID"),
     language: vars.getString("$field.ISOLANGUAGE"),
@@ -12,7 +12,9 @@ var fieldValues = {
     deliveryTerm: vars.getString("$field.DELIVERYTERMS"),
     paymentTerm: vars.getString("$field.PAYMENTTERMS"),
     objectRowId: vars.getString("$field.OBJECT_ROWID"),
-    objectType: vars.getString("$field.OBJECT_TYPE")
+    objectType: vars.getString("$field.OBJECT_TYPE"),
+    discount: vars.getString("$field.DISCOUNT")
+    
 };
 
 OfferUtils.copyOffer(offerId, fieldValues);
diff --git a/entity/Offer_entity/entityfields/discount/onValidation.js b/entity/Offer_entity/entityfields/discount/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..595a5d9aae549242aaa2246e2e4b6e6d602249a0
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discount/onValidation.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+import("Util_lib");
+import("Entity_lib");
+
+var value = vars.get("local.value");
+var validationResult = NumberUtils.validateIsBetweenFloat("Discount", value, 0, 100);
+
+if (validationResult)
+    result.string(validationResult);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discount/onValueChange.js b/entity/Offer_entity/entityfields/discount/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..5fc7651884946ad0f59a3f5c51b5bb93f0505c30
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discount/onValueChange.js
@@ -0,0 +1,5 @@
+import("system.neon");
+import("system.vars");
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon. OPERATINGSTATE_EDIT){
+    neon.setFieldValue("$field.DiscountChanged", "true");
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discount/valueProcess.js b/entity/Offer_entity/entityfields/discount/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa96d16798f8258f091583613760f918dc4a8126
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discount/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+    
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Discount_param")
+    && vars.get("$param.Discount_param")){
+    result.string(vars.get("$param.Discount_param"));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js b/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c7473e812c66616164442674dc87bdd5282dc50d
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$field.DISCOUNTED_NET"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_net/stateProcess.js b/entity/Offer_entity/entityfields/discounted_net/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7443b0c0dcb6c9e38045968ddaa64b5763dfd85e
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_net/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var discount = vars.get("$field.DISCOUNT");
+
+if(parseInt(discount) == parseInt("0") || !discount)
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+else 
+    result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_vat/displayValueProcess.js b/entity/Offer_entity/entityfields/discounted_vat/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..730396f16084a8c954d9cd54640efdd758e8cb52
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_vat/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$field.DISCOUNTED_VAT"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_vat/stateProcess.js b/entity/Offer_entity/entityfields/discounted_vat/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7443b0c0dcb6c9e38045968ddaa64b5763dfd85e
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_vat/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+var discount = vars.get("$field.DISCOUNT");
+
+if(parseInt(discount) == parseInt("0") || !discount)
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+else 
+    result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
index 5a7493c41130f53a5a877ad0823f5783c8c80c02..02f67ef9c37049f446df6879107ff67b6032e91e 100644
--- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
@@ -15,6 +15,7 @@ var params = {
     "OfferHeader_param" : vars.get("$field.HEADER"),
     "OfferFooter_param" : vars.get("$field.FOOTER"),
     "OfferDeliveryTerm_param" : vars.get("$field.DELIVERYTERMS"),
-    "OfferPaymentTerm_param" : vars.get("$field.PAYMENTTERMS")
+    "OfferPaymentTerm_param" : vars.get("$field.PAYMENTTERMS"),
+    "Discount_param": vars.get("$field.DISCOUNT")
 }
 neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js b/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js
index 8074aca46e2680d0b0d19060e41f370b84830fa1..44cc4476bcc740985830e3575cd626e03b526918 100644
--- a/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js
@@ -1,11 +1,11 @@
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Context_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.OBJECT_ROWID") == null) {
-    result.string("");
-} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
-    result.string(ContextUtils.getTitleByContext(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")));
-}
\ No newline at end of file
+//import("system.neon");
+//import("system.vars");
+//import("system.db");
+//import("system.result");
+//import("Context_lib");
+//
+//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.OBJECT_ROWID") == null) {
+//    result.string("");
+//} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+//    result.string(ContextUtils.getTitleByContext(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")));
+//}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offeritems/children/discount_param/valueProcess.js b/entity/Offer_entity/entityfields/offeritems/children/discount_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..67b63c37f044f7d1f4e807d7a863457a78552701
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offeritems/children/discount_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.DISCOUNT"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/totalgross/valueProcess.js b/entity/Offer_entity/entityfields/totalgross/valueProcess.js
index 6e374c8f50a610ed0f50b89319726224167631d0..9d6a6c9330d2fd3eb57fa5f5102e55ad5eb0ef3b 100644
--- a/entity/Offer_entity/entityfields/totalgross/valueProcess.js
+++ b/entity/Offer_entity/entityfields/totalgross/valueProcess.js
@@ -2,7 +2,8 @@ import("system.result");
 import("system.vars");
 import("system.eMath");
 
-var netValue = vars.get("$field.NET");
-var vatValue = vars.get("$field.VAT");
+var discount = vars.get("$field.DISCOUNT");
+var netValue = discount && parseInt(discount) != parseInt("0")  ? vars.get("$field.DISCOUNTED_NET") : vars.get("$field.NET")
+var vatValue =  discount && parseInt(discount) != parseInt("0") ? vars.get("$field.DISCOUNTED_VAT") : vars.get("$field.VAT");
 
 result.string( eMath.addDec(netValue, vatValue) );
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/vat/stateProcess.js b/entity/Offer_entity/entityfields/vat/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..42a2d8e6788a09e0c2c8b410c5e4eadb7bfeb115
--- /dev/null
+++ b/entity/Offer_entity/entityfields/vat/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+var discount = vars.get("$field.DISCOUNT");
+
+if(discount && parseInt(discount) != parseInt("0")){
+    result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
+else 
+    result.string(neon.COMPONENTSTATE_READONLY)
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBInsert.js b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
index da551808a8c82e05a35c7aecf40d283434b2f4c0..c7d3c3336eadfb5bc6b41deaec997081f23c491b 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBInsert.js
@@ -1,17 +1,20 @@
 import("Context_lib");
 import("system.workflow");
 import("Workflow_lib");
+import("system.db");
 import("system.datetime");
+import("system.util");
 import("system.neon");
 import("system.vars");
 import("Offer_lib");
-import("Sql_lib");
 
+var rowdata = vars.get("$local.rowdata");
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     var offerId = vars.get("$local.uid");
-    if (vars.exists("$param.OfferOriginal_Id_param"))
-        OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), offerId);
+    var discount = rowdata["OFFER.DISCOUNT"];
+    if (vars.exists("$param.OfferOriginal_Id_param") && vars.get("$param.OfferOriginal_Id_param"))
+        OfferUtils.copyOfferItems(vars.getString("$param.OfferOriginal_Id_param"), offerId, discount);
     
     var activityId = vars.get("$param.ActivityId_param");
     if (activityId)
diff --git a/entity/Offer_entity/recordcontainers/db/onDBUpdate.js b/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
index 2e53f3cad9a9edf21cc5bbc6fdecc00c5001dfee..866c488632bc1e0629e2bfd4b4681a8f3baad6a5 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
@@ -1,3 +1,38 @@
+import("system.entities");
+import("Offer_lib");
+import("system.vars");
 import("Workflow_lib");
 
+var rowdata = vars.get("$local.rowdata");
+var oid = rowdata["OFFER.OFFERID"];
+if(vars.get("$field.DiscountChanged") == "true" && oid){
+    var discount = rowdata["OFFER.DISCOUNT"];
+    var oiUtils = new OfferItemUtils(oid);  
+    
+    var vals = oiUtils.getNetAndVat();
+    var discountedVals = OfferItemUtils.getDiscountedNet(null, oid, discount);
+    
+    let config = entities.createConfigForUpdatingRows();
+    config.entity("Offer_entity");
+    if(discountedVals){
+        config.fieldValues({
+            "NET": vals[0],
+            "VAT": vals[1],
+            "DISCOUNTED_NET": discountedVals[0],
+            "DISCOUNTED_VAT": discountedVals[1]
+        });
+    }
+    else 
+    {
+        config.fieldValues({
+            "NET": vals[0],
+            "VAT": vals[1]
+        });
+    }
+
+    config.uid(oid);
+    entities.updateRow(config);
+
+}
+
 WorkflowSignalSender.updated();
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 281231dc1f88650ef4b04dd1f128b7d1438a4e60..75863bb226da7a67d62d2b265bfb791c382af773 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -248,6 +248,10 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityParameter>
+      <name>Discount_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js b/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
index 88f823f4fb90b6fcbd3e10b059a1bbf3df190dc0..283d1cb7a7cdb0568b117c1f8001fe4f7a2ef796 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
@@ -1,3 +1,4 @@
+import("system.entities");
 import("system.neon");
 import("system.vars");
 import("system.db");
@@ -8,6 +9,7 @@ var oid = vars.get("$field.OFFER_ID");
 if(oid != "")
 {
     var oiid = vars.get("$field.OFFERITEMID");
+    var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
     var oiUtils = new OfferItemUtils(oid);
     var deletedIds = oiUtils.deletePartsList(oiid);
     oiUtils.reOrgItems();
@@ -15,8 +17,27 @@ if(oid != "")
     deletedIds.push(oiid);
     var cols = ["NET", "VAT"];
     
-    var vals = oiUtils.getNetAndVat(deletedIds);
+    var vals = oiUtils.getNetAndVat(deletedIds);    
+    var discountedVals = OfferItemUtils.getDiscountedNet(deletedIds, oid, discount);
     
-    newWhere("OFFER.OFFERID", oid)
-        .updateData(true, "OFFER", cols, null, vals)
+    let config = entities.createConfigForUpdatingRows()
+    config.entity("Offer_entity");
+    
+    if(discountedVals){
+        config.fieldValues({
+            "NET": vals[0],
+            "VAT": vals[1],
+            "DISCOUNTED_NET": discountedVals[0],
+            "DISCOUNTED_VAT": discountedVals[1]
+        });
+    }
+    else{
+        config.fieldValues({
+            "NET": vals[0],
+            "VAT": vals[1]
+        });
+    }
+    config.uid(oid);
+    entities.updateRow(config);
+
 }
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
index 473b49850845193bb86ddee243f668ae206617e4..f7e305e7c5ecac3ab334df84828152e91e3e9d30 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,4 @@
+import("system.entities");
 import("system.datetime");
 import("system.neon");
 import("system.vars");
@@ -14,14 +15,34 @@ if(oid != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
     var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
+    var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
     var oiUtils = new OfferItemUtils(rowdata["OFFERITEM.OFFER_ID"]);    
     oiUtils.insertPartsList(rowdata["OFFERITEM.PRODUCT_ID"], vars.get("$local.uid"), curr, contactid, vars.get("$param.Language_param"));
     oiUtils.reOrgItems();
     
     //update offer price
     var vals = oiUtils.getNetAndVat();
-    var cols = ["NET", "VAT"];
+    var discountedVals = OfferItemUtils.getDiscountedNet(null, oid,  discount);
+    
+    let config = entities.createConfigForUpdatingRows()
+    config.entity("Offer_entity");
+
+    if(discountedVals){
+        config.fieldValues({
+            "NET": vals[0],
+            "VAT": vals[1],
+            "DISCOUNTED_NET": discountedVals[0],
+            "DISCOUNTED_VAT": discountedVals[1]
+        });
+    }
+    else{
+        config.fieldValues({
+            "NET": vals[0],
+            "VAT": vals[1]
+        });
+
+    }
+    config.uid(oid);
+    entities.updateRow(config);
 
-    newWhere("OFFER.OFFERID", oid)
-        .updateData(true, "OFFER", cols, null, vals);    
 }
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
index a1e94cd51186a9e57ee45df344263e3cc26d79b9..a004c7c8b6e4ca57eb19c52f75ef55dafded35b8 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
@@ -1,3 +1,4 @@
+import("system.entities");
 import("system.vars");
 import("system.db");
 import("system.neon");
@@ -7,9 +8,30 @@ import("Sql_lib");
 var oid = vars.get("$field.OFFER_ID");
 if(oid != "")
 {
+    var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
     var cols = ["NET", "VAT"];    
     var oiUtils = new OfferItemUtils(oid);
+    var vals = oiUtils.getNetAndVat();
+    var discountedVals = OfferItemUtils.getDiscountedNet(null, oid, discount);
     
-    newWhere("OFFER.OFFERID", oid)
-        .updateData(true, "OFFER", cols, null, oiUtils.getNetAndVat());    
+    let config = entities.createConfigForUpdatingRows()
+    config.entity("Offer_entity");
+    
+    if(discountedVals){
+        config.fieldValues({
+            "NET": vals[0],
+            "VAT": vals[1],
+            "DISCOUNTED_NET": discountedVals[0],
+            "DISCOUNTED_VAT": discountedVals[1]
+        });
+    }
+    else{
+        config.fieldValues({
+            "NET": vals[0],
+            "VAT": vals[1]
+        });
+    }
+    config.uid(oid);
+    entities.updateRow(config);
+ 
 }
\ No newline at end of file
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 450947f98bbbefc62bd1030146a36b8eb353734a..1cff5303d35856f42af96b2896a48af5c973465a 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -61,6 +61,12 @@
         <entityName>PermissionOverview_entity</entityName>
         <fieldName>PermissionOverviews</fieldName>
       </dependency>
+      <children>
+        <entityParameter>
+          <name>EntityId_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
     </entityConsumer>
     <entityConsumer>
       <name>PermissionDetails</name>
@@ -76,6 +82,12 @@
         <entityName>PermissionDetail_entity</entityName>
         <fieldName>Permissions</fieldName>
       </dependency>
+      <children>
+        <entityParameter>
+          <name>EntityId_param</name>
+          <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
     </entityConsumer>
     <entityParameter>
       <name>EntityName_param</name>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index ccb951171b001f5b1ed08cf8daa5368ae64d7990..c75998fdf577e9a4540d7860f1afb9d59fd3e9aa 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -7,6 +7,7 @@
   <title>Contact</title>
   <siblings>
     <element>Address_entity</element>
+    <element>Contact_entity</element>
   </siblings>
   <grantDeleteProcess>%aditoprj%/entity/Person_entity/grantDeleteProcess.js</grantDeleteProcess>
   <contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
@@ -1415,6 +1416,12 @@
         <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
+    <entityActionField>
+      <name>deleteFunction</name>
+      <title>Delete this Function</title>
+      <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/deletefunction/onActionProcess.js</onActionProcess>
+      <stateProcess>%aditoprj%/entity/Person_entity/entityfields/deletefunction/stateProcess.js</stateProcess>
+    </entityActionField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/deletefunction/onActionProcess.js b/entity/Person_entity/entityfields/deletefunction/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..083e2d8b0d3d0649e0984e06b3947a6ae709fd3e
--- /dev/null
+++ b/entity/Person_entity/entityfields/deletefunction/onActionProcess.js
@@ -0,0 +1,40 @@
+import("system.entities");
+import("system.neon");
+import("Workflow_lib");
+import("Context_lib");
+import("DuplicateScanner_lib");
+import("Sql_lib");
+import("system.vars");
+
+var personId = vars.get("$field.PERSONID");
+
+var contactIds = newSelect("count(CONTACT.CONTACTID)")
+                            .from("CONTACT")
+                            .join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
+                            .where("PERSON.PERSONID", personId)
+                            .cell();
+if(contactIds > 1)
+{
+    var contactId = vars.get("$field.CONTACTID");
+
+    var config = entities.createConfigForDeletingRows().entity("Contact_entity").uid(contactId);
+    
+    entities.deleteRow(config);
+    
+    DuplicateScannerUtils.deleteCachedDuplicate(contactId);
+
+    new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
+        .deleteAllAttributes();
+
+    newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
+    newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
+    newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
+    newWhere("AB_APPOINTMENTLINK.OBJECT_TYPE", "Person")
+    .and("AB_APPOINTMENTLINK.OBJECT_ROWID", contactId).deleteData();
+    newWhere("AB_ATTRIBUTERELATION.OBJECT_TYPE", "Person")
+    .and("AB_ATTRIBUTERELATION.OBJECT_ROWID", contactId).deleteData();
+
+    WorkflowSignalSender.deleted();
+    
+    neon.closeImage(vars.get("$sys.currentimage"), true); //ToDo: #1070797 This should probably not be necessary 
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/deletefunction/stateProcess.js b/entity/Person_entity/entityfields/deletefunction/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1b946d06bd61d13e75b51286466d8fbcd8d9f41
--- /dev/null
+++ b/entity/Person_entity/entityfields/deletefunction/stateProcess.js
@@ -0,0 +1,20 @@
+import("system.result");
+import("system.neon");
+import("Sql_lib");
+import("system.vars");
+
+var res = neon.COMPONENTSTATE_DISABLED;
+
+var personId = vars.get("$field.PERSONID");
+
+var contactIds = newSelect("count(CONTACT.CONTACTID)")
+                            .from("CONTACT")
+                            .join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
+                            .where("PERSON.PERSONID", personId)
+                            .cell();
+if(contactIds > 1)
+{
+    res = neon.COMPONENTSTATE_EDITABLE;
+}
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
index aa0f51c76fd12f0f2b68af5357d04ea7f1303952..d356c25a42ac666f57272596da429d9afa741fd1 100644
--- a/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/QuickEntry_entity/recordcontainers/jdito/onInsert.js
@@ -25,7 +25,7 @@ if (rowdata["ORGANISATION_NAME.value"])
         "USER_NEW_CONTACT": userNew,
         "DATE_NEW_CONTACT" : dateNew,
         "STATUS" : $KeywordRegistry.contactStatus$active(),
-        "ISOLANGUAGE" : rowdata["ISOLANGUAGE.value"]
+        "LANGUAGE" : rowdata["ISOLANGUAGE.value"]
     });
     
     entities.createRow(configOrg);
@@ -55,7 +55,7 @@ if (rowdata["LASTNAME.value"])
         "CONTACTID": rowdata["PERSON_CONTACT_ID.value"],
         "ORGANISATION_ID": organisationId,
         "STATUS" : $KeywordRegistry.contactStatus$active(),
-        "ISOLANGUAGE": rowdata["ISOLANGUAGE.value"]
+        "LANGUAGE": rowdata["ISOLANGUAGE.value"]
     });
     
     entities.createRow(configPer);
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index 06fb910e261a4ad197c5fe4b9bb51a8b77ee4757..b2d23b5d87cd6cc41b29d3cbee11c913218217c3 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -47,6 +47,12 @@
           <valueProcess>%aditoprj%/entity/Role_entity/entityfields/theirpermissions/children/roletitle_param/valueProcess.js</valueProcess>
         </entityParameter>
       </children>
+      <children>
+        <entityParameter>
+          <name>RoleTitle_param</name>
+          <valueProcess>%aditoprj%/entity/Role_entity/entityfields/theirpermissions/children/roletitle_param/valueProcess.js</valueProcess>
+        </entityParameter>
+      </children>
       <dependency>
         <name>dependency</name>
         <entityName>PermissionDetail_entity</entityName>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index e8fdf521f05f9bdebadd7bf0a3293ce9a4e69b4f..f8244417375d52b33172fa04a97c8b3fa70c7e4a 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7602,6 +7602,9 @@
     <entry>
       <key>The team must have at least one owner</key>
     </entry>
+    <entry>
+      <key>Delete this Function</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 bb4cf37d6632a381e8791728876b255ddce73713..4517c6f7aac0b43c7fcb82c9714283bbab20b136 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,10 @@
       <key>The max participants count can not be equal or less then 0</key>
       <value>Die maximale Teilnehmerzahl muss größer 0 sein!</value>
     </entry>
+    <entry>
+      <key>discounted Vat</key>
+      <value>Rbt. Mehrwertssteuer</value>
+    </entry>
     <entry>
       <key>Illegal Parent Operator in buildFilterObj-Function:</key>
       <value>Übergebener Operator ungültig in Funktion "buildFilterObj"</value>
@@ -38,6 +42,10 @@
       <key>Private</key>
       <value>Privat</value>
     </entry>
+    <entry>
+      <key>discounted Price</key>
+      <value>Rbt. Betrag netto</value>
+    </entry>
     <entry>
       <key>Add app</key>
       <value>App hinzufügen</value>
@@ -202,6 +210,10 @@
       <key>Sender address</key>
       <value>Senderadresse</value>
     </entry>
+    <entry>
+      <key>The selected Contact doesn't have an address set.</key>
+      <value>Der ausgewählte Kontakt hat keine Adresse festgelegt.</value>
+    </entry>
     <entry>
       <key>Complete tasks</key>
       <value>Aufgaben abschließen</value>
@@ -2847,6 +2859,10 @@
       <key>Guam</key>
       <value>Guam</value>
     </entry>
+    <entry>
+      <key>Subtotal</key>
+      <value>Zwischensumme</value>
+    </entry>
     <entry>
       <key>Lesotho</key>
       <value>Lesotho</value>
@@ -4459,6 +4475,10 @@
       <key>Salesproject milestone Id</key>
       <value>VertriebsprojektsmeilensteinId</value>
     </entry>
+    <entry>
+      <key>without Vat</key>
+      <value>ohne UmSt.</value>
+    </entry>
     <entry>
       <key>Appointment Id</key>
       <value>Termin Id</value>
@@ -8381,7 +8401,6 @@ Bitte Datumseingabe prüfen</value>
     </entry>
     <entry>
       <key>Subcategory</key>
-      <value>Unterkategorie</value>
     </entry>
     <entry>
       <key>The radius has to be at least %0.</key>
@@ -8655,6 +8674,10 @@ Bitte Datumseingabe prüfen</value>
       <key>My Calendar</key>
       <value>Mein Kalender</value>
     </entry>
+    <entry>
+      <key>Invoice Discount</key>
+      <value>Rechnungsrabatt</value>
+    </entry>
     <entry>
       <key>Variable</key>
       <value>Variable</value>
@@ -9542,6 +9565,10 @@ Bitte Datumseingabe prüfen</value>
       <key>Date (Month)</key>
       <value>Datum (Monat)</value>
     </entry>
+    <entry>
+      <key>Delete this Function</key>
+      <value>Diese Funktion löschen</value>
+    </entry>
     <entry>
       <key>Date (Year)</key>
       <value>Datum (Jahr)</value>
@@ -9864,6 +9891,10 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>Messages</key>
     </entry>
+    <entry>
+      <key>incl. Vat</key>
+      <value>inkl. UmSt.</value>
+    </entry>
     <entry>
       <key>Channel Name</key>
     </entry>
@@ -10000,9 +10031,6 @@ Bitte Datumseingabe prüfen</value>
     <entry>
       <key>My campaigns</key>
     </entry>
-    <entry>
-      <key>Subcategory</key>
-    </entry>
     <entry>
       <key>Campaign costs</key>
     </entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 2dcbf2caefc5d11bd0cbbd1ab56795dde1ca096c..d8e9e46f3e99c126021f115bfa10d20a926e53be 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7683,6 +7683,9 @@
     <entry>
       <key>The team must have at least one owner</key>
     </entry>
+    <entry>
+      <key>Delete this Function</key>
+    </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />
 </language>
diff --git a/neonContext/MSTeamsMessage/MSTeamsMessage.aod b/neonContext/MSTeamsMessage/MSTeamsMessage.aod
index ecf21a7e76897a9415073d8108020d36522d2d4d..3e2fdddb1fd203df7b6ab0bc1243e94fd3ab92d2 100644
--- a/neonContext/MSTeamsMessage/MSTeamsMessage.aod
+++ b/neonContext/MSTeamsMessage/MSTeamsMessage.aod
@@ -3,6 +3,7 @@
   <name>MSTeamsMessage</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterView>MSTeamsMessageFilter_view</filterView>
+  <lookupView>MSTeamsMessageFilter_view</lookupView>
   <entity>MSTeamsMessage_entity</entity>
   <references>
     <neonViewReference>
diff --git a/neonView/MSTeamsActivityImportEdit_view/MSTeamsActivityImportEdit_view.aod b/neonView/MSTeamsActivityImportEdit_view/MSTeamsActivityImportEdit_view.aod
index c089822821e52c011004d916fe196c0d3f2b61f0..d6c1e6544c896792136357debd14151298eafd88 100644
--- a/neonView/MSTeamsActivityImportEdit_view/MSTeamsActivityImportEdit_view.aod
+++ b/neonView/MSTeamsActivityImportEdit_view/MSTeamsActivityImportEdit_view.aod
@@ -22,16 +22,9 @@
       </fields>
     </genericViewTemplate>
     <neonViewReference>
-      <name>e486a1bb-5deb-432a-aa28-c3872f0f88fc</name>
+      <name>59b3d882-d067-43eb-b19b-f52758c9d10b</name>
       <entityField>Messages</entityField>
       <view>MSTeamsMessageFilter_view</view>
     </neonViewReference>
-    <actionsViewTemplate>
-      <name>Actions</name>
-      <actions>
-        <element>loadNextMessages</element>
-      </actions>
-      <entityField>#ENTITY</entityField>
-    </actionsViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/MSTeamsDocumentEdit_view/MSTeamsDocumentEdit_view.aod b/neonView/MSTeamsDocumentEdit_view/MSTeamsDocumentEdit_view.aod
index 017eb32c7d626d7b970a03ed7ff4ff2e479a56f1..db8af51a511e4733298227797c361f7aecc4ce30 100644
--- a/neonView/MSTeamsDocumentEdit_view/MSTeamsDocumentEdit_view.aod
+++ b/neonView/MSTeamsDocumentEdit_view/MSTeamsDocumentEdit_view.aod
@@ -26,5 +26,11 @@
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
+    <actionsViewTemplate>
+      <name>Actions</name>
+      <actions>
+        <element>importDocuments</element>
+      </actions>
+    </actionsViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/MSTeamsMessageFilter_view/MSTeamsMessageFilter_view.aod b/neonView/MSTeamsMessageFilter_view/MSTeamsMessageFilter_view.aod
index 469ba0bec31d6149eecec43077644d0625eb7ecf..b784c3075e1bcf269521e0cfbe78e7bdf388d519 100644
--- a/neonView/MSTeamsMessageFilter_view/MSTeamsMessageFilter_view.aod
+++ b/neonView/MSTeamsMessageFilter_view/MSTeamsMessageFilter_view.aod
@@ -27,5 +27,11 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <actionsViewTemplate>
+      <name>ImportAction</name>
+      <actions>
+        <element>importMessages</element>
+      </actions>
+    </actionsViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 3d4de5a7dc5fefa2bd15b025468a6082e10f171d..37b79ebaaa60ed1e412ff2cd67900352df527fa8 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -36,6 +36,10 @@
           <name>768683f3-08c8-4e85-bb4c-7e5c74a8dec0</name>
           <entityField>OFFERDATE</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>35804879-e866-477a-a0e6-9fea1506fc1d</name>
+          <entityField>DISCOUNT</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
           <entityField>CURRENCY</entityField>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 5cff758218dd6ff41acd29eef9b95cb8b4a985bf..8162e949f1273de2af5dfa0a4a204ce6033bfe6e 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -67,10 +67,18 @@
           <name>d7ca2b66-5e7a-4951-a89b-fbeab0f4f798</name>
           <entityField>NET</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>3e9e37e2-6756-41c2-ace7-6ff094dc78c1</name>
+          <entityField>DISCOUNTED_NET</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>c50dec3f-5468-4196-be88-a413ae3947de</name>
           <entityField>VAT</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>5cc461e4-fd0f-47e6-ab06-886a18621c31</name>
+          <entityField>DISCOUNTED_VAT</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>43972a26-67f7-4fb5-9107-111731d326af</name>
           <entityField>TotalGross</entityField>
@@ -99,6 +107,10 @@
           <name>a3a9ee30-bdd2-4907-b215-d4b4adcc0f1d</name>
           <entityField>DELIVERYTERMS</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>b67494ee-f7c1-4002-a550-50ce1eac5020</name>
+          <entityField>DISCOUNT</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
     <neonViewReference>
diff --git a/neonView/RoleChildrenList_view/RoleChildrenList_view.aod b/neonView/RoleChildrenList_view/RoleChildrenList_view.aod
index 149c223100cad88892c6fb383da176b690ca0a30..e7c06076a1e2ad402702d6bd5d8a6ebcd8a12ad0 100644
--- a/neonView/RoleChildrenList_view/RoleChildrenList_view.aod
+++ b/neonView/RoleChildrenList_view/RoleChildrenList_view.aod
@@ -10,16 +10,12 @@
   <children>
     <titledListViewTemplate>
       <name>TitledList</name>
+      <titleField>CHILD_ROLE</titleField>
+      <titleFieldFullWidth v="true" />
       <entityField>#ENTITY</entityField>
       <isDeletable v="false" />
       <isEditable v="false" />
       <isCreatable v="false" />
-      <columns>
-        <neonTitledListTableColumn>
-          <name>0451e2ec-e216-4d4f-8080-e6b9aaf56613</name>
-          <entityField>CHILD_ROLE</entityField>
-        </neonTitledListTableColumn>
-      </columns>
     </titledListViewTemplate>
   </children>
 </neonView>
diff --git a/neonView/RoleParentList_view/RoleParentList_view.aod b/neonView/RoleParentList_view/RoleParentList_view.aod
index 357f92e53732c38b1de3f682ce6dff5fe3cab63d..740c95888f9b85c31d8ee1201f3f89c113875929 100644
--- a/neonView/RoleParentList_view/RoleParentList_view.aod
+++ b/neonView/RoleParentList_view/RoleParentList_view.aod
@@ -10,16 +10,12 @@
   <children>
     <titledListViewTemplate>
       <name>TitledList</name>
+      <titleField>PARENT_ROLE</titleField>
+      <titleFieldFullWidth v="true" />
       <entityField>#ENTITY</entityField>
       <isDeletable v="false" />
       <isEditable v="false" />
       <isCreatable v="false" />
-      <columns>
-        <neonTitledListTableColumn>
-          <name>cdc83256-2ea4-4a97-a323-b400a4037915</name>
-          <entityField>PARENT_ROLE</entityField>
-        </neonTitledListTableColumn>
-      </columns>
     </titledListViewTemplate>
   </children>
 </neonView>
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index f3934b933660f8cb2ba2fe7b756d1b0094b87e7f..2d0507917a2047a0e9a8028ceb221045a9db3326 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -283,17 +283,17 @@ CampaignUtils.getDefaultCampaignStep = function(pCampaignId)
 /**
  * Returns the start date to the corresponding campaign id.<br>
  * 
- * @param {String} pCapmaignId                  <p>
+ * @param {String} pCampaignId                  <p>
  *                                              The corresponding campaign id.<br>
  * @return {String}                             <p>
  *                                              The end date in this format:<br>
  *                                              <b>yyyy-mm-dd</b>                                             
  */
-CampaignUtils.getCampaignStartDate = function(pCapmaignId)
+CampaignUtils.getCampaignStartDate = function(pCampaignId)
 {
     return newSelect("DATE_START")
         .from("CAMPAIGNSTEP")
-        .whereIfSet("CAMPAIGNSTEP.CAMPAIGN_ID", pCapmaignId)
+        .whereIfSet("CAMPAIGNSTEP.CAMPAIGN_ID", pCampaignId)
         .orderBy("SORTING ASC")
         .cell(true);
 }
@@ -301,17 +301,17 @@ CampaignUtils.getCampaignStartDate = function(pCapmaignId)
 /**
  * Returns the end date to the corresponding campaign id.<br>
  * 
- * @param {String} pCapmaignId                          <p>
+ * @param {String} pCampaignId                          <p>
  *                                                      The corresponding campaign id.<br>
  * @return {String}                                     <p>
  *                                                      The end date in this format:<br>
  *                                                      <b>yyyy-mm-dd</b>                                                     
  */
-CampaignUtils.getCampaignEndDate = function(pCapmaignId)
+CampaignUtils.getCampaignEndDate = function(pCampaignId)
 {
     return newSelect("DATE_END")
         .from("CAMPAIGNSTEP")
-        .whereIfSet("CAMPAIGNSTEP.CAMPAIGN_ID", pCapmaignId)
+        .whereIfSet("CAMPAIGNSTEP.CAMPAIGN_ID", pCampaignId)
         .orderBy("SORTING DESC")
         .cell(true);
 }
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index f33eba68fa16f14af4e88b25b3102a64e3da4d04..49477739fd0a0b2931359ff565701150edf9108a 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -390,7 +390,7 @@ ItemUtils.prototype.getNextItemPosition = function(assignedTo, tree, ids) {
         }
     } else {
         if (ids.length > 0) {
-            maxPos[0] = this.ItemTree[ids[ids.length-1]].pos.split(".")[0];
+            maxPos[0] = tree[ids[ids.length-1]].pos.split(".")[0];
         }    
     }
     maxPos[maxPos.length-1] = (Number(maxPos[maxPos.length-1]) + 1).toString();
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 78ea329bfc0de71f18965d80cc03b82397687b0e..86cc96712ade6e652f107912eb59adba772e00f3 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -18,6 +18,7 @@ import("Neon_lib");
 import("KeywordRegistry_basic");
 import("Address_lib");
 import("DocumentTemplate_lib");
+import("system.eMath");
 
 /**
  * Methods used by Offer.
@@ -99,37 +100,42 @@ OfferUtils.createNewOffer = function(pContextId, pRowId, pRelationId, pActivityI
  * Builds the Offer report.
  * 
  * @param {String} pOfferID
+ * @param {String} pExclDiscountGroupcodes
  * @return {Array} [filename, data_bytes]
  */
-OfferUtils.buildOfferReport = function (pOfferID)
+OfferUtils.buildOfferReport = function (pOfferID, pExclDiscountGroupcodes)
 {
     var offerReport = new Report("Offer_report");  
 
     var sqlUtil = new SqlMaskingUtils();
     
     var offerFields = [
-        "ADDRESS", 
-        "CONTACT_ID", 
-        "ISOLANGUAGE", 
-        "PAYMENTTERMS", 
-        "DELIVERYTERMS", //4
-        "OFFERCODE", 
-        "CURRENCY", 
-        "OFFERDATE", 
-        "HEADER", //8
-        "VAT", 
-        sqlUtil.isNull("VERSNR", "0"),
-        sqlUtil.isNull("OFFERCODE", "0"), 
-        "OBJECT_TYPE", //12
-        "OBJECT_ROWID", //13
-        "FOOTER", //14
-        "LETTERSALUTATION" // 15
+    "ADDRESS", 
+    "CONTACT_ID", 
+    "ISOLANGUAGE", 
+    "PAYMENTTERMS", 
+    "DELIVERYTERMS", //4
+    "OFFERCODE", 
+    "CURRENCY", 
+    "OFFERDATE", 
+    "HEADER", //8
+    "VAT", 
+    sqlUtil.isNull("VERSNR", "0"),
+    sqlUtil.isNull("OFFERCODE", "0"), 
+    "OBJECT_TYPE", //12
+    "OBJECT_ROWID", //13
+    "FOOTER", //14
+    "LETTERSALUTATION", // 15
+    "DISCOUNT",
+    "NET",
+    "DISCOUNTED_NET", 
+    "DISCOUNTED_VAT"
     ];
    
     var offerData = newSelect(offerFields)
-                        .from("OFFER")
-                        .where("OFFER.OFFERID", pOfferID)
-                        .arrayRow();
+    .from("OFFER")
+    .where("OFFER.OFFERID", pOfferID)
+    .arrayRow();
   
     if (offerData.length === 0)
         return null;
@@ -137,36 +143,37 @@ OfferUtils.buildOfferReport = function (pOfferID)
     var letterSalutation = offerData[15];
     
     var language = newSelect("ISO2")
-                        .from("AB_LANGUAGE")
-                        .where("AB_LANGUAGE.ISO3", offerData[2])
-                        .cell();
+    .from("AB_LANGUAGE")
+    .where("AB_LANGUAGE.ISO3", offerData[2])
+    .cell();
                         
     offerData[7] = datetime.toDate(offerData[7], translate.text("dd.MM.yyyy", language));                    
         
     var offerItemFields = [
-        "OFFERITEM.INFO", 
-        "OFFERITEM.ASSIGNEDTO",
-        "OFFERITEM.PRODUCT_ID", 
-        "OFFERITEM.ITEMNAME" , 
-        "OFFERITEM.OPTIONAL",  //4
-        "OFFERITEM.ITEMPOSITION", 
-        "PRODUCT.PRODUCTCODE", 
-        "PRODUCT.PRODUCTID", 
-        "OFFERITEM.UNIT", //8
-        sqlUtil.isNull("OFFERITEM.QUANTITY", "0"), 
-        sqlUtil.isNull("OFFERITEM.PRICE", "0"),
-        sqlUtil.isNull("OFFERITEM.DISCOUNT", "0"), 
-        sqlUtil.isNull("OFFERITEM.VAT", "0"), //12
-        "0", 
-        "''"
+    "OFFERITEM.INFO", 
+    "OFFERITEM.ASSIGNEDTO",
+    "OFFERITEM.PRODUCT_ID", 
+    "OFFERITEM.ITEMNAME" , 
+    "OFFERITEM.OPTIONAL",  //4
+    "OFFERITEM.ITEMPOSITION", 
+    "PRODUCT.PRODUCTCODE", 
+    "PRODUCT.PRODUCTID", 
+    "OFFERITEM.UNIT", //8
+    sqlUtil.isNull("OFFERITEM.QUANTITY", "0"), 
+    sqlUtil.isNull("OFFERITEM.PRICE", "0"),
+    sqlUtil.isNull("OFFERITEM.DISCOUNT", "0"), 
+    sqlUtil.isNull("OFFERITEM.VAT", "0"), //12
+    "0", 
+    "''",
+    "OFFERITEM.GROUPCODEID"
     ]; 
 
     var itemData = newSelect(offerItemFields)
-                            .from("OFFERITEM")
-                            .leftJoin("PRODUCT", "PRODUCT.PRODUCTID = OFFERITEM.PRODUCT_ID")
-                            .where("OFFERITEM.OFFER_ID", pOfferID)
-                            .orderBy("OFFERITEM.ITEMSORT asc")
-                            .table();
+    .from("OFFERITEM")
+    .leftJoin("PRODUCT", "PRODUCT.PRODUCTID = OFFERITEM.PRODUCT_ID")
+    .where("OFFERITEM.OFFER_ID", pOfferID)
+    .orderBy("OFFERITEM.ITEMSORT asc")
+    .table();
             
     if (itemData.length == 0)
         return null;
@@ -178,10 +185,29 @@ OfferUtils.buildOfferReport = function (pOfferID)
     var sums = [];
     var vatsum = 0;
     var printDiscount = false;
+    var printHeadDiscount = false; 
+    var discValue = 0;
     
     var header = new DocumentTemplate(offerData[8], DocumentTemplate.types.PLAIN).getReplacedContentByContactId(offerData[1]);
     var footer = new DocumentTemplate(offerData[14], DocumentTemplate.types.PLAIN).getReplacedContentByContactId(offerData[1]);
     
+    var discount;
+    if(offerData[17] && offerData[18]){
+        discount = eMath.subDec(offerData[17].toString(), offerData[18].toString());
+        discount = text.formatDouble(discount.toString(), "#,##0.00", true);     
+    }
+    if (!printHeadDiscount && discount && parseFloat(discount) != parseFloat("0"))
+        printHeadDiscount = true;
+    if(printHeadDiscount){
+        total = eMath.addDec(offerData[18], offerData[19])
+    }
+    if(offerData[16]){
+        discValue = text.formatDouble(offerData[16], "#,##0.00", true);
+    }
+    if(offerData[18]){
+        offerData[18] = text.formatDouble(offerData[18], "#,##0.00", true);
+    }
+    
     itemData = itemData.map(function (item)
     {
         //quantity * price
@@ -192,45 +218,62 @@ OfferUtils.buildOfferReport = function (pOfferID)
             //itemSum = (fullPrice * (100 - discount)) / 100
             itemSum = eMath.roundDec(eMath.divDec(eMath.mulDec(fullPrice, eMath.subDec(100, item[11])), 100), 2, eMath.ROUND_HALF_EVEN); //sum of the item (with discount)
             sumItemSum += itemSum; //total sum (without vat) 
+
+            let excluded = -1
+            if(pExclDiscountGroupcodes){
+                excluded = pExclDiscountGroupcodes.indexOf(item[15])
+            }
+            //vatsum = itemSum * vat / 100
+
+            if(printHeadDiscount && offerData[16] && excluded == -1){
+                vatsum = ItemUtils.prototype.getItemVAT(item[9], item[10], item[11], item[12], item[4]);
+                vatsum = eMath.subDec(vatsum, eMath.divDec(eMath.mulDec(vatsum, offerData[16]), "100"));
+            }
+            else
+                vatsum = ItemUtils.prototype.getItemVAT(item[9], item[10], item[11], item[12], item[4])
+
+            if (item[12] > 0) 
+                sums.push([item[12], vatsum]); //MWSteuerwerte für Map vorbereiten
         }
-        //vatsum = itemSum * vat / 100
-        vatsum = eMath.divDec(eMath.mulDec(itemSum, item[12]), 100); //vat per product
-        if (item[12] > 0) 
-            sums.push([item[12], vatsum]); //MWSteuerwerte für Map vorbereiten
+        
         
         // sumItemSum + vat
-        total = eMath.addDec(sumItemSum, offerData[9]); //total sum with vat
+        if(!printHeadDiscount)
+            total = eMath.addDec(sumItemSum, offerData[9]); //total sum with vat
         
         if (!printDiscount && item[11] > 0)
             printDiscount = true;
         
         return [
-            offerData[6],   //currency
-            offerData[7],   //offerdate
-            pOfferID,       //offerId
-            item[0],        //info
-            item[1],        //assignedTo
-            item[3],        //itemname
-            item[4],        //optional
-            item[5],        //itemposition
-            item[6],        //productcode
-            header,         //header 
-            footer,         //footer 
-            text.formatDouble(item[9], "#,##0", true),          //quantity
-            text.formatDouble(item[10], "#,##0.00", true),      //price
-            text.formatDouble(item[11], "0.00", true),          //discount
-            offerData[10],  //versnr
-            offerData[5],   //offercode
-            text.formatDouble(item[12], "#,##0.00", true),      //vat
-            text.formatDouble(itemSum, "#,##0.00", true),       //itemsum
-            KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), item[8]) //unittext
+        offerData[6],   //currency
+        offerData[7],   //offerdate
+        pOfferID,       //offerId
+        item[0],        //info
+        item[1],        //assignedTo
+        item[3],        //itemname
+        item[4],        //optional
+        item[5],        //itemposition
+        item[6],        //productcode
+        header,         //header 
+        footer,         //footer 
+        text.formatDouble(item[9], "#,##0", true),          //quantity
+        text.formatDouble(item[10], "#,##0.00", true),      //price
+        text.formatDouble(item[11], "0.00", true),          //discount
+        offerData[10],  //versnr
+        offerData[5],   //offercode
+        text.formatDouble(item[12], "#,##0.00", true),      //vat
+        text.formatDouble(itemSum, "#,##0.00", true),       //itemsum
+        KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), item[8]), //unittext
+        discValue,
+        offerData[18],
+        discount
         ];
     });
     
     // TODO: get Images implementieren
     var imgData = ["meineFirma | Wilhelm-Str. 2  |  DE 80807 München",
-                   "base64:iVBORw0KGgoAAAANSUhEUgAAAM4AAABRCAYAAACaL5lSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDA4QzAyM0IwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDA4QzAyM0MwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMDhDMDIzOTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowMDhDMDIzQTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhF3nYoAAAlvSURBVHja7J1fjBXV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"]
-                // getMyASYS_ICONSdata();
+    "base64:iVBORw0KGgoAAAANSUhEUgAAAM4AAABRCAYAAACaL5lSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDA4QzAyM0IwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDA4QzAyM0MwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMDhDMDIzOTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowMDhDMDIzQTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhF3nYoAAAlvSURBVHja7J1fjBXV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"]
+    // getMyASYS_ICONSdata();
     
     // TODO: implementieren wenn Attribute möglich sind
     var adma = ""; //adma = Aussendienstmitarbeiter
@@ -266,7 +309,12 @@ OfferUtils.buildOfferReport = function (pOfferID)
         "responsible" : adma,
         "SUMITEMSUM" : sumItemSum,
         "TOTAL" : text.formatDouble(total, "#,##0.00", true),
-        "printDiscount" : printDiscount ? "1" : "0"
+        "printDiscount" : printDiscount ? "1" : "0",
+        "subTotal": translate.text("Subtotal", language),
+        "InvoiceDiscount": translate.text("Invoice Discount", language),
+        "TotalWithoutVat": translate.text("without Vat", language),
+        "TotalWithVat": translate.text("incl. Vat", language),
+        "printHeadDiscount": printHeadDiscount ? "1" : "0"
     };
     
     
@@ -278,27 +326,30 @@ OfferUtils.buildOfferReport = function (pOfferID)
 
     offerReport.setReportData(ReportData.begin(
         [
-            "OFFER_CURRENCY", 
-            "OFFER_OFFERDATE", 
-            "OFFER_OFFERID",  
-            "OFFERITEM_INFO", 
-            "OFFERITEM_ASSIGNEDTO", //4
-            "OFFERITEM_ITEMNAME" , 
-            "OFFERITEM_OPTIONAL", 
-            "OFFERITEM_ITEMPOSITION", 
-            "PRODUCT_PRODUCTCODE", //8
-            "OFFER_HEADER", 
-            "OFFER_FOOTER", 
-            "OFFERITEM_QUANTITY", 
-            "OFFERITEM_PRICE", 
-            "OFFERITEM_DISCOUNT", //13
-            "OFFER_VERSNR", 
-            "OFFER_OFFERCODE", 
-            "OFFERITEM_VAT", 
-            "ITEMSUM", // 17
-            "OFFERITEM_UNITTEXT"
+        "OFFER_CURRENCY", 
+        "OFFER_OFFERDATE", 
+        "OFFER_OFFERID",  
+        "OFFERITEM_INFO", 
+        "OFFERITEM_ASSIGNEDTO", //4
+        "OFFERITEM_ITEMNAME" , 
+        "OFFERITEM_OPTIONAL", 
+        "OFFERITEM_ITEMPOSITION", 
+        "PRODUCT_PRODUCTCODE", //8
+        "OFFER_HEADER", 
+        "OFFER_FOOTER", 
+        "OFFERITEM_QUANTITY", 
+        "OFFERITEM_PRICE", 
+        "OFFERITEM_DISCOUNT", //13
+        "OFFER_VERSNR", 
+        "OFFER_OFFERCODE", 
+        "OFFERITEM_VAT", 
+        "ITEMSUM", // 17
+        "OFFERITEM_UNITTEXT",
+        "OFFER_DISCOUNT",
+        "OFFER_DISCOUNTED_NET",
+        "OFFER_DISCOUNTSUM"
         ])
-        .add(itemData));
+    .add(itemData));
         
     return offerReport.exportReport();
 }
@@ -336,7 +387,8 @@ OfferUtils.copyOffer = function (pOfferId, pOfferData)
         "OfferDeliveryTerm_param": pOfferData.deliveryTerm || "",
         "OfferPaymentTerm_param": pOfferData.paymentTerm || "",
         "ObjectType_param": pOfferData.objectType || "",
-        "ObjectRowId_param": pOfferData.objectRowId || ""
+        "ObjectRowId_param": pOfferData.objectRowId || "",
+        "Discount_param" :  pOfferData.discount || ""
     };
     neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
 }
@@ -347,7 +399,7 @@ OfferUtils.copyOffer = function (pOfferId, pOfferData)
  * @param {String} pSourceOfferId
  * @param {String} pTargetOfferId
  */
-OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
+OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId, pDiscount)
 {
     var inputMapping = {
         "OFFERITEM": {
@@ -363,12 +415,24 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
     
     //update order price
     var [netPrice, vat] = oiUtils.getNetAndVat();
+    var discountedVals = OfferItemUtils.getDiscountedNet(null, pSourceOfferId,  pDiscount);
     
-    newWhere("OFFER.OFFERID", pTargetOfferId)
+    if(discountedVals){
+        newWhere("OFFER.OFFERID", pTargetOfferId)
+        .updateFields({
+            "NET": netPrice,
+            "VAT": vat,
+            "DISCOUNTED_NET": discountedVals[0],
+            "DISCOUNTED_VAT": discountedVals[1]
+        });
+    }
+    else{
+        newWhere("OFFER.OFFERID", pTargetOfferId)
         .updateFields({
             "NET": netPrice,
             "VAT": vat
         });
+    }
 }
 
 /**
@@ -384,8 +448,8 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId)
  */
 OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress)
 {  
-        var fieldparams = 
-        {
+    var fieldparams = 
+    {
         "$field.CONTACT_ID" : pContactId,
         "$field.ISOLANGUAGE" : pLanguage,
         "$field.OFFER_ID" : pOfferId,
@@ -393,7 +457,7 @@ OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLa
         "$field.PAYMENTADDRESS" : pAddress || "",
         "$field.OBJECT_TYPE" : pContextId || "",
         "$field.OBJECT_ROWID" : pRowId || ""
-        };
+    };
     
     var params = {};
     params["Copy_param"] = JSON.stringify(fieldparams);
@@ -414,13 +478,13 @@ OfferUtils.getOfferTitleById = function (pOfferId)
     if (!pOfferId)
         return "";
     var offerNumber = newSelect("OFFERCODE, VERSNR")
-                        .from("OFFER")
-                        .where("OFFER.OFFERID", pOfferId)
-                        .arrayRow();
+    .from("OFFER")
+    .where("OFFER.OFFERID", pOfferId)
+    .arrayRow();
                         
     return offerNumber.length > 0 
-        ? translate.text("Offer") + " " + offerNumber.join("-") 
-        : "";
+    ? translate.text("Offer") + " " + offerNumber.join("-") 
+    : "";
 }
 
 
@@ -482,26 +546,26 @@ OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCu
     this.initItemTree();
     
     var cols =  ["OFFERITEMID"
-                , "OFFER_ID"
-                , "PRODUCT_ID"
-                , "GROUPCODEID"
-                , "ASSIGNEDTO"
-                , "ITEMNAME"
-                , "UNIT"
-                , "PRICE"
-                , "VAT"
-                , "QUANTITY"
-                , "OPTIONAL"
-                , "ITEMPOSITION"
-                , "ITEMSORT"];
+    , "OFFER_ID"
+    , "PRODUCT_ID"
+    , "GROUPCODEID"
+    , "ASSIGNEDTO"
+    , "ITEMNAME"
+    , "UNIT"
+    , "PRICE"
+    , "VAT"
+    , "QUANTITY"
+    , "OPTIONAL"
+    , "ITEMPOSITION"
+    , "ITEMSORT"];
 
     return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, [[["info", "INFO"], ["info", 
-                            "( " + newSelect("DESCRIPTION")
-                                .from("DESCRIPTIONTRANSLATION")
-                                .where("DESCRIPTIONTRANSLATION.OBJECT_ROWID = PRODUCT.PRODUCTID")
-                                .and("DESCRIPTIONTRANSLATION.OBJECT_TYPE", "Product")
-                                .and("DESCRIPTIONTRANSLATION.LANG", pLanguage)
-                                .toString() + ")"]]]]);
+        "( " + newSelect("DESCRIPTION")
+        .from("DESCRIPTIONTRANSLATION")
+        .where("DESCRIPTIONTRANSLATION.OBJECT_ROWID = PRODUCT.PRODUCTID")
+        .and("DESCRIPTIONTRANSLATION.OBJECT_TYPE", "Product")
+        .and("DESCRIPTIONTRANSLATION.LANG", pLanguage)
+        .toString() + ")"]]]]);
                                   
 }
 
@@ -541,3 +605,51 @@ OfferItemUtils.prototype.reOrgItems = function() {
     ItemUtils.prototype.reOrgItems.apply(this);
 }
 
+
+
+OfferItemUtils.getDiscountedNet = function(pExcludedIs, pOfferId, pDiscount, pExcludedProductgroups){
+    pDiscount = pDiscount ? pDiscount : 0;
+    var ret;
+    var sum = 0;
+    var sumExcluded = 0;
+    var vat = 0;
+    var vatExcluded = 0;
+    if(pOfferId){
+        var offeritemData = newSelect("QUANTITY, PRICE, DISCOUNT, VAT, OPTIONAL")
+        .from("OFFERITEM")
+        .where("OFFERITEM.OFFER_ID", pOfferId)
+        .andIfSet("OFFERITEM.GROUPCODEID", pExcludedProductgroups, SqlBuilder.NOT_IN())
+        .andIfSet("OFFERITEM.OFFERITEMID", pExcludedIs, SqlBuilder.NOT_IN())
+        .table();
+        for (var i = 0; i < offeritemData.length; i++)
+        {
+            sum = eMath.addDec(sum, ItemUtils.prototype.getItemSum(offeritemData[i][0], offeritemData[i][1], offeritemData[i][2], offeritemData[i][4]));
+            vat = eMath.addDec(vat, ItemUtils.prototype.getItemVAT(offeritemData[i][0], offeritemData[i][1], offeritemData[i][2], offeritemData[i][3], offeritemData[i][4]));
+        }
+       
+        sum = eMath.subDec(sum, eMath.divDec(eMath.mulDec(sum, pDiscount), "100"));
+        vat = eMath.subDec(vat, eMath.divDec(eMath.mulDec(vat, pDiscount), "100"));
+        
+        if(pExcludedProductgroups){
+            var excludedOfferitemData = newSelect("QUANTITY, PRICE, DISCOUNT, VAT, OPTIONAL")
+            .from("OFFERITEM")
+            .where("OFFERITEM.OFFER_ID", pOfferId)
+            .and("OFFERITEM.GROUPCODEID", pExcludedProductgroups, SqlBuilder.IN())
+            .andIfSet("OFFERITEM.OFFERITEMID", pExcludedIs, SqlBuilder.NOT_IN())
+            .table();
+            for (var j = 0; j < excludedOfferitemData.length; j++)
+            {
+                sumExcluded = eMath.addDec(sumExcluded, ItemUtils.prototype.getItemSum(excludedOfferitemData[j][0], excludedOfferitemData[j][1], excludedOfferitemData[j][2], excludedOfferitemData[j][4]));
+                vatExcluded = eMath.addDec(vatExcluded, ItemUtils.prototype.getItemVAT(excludedOfferitemData[i][0], excludedOfferitemData[i][1], excludedOfferitemData[i][2], excludedOfferitemData[i][3], excludedOfferitemData[i][4]));
+            }
+        }
+        if(sumExcluded){
+            sum = eMath.addDec(sum, sumExcluded);
+        }
+        if(vatExcluded){
+            vat = eMath.addDec(vat, vatExcluded);
+        }
+    }
+    ret = [sum, vat]
+    return ret;
+}
diff --git a/process/Turnover_lib/process.js b/process/Turnover_lib/process.js
index 1e69ad37d5f05c94e3779b5fe5c6edb3fe81cbc5..b070a1a6605c5a3c5d63ef49760af0709429cf9c 100644
--- a/process/Turnover_lib/process.js
+++ b/process/Turnover_lib/process.js
@@ -78,22 +78,33 @@ TurnoverUtil.getTurnoverData = function (pMaxYear, pYearCount, pSalesprojectId)
  */
 TurnoverUtil.getForecastData = function (pMaxYear, pYearCount, pSalesprojectId)
 {
-    var forecastCategory = translate.text('Forecast');
-
+    var forecastCategory = translate.text("Forecast");
     var minYear = pMaxYear - pYearCount + 1;
+    var sqlMask = new SqlMaskingUtils();
 
     // load data
-    var forecastSelect = newSelect("'" + forecastCategory + "', year(DATE_START) yearNum, month(DATE_START) monthNum, 0 discount, 0 vat, sum(VOLUME) price, 1 quantity, GROUPCODE prodGroup, (" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName")
-                            .from("FORECAST")
-                            .where("FORECAST.DATE_START", pMaxYear, "year(#) <= ?", SQLTYPES.INTEGER)
-                            .and("FORECAST.DATE_START", minYear, "year(#) >= ?", SQLTYPES.INTEGER)
+    var forecastSelect = newSelect([
+            "'" + forecastCategory + "'", 
+            sqlMask.yearFromDate("DATE_START") + " yearNum", 
+            sqlMask.monthFromDate("DATE_START") + " monthNum", 
+            "0 discount", 
+            "0 vat", 
+            "sum(VOLUME) price", 
+            "1 quantity", 
+            "GROUPCODE prodGroup", 
+            "(" + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODE") + ") prodGroupName"
+        ])
+        .from("FORECAST")
+        .where("FORECAST.DATE_START", pMaxYear, sqlMask.yearFromDate("#") + " <= ?", SQLTYPES.INTEGER)
+        .and("FORECAST.DATE_START", minYear, sqlMask.yearFromDate("#") + " >= ?", SQLTYPES.INTEGER);
+        
     if (pSalesprojectId)
     {
-        forecastSelect.and("FORECAST.OBJECT_TYPE", 'Salesproject')
+        forecastSelect.and("FORECAST.OBJECT_TYPE", "Salesproject")
                       .and("FORECAST.OBJECT_ROWID", pSalesprojectId)
     }   
     
-    forecastSelect.groupBy("year(DATE_START), month(DATE_START), GROUPCODE")
+    forecastSelect.groupBy([sqlMask.yearFromDate("DATE_START"), sqlMask.monthFromDate("DATE_START"), "GROUPCODE"])
                   .orderBy("yearNum, monthNum");
                   
     return forecastSelect.table();
diff --git a/process/buildSerialLetter_serverProcess/process.js b/process/buildSerialLetter_serverProcess/process.js
index b3210e860dba7d2817b4e9465f17600fca2bcb95..7be5de72cd71f6c4dee9d1fab003af0582d4afcd 100644
--- a/process/buildSerialLetter_serverProcess/process.js
+++ b/process/buildSerialLetter_serverProcess/process.js
@@ -21,4 +21,15 @@ SingleBinaryUtils.set("SERIALLETTER", "SERIALLETTERFILE", letterId, document.con
 
 var message = translate.text("Download ready");
 var description = translate.withArguments("Serial letter \"%0\" can now be downloaded", [document.title]);
-notification.addNotification(util.getNewUUID(), text.encodeMS(["SerialLetter", letterId]), null, null, "DownloadReady", null, notification.PRIO_NORMAL, 2, notification.STATE_UNSEEN, [user], message, description);
\ No newline at end of file
+
+var notificationConfig = notification.createConfig()
+.initialState(notification.STATE_UNSEEN)
+.forcedPriority(notification.PRIO_NORMAL)
+    .linkInfo(text.encodeMS(["SerialLetter", letterId]))
+    .daysToLive(2)
+    .addUserWithId(user)
+    .notificationType("DownloadReady")
+    .caption(message)
+    .description(description);
+    
+notification.addNotificationWith(notificationConfig);
\ No newline at end of file
diff --git a/report/Offer_report/reportData.jrxml b/report/Offer_report/reportData.jrxml
index 2f3a25316e09aa7a8a18a74718bb72d930e3e4f5..76b33d239d03b4c903aed440ea6f8c4b5c30df50 100644
--- a/report/Offer_report/reportData.jrxml
+++ b/report/Offer_report/reportData.jrxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
-	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.zoom" value="1.7715610000000064"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="279"/>
 	<parameter name="myAddr" class="java.lang.String"/>
 	<parameter name="Pos" class="java.lang.String"/>
 	<parameter name="Articledescription" class="java.lang.String"/>
@@ -24,7 +24,7 @@
 	<parameter name="OfferDeliveryTerm" class="java.lang.String"/>
 	<parameter name="responsible" class="java.lang.String"/>
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA["C:\\dev\\project\\basic\\report\\Offer_report\\"]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA["C:\\Users\\s.neumaier\\Documents\\AditoProjects\\basic_2020.2\\report\\Offer_report\\"]]></defaultValueExpression>
 	</parameter>
 	<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
 	<parameter name="SUMITEMSUM" class="java.lang.Double"/>
@@ -32,6 +32,11 @@
 	<parameter name="adito.image.myLogo" class="java.lang.String"/>
 	<parameter name="printDiscount" class="java.lang.String"/>
 	<parameter name="directlyResponsible" class="java.lang.String"/>
+	<parameter name="subTotal" class="java.lang.String"/>
+	<parameter name="InvoiceDiscount" class="java.lang.String"/>
+	<parameter name="TotalWithoutVat" class="java.lang.String"/>
+	<parameter name="TotalWithVat" class="java.lang.String"/>
+	<parameter name="printHeadDiscount" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -53,6 +58,9 @@
 	<field name="OFFER_HEADER" class="java.lang.String"/>
 	<field name="ITEMSUM" class="java.lang.String"/>
 	<field name="OFFER_FOOTER" class="java.lang.String"/>
+	<field name="OFFER_DISCOUNT" class="java.lang.String"/>
+	<field name="OFFER_DISCOUNTED_NET" class="java.lang.String"/>
+	<field name="OFFER_DISCOUNTSUM" class="java.lang.String"/>
 	<sortField name="OFFER_OFFERID"/>
 	<group name="OFFERID" isStartNewPage="true">
 		<groupExpression><![CDATA[$F{OFFER_OFFERID}]]></groupExpression>
@@ -233,19 +241,69 @@
 			</band>
 		</groupHeader>
 		<groupFooter>
-			<band height="24">
+			<band height="23">
 				<line>
 					<reportElement x="356" y="4" width="196" height="1" uuid="228a3e86-96b6-470f-b9d8-9c566a0f1065"/>
 				</line>
 				<textField pattern="#,##0.00;-#,##0.00">
-					<reportElement x="452" y="6" width="100" height="15" uuid="f71cd6ef-6a10-4bd5-9bd5-4c8de5a276f1"/>
+					<reportElement x="469" y="8" width="83" height="15" uuid="f71cd6ef-6a10-4bd5-9bd5-4c8de5a276f1"/>
 					<textElement textAlignment="Right">
-						<font size="8"/>
+						<font size="8" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$P{SUMITEMSUM}]]></textFieldExpression>
 				</textField>
+				<textField>
+					<reportElement x="356" y="8" width="113" height="15" uuid="c505a568-afb9-4cb3-9d15-b7803aeff207"/>
+					<textElement>
+						<font size="8" isBold="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{subTotal}]]></textFieldExpression>
+				</textField>
 			</band>
-			<band height="18">
+			<band height="34">
+				<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
+				<textField isStretchWithOverflow="true">
+					<reportElement positionType="Float" x="469" y="19" width="83" height="15" uuid="26cc2b42-75a8-4e17-a674-f75a83465476">
+						<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
+					</reportElement>
+					<textElement textAlignment="Right">
+						<font size="8" isBold="true"/>
+						<paragraph lineSpacing="Proportional"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_DISCOUNTED_NET}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement positionType="Float" x="356" y="19" width="113" height="15" uuid="05470803-14c1-4ecc-81f0-de432ec80c27">
+						<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
+					</reportElement>
+					<textElement>
+						<font size="8" isBold="true"/>
+						<paragraph lineSpacing="Proportional"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY} + " " + $P{TotalWithoutVat}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement positionType="Float" x="356" y="2" width="113" height="15" uuid="152d4841-b63c-4cd3-bc6b-935af23ad0b8">
+						<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+						<paragraph lineSpacing="Proportional"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_DISCOUNT} + " % " + $P{InvoiceDiscount}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="true">
+					<reportElement positionType="Float" x="469" y="2" width="83" height="15" uuid="e205d256-1ac5-439b-9b9c-3735d7a301df">
+						<printWhenExpression><![CDATA[!$P{printHeadDiscount}.equals("0")]]></printWhenExpression>
+					</reportElement>
+					<textElement textAlignment="Right">
+						<font size="8"/>
+						<paragraph lineSpacing="Proportional"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{OFFER_DISCOUNTSUM}]]></textFieldExpression>
+				</textField>
+			</band>
+			<band height="19">
 				<subreport>
 					<reportElement isPrintRepeatedValues="false" x="355" y="2" width="196" height="15" isRemoveLineWhenBlank="true" uuid="8683c745-01bf-44aa-af62-a6ba881a9edd"/>
 					<subreportParameter name="PlusSalestax">
@@ -257,46 +315,47 @@
 			</band>
 			<band height="33">
 				<textField>
-					<reportElement x="20" y="13" width="100" height="20" uuid="112f15db-0989-430e-b2c4-61f975f7b8a4">
-						<printWhenExpression><![CDATA[!$P{OfferPaymentTerm}.equals("")]]></printWhenExpression>
-					</reportElement>
-					<textElement>
-						<font size="8"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$P{PaymentConditions}]]></textFieldExpression>
-				</textField>
-				<textField>
-					<reportElement x="122" y="13" width="100" height="20" uuid="8149be09-d439-4e1a-a853-f82bd5e5683e"/>
+					<reportElement x="122" y="12" width="100" height="20" uuid="8149be09-d439-4e1a-a853-f82bd5e5683e"/>
 					<textElement>
 						<font size="8"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$P{OfferPaymentTerm}]]></textFieldExpression>
 				</textField>
+				<line>
+					<reportElement x="356" y="29" width="196" height="1" uuid="982cac61-6b87-4439-93cb-6c89fcc7932c"/>
+					<graphicElement>
+						<pen lineWidth="3.0" lineStyle="Double"/>
+					</graphicElement>
+				</line>
 				<textField>
-					<reportElement x="402" y="8" width="90" height="20" uuid="c3444576-6cb8-47f2-9dc9-e892a91ceb07"/>
-					<textElement textAlignment="Right">
+					<reportElement x="356" y="7" width="113" height="20" uuid="c3444576-6cb8-47f2-9dc9-e892a91ceb07"/>
+					<textElement textAlignment="Left">
 						<font size="8" isBold="true"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$P{Total} + " " + $F{OFFER_CURRENCY} + " " + $P{TotalWithVat}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement x="356" y="2" width="196" height="1" uuid="8973e664-cfc0-4b52-bd0d-c80a49910da2"/>
-				</line>
-				<line>
-					<reportElement x="356" y="30" width="196" height="1" uuid="982cac61-6b87-4439-93cb-6c89fcc7932c"/>
-					<graphicElement>
-						<pen lineWidth="3.0" lineStyle="Double"/>
-					</graphicElement>
+					<reportElement x="356" y="1" width="196" height="1" uuid="8973e664-cfc0-4b52-bd0d-c80a49910da2"/>
 				</line>
 				<textField pattern="###0.00;-###0.00">
-					<reportElement x="491" y="8" width="59" height="20" uuid="75bb0951-e562-4170-a5c2-731d3219ec66"/>
+					<reportElement x="469" y="7" width="81" height="20" uuid="75bb0951-e562-4170-a5c2-731d3219ec66"/>
 					<textElement textAlignment="Right">
 						<font size="8" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$P{TOTAL}]]></textFieldExpression>
 				</textField>
+				<textField>
+					<reportElement x="20" y="12" width="100" height="20" uuid="112f15db-0989-430e-b2c4-61f975f7b8a4">
+						<printWhenExpression><![CDATA[!$P{OfferPaymentTerm}.equals("")]]></printWhenExpression>
+					</reportElement>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$P{PaymentConditions}]]></textFieldExpression>
+				</textField>
 			</band>
 			<band height="20">
+				<printWhenExpression><![CDATA[($F{OFFER_FOOTER} != null && !$F{OFFER_FOOTER}.trim().isEmpty())]]></printWhenExpression>
 				<textField>
 					<reportElement x="20" y="0" width="100" height="20" uuid="75b328c0-4ab1-478d-afb8-0ed8974da1af">
 						<printWhenExpression><![CDATA[!$P{OfferDeliveryTerm}.equals("")]]></printWhenExpression>
@@ -315,7 +374,6 @@
 				</textField>
 			</band>
 			<band height="20">
-				<printWhenExpression><![CDATA[($F{OFFER_FOOTER} != null && !$F{OFFER_FOOTER}.trim().isEmpty())]]></printWhenExpression>
 				<textField isStretchWithOverflow="true">
 					<reportElement x="20" y="0" width="530" height="20" uuid="2a2d0fe8-9c83-43b7-913d-a551a9879608"/>
 					<textElement>
diff --git a/report/Offer_report/reportData_subreport1.jrxml b/report/Offer_report/reportData_subreport1.jrxml
index 45e05cbc8afa6664aeeca709bcf3ec6afcf86df2..2429050e564354bcdb770e4cdb3ce3d989251f82 100644
--- a/report/Offer_report/reportData_subreport1.jrxml
+++ b/report/Offer_report/reportData_subreport1.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="reportData_subreport1" pageWidth="200" pageHeight="802" columnWidth="200" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="65da6912-abcf-40ed-a854-750d851fe857">
-	<property name="ireport.zoom" value="6.72749994932561"/>
+	<property name="ireport.zoom" value="4.177248169415656"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="PlusSalestax" class="java.lang.String"/>
diff --git a/report/Reminder_report/reportData.jrxml b/report/Reminder_report/reportData.jrxml
index 1347b1ef959b34c58be528e8eecfb4bc139ff51a..ecbfcaa763c5fd38ea839ee2e483d79b57bf80ea 100644
--- a/report/Reminder_report/reportData.jrxml
+++ b/report/Reminder_report/reportData.jrxml
@@ -2,7 +2,7 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Mahnung" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
 	<property name="ireport.zoom" value="2.1435888100000016"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="0"/>
+	<property name="ireport.y" value="192"/>
 	<parameter name="myAddr" class="java.lang.String"/>
 	<parameter name="Kontenabstimmung" class="java.lang.String"/>
 	<parameter name="Rech.-Nr" class="java.lang.String"/>
@@ -114,14 +114,14 @@
 				</textField>
 				<textField>
 					<reportElement x="307" y="0" width="81" height="15" uuid="000feb72-9b7d-42e6-ade9-8e12359c3eef"/>
-					<textElement>
+					<textElement textAlignment="Right">
 						<font size="8"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$R{Rechnungsbetrag}]]></textFieldExpression>
 				</textField>
 				<textField>
 					<reportElement x="430" y="0" width="81" height="15" uuid="8eee46c0-f3c3-4563-b1b1-746aeb7e73c6"/>
-					<textElement>
+					<textElement textAlignment="Right">
 						<font size="8"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$P{OutstandingAmount}]]></textFieldExpression>
@@ -170,14 +170,14 @@
 				<textFieldExpression><![CDATA[$P{Reminder}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd.MM.yyyy">
-				<reportElement x="388" y="192" width="100" height="20" uuid="5141d92f-3325-445b-b616-90630c1648f7"/>
+				<reportElement x="411" y="192" width="100" height="20" uuid="5141d92f-3325-445b-b616-90630c1648f7"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement x="13" y="232" width="294" height="20" uuid="3f7d1c4a-a326-436b-831d-5da9fd255bf0"/>
+			<textField isStretchWithOverflow="true">
+				<reportElement x="13" y="232" width="542" height="20" isPrintWhenDetailOverflows="true" uuid="3f7d1c4a-a326-436b-831d-5da9fd255bf0"/>
 				<textElement>
 					<font size="8" isBold="true"/>
 				</textElement>
diff --git a/system/default/default.aod b/system/default/default.aod
index 9a52a413a65379d11c6a4f41d481f78eef758db0..52bd2d1c0a28061427e4a48cae30f56a521e2e46 100644
--- a/system/default/default.aod
+++ b/system/default/default.aod
@@ -2,7 +2,7 @@
 <system 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/system/1.1.0">
   <name>default</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <serverConfigPath>$ADITODATA/config/serverconfig_default.xml</serverConfigPath>
+  <serverConfigPath>C:\Users\s.neumaier\Documents\AditoProjects\basic_2020.2\data\sn-test-basic.dev.c2.adito.cloud_serverconfig_system.xml</serverConfigPath>
   <aditoHomePath>$ADITOHOME</aditoHomePath>
   <aditoDataPath>$PROJECTHOME/data</aditoDataPath>
   <loginUser>admin</loginUser>