Skip to content
Snippets Groups Projects
  • David Büchler's avatar
    af4a9bcf
    Merge remote-tracking branch 'origin/master' into #1040035-Dublettenermittlung-master · af4a9bcf
    David Büchler authored
    # Conflicts:
    #	.aditoprj/project.version
    #	entity/DuplicateScannerIndexConfig_entity/DuplicateScannerIndexConfig_entity.aod
    #	entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
    #	entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
    #	entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/onValueChange.js
    #	entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/valueProcess.js
    #	entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
    #	entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildorganisationduplicatescache/onActionProcess.js
    #	entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
    #	entity/Organisation_entity/Organisation_entity.aod
    #	entity/PermissionAction_entity/PermissionAction_entity.aod
    #	entity/Person_entity/Person_entity.aod
    #	entity/Person_entity/recordcontainers/db/onDBInsert.js
    #	entity/Person_entity/recordcontainers/index/query.js
    #	neonContext/360Degree/360Degree.aod
    #	neonContext/Activity/Activity.aod
    #	neonContext/ActivityLink/ActivityLink.aod
    #	neonContext/Address/Address.aod
    #	neonContext/AddressType/AddressType.aod
    #	neonContext/AddressValidation/AddressValidation.aod
    #	neonContext/Analyses/Analyses.aod
    #	neonContext/AnyContact/AnyContact.aod
    #	neonContext/Appointment/Appointment.aod
    #	neonContext/AppointmentLink/AppointmentLink.aod
    #	neonContext/AttributeRelation/AttributeRelation.aod
    #	neonContext/BulkMail/BulkMail.aod
    #	neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
    #	neonContext/CampaignAnalysis/CampaignAnalysis.aod
    #	neonContext/CampaignCost/CampaignCost.aod
    #	neonContext/CampaignCostChart/CampaignCostChart.aod
    #	neonContext/CampaignParticipant/CampaignParticipant.aod
    #	neonContext/CampaignParticipantChart/CampaignParticipantChart.aod
    #	neonContext/Classification/Classification.aod
    #	neonContext/ClassificationAdmin/ClassificationAdmin.aod
    #	neonContext/ClassificationScore/ClassificationScore.aod
    #	neonContext/CommRestriction/CommRestriction.aod
    #	neonContext/Communication/Communication.aod
    #	neonContext/Competition/Competition.aod
    #	neonContext/Contact/Contact.aod
    #	neonContext/Context/Context.aod
    #	neonContext/Countries/Countries.aod
    #	neonContext/DSGVO/DSGVO.aod
    #	neonContext/Default_context/Default_context.aod
    #	neonContext/Document/Document.aod
    #	neonContext/DocumentTemplate/DocumentTemplate.aod
    #	neonContext/DocumentTemplateLink/DocumentTemplateLink.aod
    #	neonContext/DocumentTemplateTypeCategory/DocumentTemplateTypeCategory.aod
    #	neonContext/DuplicateScanner/DuplicateScanner.aod
    #	neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod
    #	neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod
    #	neonContext/Email/Email.aod
    #	neonContext/Employee/Employee.aod
    #	neonContext/EmployeeRole/EmployeeRole.aod
    #	neonContext/Forecast/Forecast.aod
    #	neonContext/IndexSearchContext/IndexSearchContext.aod
    #	neonContext/KeywordAttribute/KeywordAttribute.aod
    #	neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
    #	neonContext/KeywordEntry/KeywordEntry.aod
    #	neonContext/Language/Language.aod
    #	neonContext/Letter/Letter.aod
    #	neonContext/LetterRecipient/LetterRecipient.aod
    #	neonContext/LogHistory/LogHistory.aod
    #	neonContext/Member/Member.aod
    #	neonContext/ModuleTree/ModuleTree.aod
    #	neonContext/Notification/Notification.aod
    #	neonContext/Object/Object.aod
    #	neonContext/ObjectRelationType/ObjectRelationType.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/SalesprojectAnalyses/SalesprojectAnalyses.aod
    #	neonContext/SalesprojectMilestone/SalesprojectMilestone.aod
    #	neonContext/SalesprojectSource/SalesprojectSource.aod
    #	neonContext/Salutation/Salutation.aod
    #	neonContext/SalutationDistinct/SalutationDistinct.aod
    #	neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod
    #	neonContext/SerialLetter/SerialLetter.aod
    #	neonContext/Social/Social.aod
    #	neonContext/Stock/Stock.aod
    #	neonContext/SupportTicket/SupportTicket.aod
    #	neonContext/Task/Task.aod
    #	neonContext/TaskLink/TaskLink.aod
    #	neonContext/Timetracking/Timetracking.aod
    #	neonContext/Turnover/Turnover.aod
    #	neonContext/TurnoverTree/TurnoverTree.aod
    #	neonContext/UnlinkedMail/UnlinkedMail.aod
    #	neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
    #	neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod
    #	neonView/DuplicateScannerPrefilterConfigEdit_view/DuplicateScannerPrefilterConfigEdit_view.aod
    #	neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod
    #	process/DuplicateScanner_lib/process.js
    af4a9bcf
    History
    Merge remote-tracking branch 'origin/master' into #1040035-Dublettenermittlung-master
    David Büchler authored
    # Conflicts:
    #	.aditoprj/project.version
    #	entity/DuplicateScannerIndexConfig_entity/DuplicateScannerIndexConfig_entity.aod
    #	entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
    #	entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
    #	entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/onValueChange.js
    #	entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/valueProcess.js
    #	entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
    #	entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildorganisationduplicatescache/onActionProcess.js
    #	entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
    #	entity/Organisation_entity/Organisation_entity.aod
    #	entity/PermissionAction_entity/PermissionAction_entity.aod
    #	entity/Person_entity/Person_entity.aod
    #	entity/Person_entity/recordcontainers/db/onDBInsert.js
    #	entity/Person_entity/recordcontainers/index/query.js
    #	neonContext/360Degree/360Degree.aod
    #	neonContext/Activity/Activity.aod
    #	neonContext/ActivityLink/ActivityLink.aod
    #	neonContext/Address/Address.aod
    #	neonContext/AddressType/AddressType.aod
    #	neonContext/AddressValidation/AddressValidation.aod
    #	neonContext/Analyses/Analyses.aod
    #	neonContext/AnyContact/AnyContact.aod
    #	neonContext/Appointment/Appointment.aod
    #	neonContext/AppointmentLink/AppointmentLink.aod
    #	neonContext/AttributeRelation/AttributeRelation.aod
    #	neonContext/BulkMail/BulkMail.aod
    #	neonContext/CampaignAddParticipants/CampaignAddParticipants.aod
    #	neonContext/CampaignAnalysis/CampaignAnalysis.aod
    #	neonContext/CampaignCost/CampaignCost.aod
    #	neonContext/CampaignCostChart/CampaignCostChart.aod
    #	neonContext/CampaignParticipant/CampaignParticipant.aod
    #	neonContext/CampaignParticipantChart/CampaignParticipantChart.aod
    #	neonContext/Classification/Classification.aod
    #	neonContext/ClassificationAdmin/ClassificationAdmin.aod
    #	neonContext/ClassificationScore/ClassificationScore.aod
    #	neonContext/CommRestriction/CommRestriction.aod
    #	neonContext/Communication/Communication.aod
    #	neonContext/Competition/Competition.aod
    #	neonContext/Contact/Contact.aod
    #	neonContext/Context/Context.aod
    #	neonContext/Countries/Countries.aod
    #	neonContext/DSGVO/DSGVO.aod
    #	neonContext/Default_context/Default_context.aod
    #	neonContext/Document/Document.aod
    #	neonContext/DocumentTemplate/DocumentTemplate.aod
    #	neonContext/DocumentTemplateLink/DocumentTemplateLink.aod
    #	neonContext/DocumentTemplateTypeCategory/DocumentTemplateTypeCategory.aod
    #	neonContext/DuplicateScanner/DuplicateScanner.aod
    #	neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod
    #	neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod
    #	neonContext/Email/Email.aod
    #	neonContext/Employee/Employee.aod
    #	neonContext/EmployeeRole/EmployeeRole.aod
    #	neonContext/Forecast/Forecast.aod
    #	neonContext/IndexSearchContext/IndexSearchContext.aod
    #	neonContext/KeywordAttribute/KeywordAttribute.aod
    #	neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod
    #	neonContext/KeywordEntry/KeywordEntry.aod
    #	neonContext/Language/Language.aod
    #	neonContext/Letter/Letter.aod
    #	neonContext/LetterRecipient/LetterRecipient.aod
    #	neonContext/LogHistory/LogHistory.aod
    #	neonContext/Member/Member.aod
    #	neonContext/ModuleTree/ModuleTree.aod
    #	neonContext/Notification/Notification.aod
    #	neonContext/Object/Object.aod
    #	neonContext/ObjectRelationType/ObjectRelationType.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/SalesprojectAnalyses/SalesprojectAnalyses.aod
    #	neonContext/SalesprojectMilestone/SalesprojectMilestone.aod
    #	neonContext/SalesprojectSource/SalesprojectSource.aod
    #	neonContext/Salutation/Salutation.aod
    #	neonContext/SalutationDistinct/SalutationDistinct.aod
    #	neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod
    #	neonContext/SerialLetter/SerialLetter.aod
    #	neonContext/Social/Social.aod
    #	neonContext/Stock/Stock.aod
    #	neonContext/SupportTicket/SupportTicket.aod
    #	neonContext/Task/Task.aod
    #	neonContext/TaskLink/TaskLink.aod
    #	neonContext/Timetracking/Timetracking.aod
    #	neonContext/Turnover/Turnover.aod
    #	neonContext/TurnoverTree/TurnoverTree.aod
    #	neonContext/UnlinkedMail/UnlinkedMail.aod
    #	neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
    #	neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod
    #	neonView/DuplicateScannerPrefilterConfigEdit_view/DuplicateScannerPrefilterConfigEdit_view.aod
    #	neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod
    #	process/DuplicateScanner_lib/process.js
