Merge remote-tracking branch 'origin/master' into campaignmanagement
# Conflicts: # application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod # entity/CampaignStep_entity/CampaignStep_entity.aod # entity/CampaignStep_entity/entityfields/campaign_id/valueProcess.js # language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod # language/_____LANGUAGE_de/_____LANGUAGE_de.aod # language/_____LANGUAGE_en/_____LANGUAGE_en.aod
No related branches found
No related tags found
Showing
- .aditoprj/project.version 3 additions, 3 deletions.aditoprj/project.version
- .liquibase/Data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml 6 additions, 6 deletions...c/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
- .liquibase/Data_alias/basic/2019.2/AditoBasic/init_YesNo.xml 23 additions, 0 deletions.liquibase/Data_alias/basic/2019.2/AditoBasic/init_YesNo.xml
- .liquibase/Data_alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml 2 additions, 2 deletions...alias/basic/2019.2/Contactmanagement_added_ImageBlobs.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/ActivityCategory.xml 2 additions, 2 deletions...019.2/KeywordRelatedStructureChanges/ActivityCategory.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/AddressType.xml 2 additions, 2 deletions...sic/2019.2/KeywordRelatedStructureChanges/AddressType.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/CommunicationMedium.xml 2 additions, 2 deletions....2/KeywordRelatedStructureChanges/CommunicationMedium.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/OfferProbability.xml 2 additions, 2 deletions...019.2/KeywordRelatedStructureChanges/OfferProbability.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml 2 additions, 2 deletions...dRelatedStructureChanges/SalesProjectCompetitionPhase.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml 2 additions, 2 deletions...19.2/KeywordRelatedStructureChanges/SalesProjectPhase.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml 2 additions, 2 deletions...wordRelatedStructureChanges/SalesProjectPricePolitics.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectState.xml 2 additions, 2 deletions...19.2/KeywordRelatedStructureChanges/SalesProjectState.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectStrength.xml 2 additions, 2 deletions...2/KeywordRelatedStructureChanges/SalesProjectStrength.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml 2 additions, 2 deletions...2/KeywordRelatedStructureChanges/SalesProjectWeakness.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml 2 additions, 2 deletions...dRelatedStructureChanges/SalesprojectCompetitionState.xml
- .liquibase/Data_alias/basic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml 2 additions, 2 deletions...ic/2019.2/KeywordRelatedStructureChanges/TaskPriority.xml
- .liquibase/Data_alias/basic/2019.2/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml 168 additions, 0 deletions...Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
- .liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TaskType_Task.xml 98 additions, 0 deletions...as/basic/2019.2/Ticketmanagement/insert_TaskType_Task.xml
- .liquibase/Data_alias/basic/2019.2/Ticketmanagement/insert_TicketStatus_Task.xml 107 additions, 0 deletions...asic/2019.2/Ticketmanagement/insert_TicketStatus_Task.xml
- .liquibase/Data_alias/basic/2019.2/Ticketmanagement/update_TaskStatus_add_icon.xml 36 additions, 0 deletions...ic/2019.2/Ticketmanagement/update_TaskStatus_add_icon.xml
Please register or sign in to comment