diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig
index 82f4bf37..b0612370 100644
--- a/trunk/app/Resources/views/default/pages/booking.html.twig
+++ b/trunk/app/Resources/views/default/pages/booking.html.twig
@@ -235,12 +235,23 @@
{{ travel_program_service|raw }}
{% endfor %}
- Hinweise
-
- {% for travel_program_service in travel_program.advices|split('\n') %}
- - {{ travel_program_service|raw }}
- {% endfor %}
-
+ {% if (travel_program.advices is not empty) or (travel_program.generalnote is not empty) %}
+ Hinweise
+
+ {% if travel_program.generalnote is not empty %}
+ {% for notes in travel_program.generalnote.text|trim|split('\n') %}
+ {% if notes is not empty %}
+ - {{ notes|raw }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ {% for travel_program_advice in travel_program.advices|trim|split('\n') %}
+ {% if travel_program_advice is not empty %}
+ - {{ travel_program_advice|raw }}
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
diff --git a/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig b/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig
index 138936b5..52e4228f 100644
--- a/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig
+++ b/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig
@@ -97,12 +97,23 @@
{{ travel_program_service|raw }}
{% endfor %}
- Hinweise
-
- {% for travel_program_service in travel_program.advices|split('\n') %}
- - {{ travel_program_service|raw }}
- {% endfor %}
-
+ {% if (travel_program.advices is not empty) or (travel_program.generalnote is not empty) %}
+ Hinweise
+
+ {% if travel_program.generalnote is not empty %}
+ {% for notes in travel_program.generalnote.text|trim|split('\n') %}
+ {% if notes is not empty %}
+ - {{ notes|raw }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ {% for travel_program_advice in travel_program.advices|trim|split('\n') %}
+ {% if travel_program_advice is not empty %}
+ - {{ travel_program_advice|raw }}
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
diff --git a/trunk/app/Resources/views/default/pages/cms/travelProgramPDF.html.twig b/trunk/app/Resources/views/default/pages/cms/travelProgramPDF.html.twig
index f2234397..8531b40e 100644
--- a/trunk/app/Resources/views/default/pages/cms/travelProgramPDF.html.twig
+++ b/trunk/app/Resources/views/default/pages/cms/travelProgramPDF.html.twig
@@ -23,11 +23,20 @@
{% endif %}
-{% if travel_program.advices is not empty %}
+{% if (travel_program.advices is not empty) or (travel_program.generalnote is not empty) %}
Hinweise
+ {% if travel_program.generalnote is not empty %}
+ {% for notes in travel_program.generalnote.text|trim|split('\n') %}
+ {% if notes is not empty %}
+ - {{ notes|raw }}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
{% for travel_program_advice in travel_program.advices|trim|split('\n') %}
+ {% if travel_program_advice is not empty %}
- {{ travel_program_advice|raw }}
+ {% endif %}
{% endfor %}
-{% endif %}
+{% endif %}
\ No newline at end of file