Activity.aod 1.67 KiB
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
  <name>Activity</name>
  <title>Activity</title>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <mainView>ActivityMain_view</mainView>
  <filterView>ActivityFilter_view</filterView>
  <editView>ActivityEdit_view</editView>
  <previewView>ActivityPreview_view</previewView>
  <lookupview>ActivityFilter_view</lookupview>
  <entity>Activity_entity</entity>
  <references>
    <neonViewReference>
      <name>7de980e4-39d8-4fa7-ae00-bd664e6d3cd4</name>
      <view>ActivityFilter_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>a026dad7-fa53-44b4-98c8-1d32b172e78b</name>
      <view>ActivityPreview_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>9b432ee5-c767-4c47-ad2a-66d2163557d1</name>
      <view>ActivityEdit_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>23964361-3977-4d2d-8af4-5cac94406d3d</name>
      <view>ActivityMain_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>d842dc4a-46f4-44d0-ab2e-2ff460a5aa47</name>
      <view>ActivityDetail_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>03805b3b-d037-49b3-9836-e50f2a359aec</name>
      <view>ActivityDrawer_view</view>
    </neonViewReference>
    <neonViewReference>
      <name>3884f349-be09-47bd-8930-47e0697d658f</name>
      <view>ActivityMultiEdit_view</view>
    </neonViewReference>
  </references>
</neonContext>