Carolin Wimmer authored 3 years ago and Benjamin Ulrich committed 3 years ago

[Projekt: xRM-Sales][TicketNr.: 1079788][Besuchsvorschlag - Erweiterung der FilterView um die Kartendarstellung analog in der Firma]

This reverts merge request !1011

Carolin Wimmer authored 3 years ago and Sebastian Pongratz committed 3 years ago

[Projekt: xRM-Sales][TicketNr.: 1079788][Besuchsvorschlag - Erweiterung der FilterView um die Kartendarstellung analog in der Firma]

Benjamin Ulrich authored 4 years ago and Johannes Goderbauer committed 4 years ago

[Projekt: Entwicklung - Neon][TicketNr.: 1052660][Übernahme der "Besuch vor Ort"-Implentierung aus dem Vorwerk system]

Updated version of DuplicateScanner_lib

set lookup-views of several contexts # Conflicts: #	neonContext/CommRestriction/CommRestriction.aod #	neonContext/DistList/DistList.aod #	neonContext/DistListMember/DistListMember.aod #	neonContext/ImportField/ImportField.aod #	neonContext/Lead/Lead.aod #	neonContext/LeadTemp/LeadTemp.aod #	neonContext/LetterRecipient/LetterRecipient.aod #	neonContext/PermissionAction/PermissionAction.aod #	neonContext/QuickEntry/QuickEntry.aod
# Conflicts:
#	neonContext/Activity/Activity.aod
#	neonContext/ActivityLink/ActivityLink.aod
#	neonContext/Appointment/Appointment.aod
#	neonContext/AppointmentLink/AppointmentLink.aod
#	neonContext/BulkMail/BulkMail.aod
#	neonContext/CampaignCost/CampaignCost.aod
#	neonContext/CampaignParticipant/CampaignParticipant.aod
#	neonContext/CommRestriction/CommRestriction.aod
#	neonContext/Communication/Communication.aod
#	neonContext/Competition/Competition.aod
#	neonContext/Contact/Contact.aod
#	neonContext/DSGVO/DSGVO.aod
#	neonContext/Document/Document.aod
#	neonContext/DuplicateScanner/DuplicateScanner.aod
#	neonContext/Forecast/Forecast.aod
#	neonContext/KeywordAttribute/KeywordAttribute.aod
#	neonContext/LetterRecipient/LetterRecipient.aod
#	neonContext/LogHistory/LogHistory.aod
#	neonContext/Member/Member.aod
#	neonContext/Notification/Notification.aod
#	neonContext/ObjectTree/ObjectTree.aod
#	neonContext/Offeritem/Offeritem.aod
#	neonContext/Orderitem/Orderitem.aod
#	neonContext/PermissionAction/PermissionAction.aod
#	neonContext/PermissionDetail/PermissionDetail.aod
#	neonContext/PermissionMetaData/PermissionMetaData.aod
#	neonContext/PermissionOverview/PermissionOverview.aod
#	neonContext/Prod2prod/Prod2prod.aod
#	neonContext/Productprice/Productprice.aod
#	neonContext/QuickEntry/QuickEntry.aod
#	neonContext/Role/Role.aod
#	neonContext/SalesprojectSource/SalesprojectSource.aod
#	neonContext/SerialLetter/SerialLetter.aod
#	neonContext/Stock/Stock.aod
#	neonContext/SupportTicket/SupportTicket.aod
#	neonContext/Task/Task.aod
#	neonContext/TaskLink/TaskLink.aod
#	neonContext/Timetracking/Timetracking.aod
#	neonContext/UnlinkedMail/UnlinkedMail.aod

[Projekt: Entwicklung - Neon][TicketNr.: 1034075][Renaming: entity-dfi/dfo, Context und DB-Tabellen]

[Projekt: Entwicklung - Neon][TicketNr.: 1034075][Renaming: entity-dfi/dfo, Context und DB-Tabellen]

Conflicts:
	entity/Contract_entity/Contract_entity.aod