Skip to content
Snippets Groups Projects
  1. Jul 03, 2019
    • David Büchler's avatar
      Beim Updaten von Kampagnenteilnehmern werden nun die gleichen Nachrichten... · 0adece9c
      David Büchler authored
      Beim Updaten von Kampagnenteilnehmern werden nun die gleichen Nachrichten angezeigt, wie beim Hinzufügen.
      Die let condition im onInsert wenn if(isUpdate == "true") prüft nun sowohl auf die ContactId als auch die ParticipantId. Dies kommt daher, dass an allen Stellen die ContactId genutzt wird, bis auf im FilterView der Teilnehmer. Hier wird immer die TeilnehmerId selektiert
      Update Action im CampaignParticipant entity wurde um Filter-Condition Funktionalität erweitert
      0adece9c
  2. Jul 02, 2019
  3. Jun 25, 2019
    • David Büchler's avatar
      Merge remote-tracking branch 'origin/master' into campaignmanagement · 7dfc0efe
      David Büchler authored
      # Conflicts:
      #	entity/Attribute_entity/Attribute_entity.aod
      #	entity/Employee_entity/Employee_entity.aod
      #	entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
      #	entity/ObjectTree_entity/ObjectTree_entity.aod
      #	entity/Order_entity/Order_entity.aod
      #	neonContext/Salesproject/Salesproject.aod
      #	neonView/SalesprojectMain_view/SalesprojectMain_view.aod
      7dfc0efe
  4. Jun 24, 2019
  5. Jun 21, 2019
  6. Jun 19, 2019
    • Sophia Leierseder's avatar
      improvement icon comm restriction · ea0b9c90
      Sophia Leierseder authored
      ea0b9c90
    • Johannes Goderbauer's avatar
      ac5eca5f
    • Sophia Leierseder's avatar
      different colors for comm restriction · e30e6a75
      Sophia Leierseder authored
      e30e6a75
    • Andre Loreth's avatar
      e3ba8811
    • S.Listl's avatar
      Replacing placeholders for bulk mails · f67419c6
      S.Listl authored
      f67419c6
    • David Büchler's avatar
      Merge remote-tracking branch 'origin/master' into campaignmanagement · 96b8e181
      David Büchler authored
      # Conflicts:
      #	.aditoprj/project.version
      #	aliasDefinition/Data_alias/Data_alias.aod
      #	aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
      #	application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
      #	entity/360Degree_entity/360Degree_entity.aod
      #	entity/ActivityLink_entity/ActivityLink_entity.aod
      #	entity/Activity_entity/Activity_entity.aod
      #	entity/AddressType_entity/AddressType_entity.aod
      #	entity/AddressValidation_entity/AddressValidation_entity.aod
      #	entity/Address_entity/Address_entity.aod
      #	entity/Analyses_entity/Analyses_entity.aod
      #	entity/AnyContact_entity/AnyContact_entity.aod
      #	entity/AppointmentLink_entity/AppointmentLink_entity.aod
      #	entity/Appointment_entity/Appointment_entity.aod
      #	entity/AttributeRelation_entity/AttributeRelation_entity.aod
      #	entity/AttributeUsage_entity/AttributeUsage_entity.aod
      #	entity/Attribute_entity/Attribute_entity.aod
      #	entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
      #	entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
      #	entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
      #	entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
      #	entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
      #	entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
      #	entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
      #	entity/CampaignParticipant_entity/entityfields/advertisingban_icon/valueProcess.js
      #	entity/CampaignStep_entity/CampaignStep_entity.aod
      #	entity/Campaign_entity/Campaign_entity.aod
      #	entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
      #	entity/ClassificationScore_entity/ClassificationScore_entity.aod
      #	entity/ClassificationType_entity/ClassificationType_entity.aod
      #	entity/Classification_entity/Classification_entity.aod
      #	entity/CommRestriction_Entity/CommRestriction_Entity.aod
      #	entity/Communication_entity/Communication_entity.aod
      #	entity/Competition_entity/Competition_entity.aod
      #	entity/Contact_entity/Contact_entity.aod
      #	entity/Context_entity/Context_entity.aod
      #	entity/Contract_entity/Contract_entity.aod
      #	entity/Countries_Entity/Countries_Entity.aod
      #	entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
      #	entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
      #	entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
      #	entity/Document_entity/Document_entity.aod
      #	entity/Email_entity/Email_entity.aod
      #	entity/EmployeeRole_entity/EmployeeRole_entity.aod
      #	entity/Employee_entity/Employee_entity.aod
      #	entity/Forecast_entity/Forecast_entity.aod
      #	entity/Gender_keyword/Gender_keyword.aod
      #	entity/IndexSearchEntity/IndexSearchEntity.aod
      #	entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
      #	entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
      #	entity/KeywordEntry_entity/KeywordEntry_entity.aod
      #	entity/Language_entity/Language_entity.aod
      #	entity/Letter_entity/Letter_entity.aod
      #	entity/LogHistory_entity/LogHistory_entity.aod
      #	entity/Member_entity/Member_entity.aod
      #	entity/ModuleTree_entity/ModuleTree_entity.aod
      #	entity/Notification_entity/Notification_entity.aod
      #	entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
      #	entity/ObjectTree_entity/ObjectTree_entity.aod
      #	entity/Object_entity/Object_entity.aod
      #	entity/Offer_entity/Offer_entity.aod
      #	entity/Offeritem_entity/Offeritem_entity.aod
      #	entity/Options_Entity/Options_Entity.aod
      #	entity/Order_entity/Order_entity.aod
      #	entity/Orderitem_entity/Orderitem_entity.aod
      #	entity/Organisation_entity/Organisation_entity.aod
      #	entity/PermissionDetail_entity/PermissionDetail_entity.aod
      #	entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
      #	entity/PermissionOverview_entity/PermissionOverview_entity.aod
      #	entity/Person_entity/Person_entity.aod
      #	entity/Prod2prod_entity/Prod2prod_entity.aod
      #	entity/Product_entity/Product_entity.aod
      #	entity/Productprice_entity/Productprice_entity.aod
      #	entity/Role_entity/Role_entity.aod
      #	entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
      #	entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
      #	entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
      #	entity/Salesproject_entity/Salesproject_entity.aod
      #	entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
      #	entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
      #	entity/Salutation_entity/Salutation_entity.aod
      #	entity/Social_entity/Social_entity.aod
      #	entity/Stock_entity/Stock_entity.aod
      #	entity/TaskLink_entity/TaskLink_entity.aod
      #	entity/Task_entity/Task_entity.aod
      #	entity/Timetracking_entity/Timetracking_entity.aod
      #	entity/TurnoverTree_entity/TurnoverTree_entity.aod
      #	entity/Turnover_entity/Turnover_entity.aod
      #	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
      #	language/_____LANGUAGE_de/_____LANGUAGE_de.aod
      #	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
      #	neonContext/Classification/Classification.aod
      #	neonContext/Salesproject/Salesproject.aod
      #	neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod
      #	neonView/LetterEdit_view/LetterEdit_view.aod
      #	neonView/OfferEdit_view/OfferEdit_view.aod
      #	neonView/OfferFilter_view/OfferFilter_view.aod
      #	neonView/OrderFilter_view/OrderFilter_view.aod
      #	neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
      #	neonView/SalesprojectMain_view/SalesprojectMain_view.aod
      #	neonView/SalesprojectOfferForecastChart_view/SalesprojectOfferForecastChart_view.aod
      #	neonView/TaskFilter_view/TaskFilter_view.aod
      96b8e181
    • David Büchler's avatar
      19eb89cb
    • David Büchler's avatar
      Siblings wurden eingefügt, dass sich entsprechende Teile im... · bde39a6e
      David Büchler authored
      Siblings wurden eingefügt, dass sich entsprechende Teile im Kampagnenmanagement korrekt aktualisieren.
      Die fehlende var wurde wieder eingefügt
      bde39a6e
    • David Büchler's avatar
      Erste Implementierung Member · 77aff4c9
      David Büchler authored
      Kampagnenplanung
      Abhängigkeiten eingefügt
      77aff4c9
    • Johannes Hörmann's avatar
    • Johannes Hörmann's avatar
      17e21540
    • Tobias Feldmann's avatar
      Document_entity insertBinary with uid · 3b258521
      Tobias Feldmann authored
      3b258521
  7. Jun 18, 2019
Loading