Merge remote-tracking branch 'origin/master' into issue491_thirdparty_edit_modal

This commit is contained in:
2022-03-23 15:53:55 +01:00
62 changed files with 1014 additions and 176 deletions

View File

@@ -60,7 +60,7 @@
{% if types|length > 0 %}
{{ types|join(', ') }}
{% else %}
<p class="chill-no-data-statement">{{ 'thirdParty.Any categories' }}</p>
<p class="chill-no-data-statement">{{ 'thirdparty.no_categories'|trans }}</p>
{% endif %}
</dd>
@@ -110,7 +110,7 @@
<dt>{{ 'Contacts'|trans }}</dt>
<dd>
{% if thirdParty.activeChildren|length == 0 %}
<p class="chill-no-data-statement">{{ 'Any contacts associated'|trans }}</p>
<p class="chill-no-data-statement">{{ 'No contacts associated'|trans }}</p>
{% else %}
<div class="flex-table">
{% for tp in thirdParty.activeChildren %}