diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index d2e1ef75a8f1596e6efed00651911617de158eed..cb46a825301f32476ff7d6e787daef5eb8105e35 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -119,12 +119,6 @@
<entityField>
<name>ATTENDEESLENGTH</name>
</entityField>
- <entityField>
- <name>LINKOBJECT</name>
- <title>Linkobject</title>
- <consumer>Objects</consumer>
- <linkedContext>Object</linkedContext>
- </entityField>
<entityField>
<name>ICON</name>
</entityField>
@@ -187,12 +181,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>LINKTYPE</name>
- <title>Linktype</title>
- <consumer>Contexts</consumer>
- <linkedContext>Context</linkedContext>
- </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index d720226f23f0c8c8461b7fd78faf59abeb01e0bb..003c2e6a3c7811c6426ca9afdf74c250ab58adae 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -229,10 +229,10 @@
<description>PARAMETER</description>
</entityParameter>
<entityActionField>
- <name>offerReport</name>
+ <name>printOffer</name>
<fieldType>ACTION</fieldType>
- <title>Offer report</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/offerreport/onActionProcess.js</onActionProcess>
+ <title>Print Offer</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/onActionProcess.js</onActionProcess>
</entityActionField>
<entityField>
<name>CONTACT_ORG_ID</name>
@@ -313,6 +313,7 @@
<title>Address</title>
<description></description>
<contentType>LONG_TEXT</contentType>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>ChosenAddress</name>
diff --git a/entity/Offer_entity/entityfields/offerreport/onActionProcess.js b/entity/Offer_entity/entityfields/printoffer/onActionProcess.js
similarity index 100%
rename from entity/Offer_entity/entityfields/offerreport/onActionProcess.js
rename to entity/Offer_entity/entityfields/printoffer/onActionProcess.js
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 7692f06dc4e5c53e9b9a9ba09eaf29c2d6e36c29..844a65942f92a6089f1c7a5197d1065a0a1311d1 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -405,6 +405,7 @@
<entityParameter>
<name>objectRowId_param</name>
<code>%aditoprj%/entity/Organisation_entity/entityfields/attributes/children/objectrowid_param/code.js</code>
+ <expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index bc648ee740e589b072b4daad39cf7700d7a7e000..9e2338a3cef1e448c82e6b74c022c7a571a0977f 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2347,6 +2347,7 @@
<key>Level</key>
</entry>
<entry>
+ <key>Print Offer</key>
<key>Touchpoint</key>
</entry>
<entry>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index cb6f839323b13a3704383a041c1fc4ecfe998a65..c31e4d2d49ec1633572bdd9d49602d6f827d7a78 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -2724,6 +2724,10 @@
<entry>
<key>Level</key>
</entry>
+ <entry>
+ <key>Print Offer</key>
+ <value>Angebot drucken</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index aa09e4cbb8e9b07046af487e36e759d409f39e52..7a1809e94d1c8a8ce9acbec4d836ff7684a4254a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -55,6 +55,9 @@
<entry>
<key>Information</key>
</entry>
+ <entry>
+ <key>Print Offer</key>
+ </entry>
<entry>
<key>Language</key>
</entry>
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index 68581d6336cf998f5963361f1f428d10b09a002b..81d642c40d54f51d68ef3246add18df5e97f9d6a 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -30,8 +30,6 @@
<masterBeginField>MASTERBEGIN</masterBeginField>
<masterEndField>MASTEREND</masterEndField>
<reminderField>REMINDER</reminderField>
- <appointmentLinkField>LINKS</appointmentLinkField>
- <appointmentLinkTypeField>LINKTYPE</appointmentLinkTypeField>
<entityField>#ENTITY</entityField>
</appointmentEditViewTemplate>
<neonViewReference>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index 28572813858612fe1b31d76dffa1ec8adac5320b..0e6f03ca25af5f1f5f76bd87009bc68a788c48c1 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
<name>AppointmentLinkFilter_view</name>
+ <title>relations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
@@ -10,8 +11,10 @@
<children>
<tableViewTemplate>
<name>Links</name>
+ <showHeader v="true" />
<autoNewRow v="true" />
<entityField>#ENTITY</entityField>
+ <title>relations</title>
<columns>
<neonTableColumn>
<name>17c0a8a9-354c-4095-a5d4-5c2613c897a3</name>
diff --git a/neonView/OfferMain_view/OfferMain_view.aod b/neonView/OfferMain_view/OfferMain_view.aod
index 01fc943f6aabc0eef9a44669332c76c760b0756c..96e53e98805a3dc2c0a049a9c7e8f1c9482925bf 100644
--- a/neonView/OfferMain_view/OfferMain_view.aod
+++ b/neonView/OfferMain_view/OfferMain_view.aod
@@ -14,6 +14,11 @@
<entityField>#ENTITY</entityField>
<view>OfferPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>da7c8cef-a4f0-4614-a330-d81221abe566</name>
+ <entityField>Offeritems</entityField>
+ <view>OfferitemFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>a3702740-418d-40d5-9415-788542c14abb</name>
<entityField>Activities</entityField>
@@ -24,11 +29,6 @@
<entityField>#ENTITY</entityField>
<view>OfferDetail_view</view>
</neonViewReference>
- <neonViewReference>
- <name>da7c8cef-a4f0-4614-a330-d81221abe566</name>
- <entityField>Offeritems</entityField>
- <view>OfferitemFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>e96f2fec-1a98-4380-895a-82ab78ba408a</name>
<entityField>Documents</entityField>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 336d6b092bda8ab38166821c8d50c82ace586ceb..581c9d3a6896bb001678073f2ebc276b89dd4112 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -10,11 +10,15 @@
<value></value>
</entry>
<entry>
- <key>Privat</key>
+ <key>Organisation</key>
<value></value>
</entry>
<entry>
- <key>Organisation</key>
+ <key>auswärts</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>Urlaub</key>
<value></value>
</entry>
</calendarCategoriesEvent>