# Conflicts:
#	entity/Address_entity/Address_entity.aod
#	entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js
#	entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js
#	entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/valueProcess.js
#	entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js
#	entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js
#	entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js
#	entity/Attribute_entity/entityfields/attributechildren/children/attrparentid_param/valueProcess.js
#	entity/Person_entity/Person_entity.aod
#	entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod

This reverts commit 5df656c9.

[Projekt: Entwicklung - Neon][TicketNr.: 1035771][Kontaktmanagement - Firma / Kontaktperson + Adressen / Kommunikation - Nutzung des kompletten Moduls sicherstellen]

[Projekt: Entwicklung - Neon][TicketNr.: 1035781][Attribute / Themenbaum - Nutzung des kompletten Moduls sicherstellen]

Fix 1035784

See merge request xrm/basic!20

# Conflicts:
#	entity/Document_entity/Document_entity.aod
#	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
#	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
#	language/_____LANGUAGE_en/_____LANGUAGE_en.aod

#1035776 Einstellungen von "Neuer Termin"-Dialog gehen über auf EditView wenn Klick auf "erweiterte Ansicht"