Merge branch '2020.1' into '2020.1.0_OrderRefactoring'

# Conflicts: # .liquibase/Data_alias/basic/2020.1.2/changelog.xml

Merge branch '2020.1' into '2020.1.0_OrderRefactoring'
b87c497c · Alexander Vögl · 8f497347 · ad84517f · b87c497c · b87c497c
Commit b87c497c authored 4 years ago by Alexander Vögl
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
--- a/neonContext/CampaignStep/CampaignStep.aod
+++ b/neonContext/CampaignStep/CampaignStep.aod
--- a/neonContext/Product/Product.aod
+++ b/neonContext/Product/Product.aod
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
--- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
--- a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
+++ b/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
--- a/neonView/ProductLookup_view/ProductLookup_view.aod
+++ b/neonView/ProductLookup_view/ProductLookup_view.aod
--- a/neonView/ProductLookup_view/documentation.adoc
+++ b/neonView/ProductLookup_view/documentation.adoc
--- a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
+++ b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
--- a/process/DocxTemplater_lib/process.js
+++ b/process/DocxTemplater_lib/process.js
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js