# 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

1034886 1034887 1034888 vertriebsprojekt state

See merge request xrm/basic!19

Umbenennung 1034406

See merge request xrm/basic!22

Maximilian Hofmann authored 6 years ago and Johannes Hörmann committed 6 years ago

[Projekt: Entwicklung - Neon][TicketNr.: 1034406][Klärung und Refactoring - Wie sind die Codingguidlines für View-Templates?]

Partlist

See merge request xrm/basic!23

#1035784: Translations

See merge request xrm/basic!21

[Projekt: Entwicklung - Neon][TicketNr.: 1035782][Aktivität / Aufgabe - Nutzung des kompletten Moduls sicherstellen]