diff --git a/templates/Dossier/detailLogboek.html.twig b/templates/Dossier/detailLogboek.html.twig
index 3682ce65..694331d1 100644
--- a/templates/Dossier/detailLogboek.html.twig
+++ b/templates/Dossier/detailLogboek.html.twig
@@ -66,6 +66,9 @@
{% if log.name == 'dossier_aangemaakt' %}
Dossier aangemaakt
{% endif %}
+ {% if log.name == 'dossier_send_to_allegro' %}
+ Dossier verzonden naar allegro
+ {% endif %}
{% if log.name == 'dossier_geopened' %}
Dossier geopend: {% if log.dossier is defined %}
{% if log.dossier.clientNaam is defined %}
diff --git a/templates/Dossier/detailSchulden.html.twig b/templates/Dossier/detailSchulden.html.twig
index fed694fb..f8256261 100644
--- a/templates/Dossier/detailSchulden.html.twig
+++ b/templates/Dossier/detailSchulden.html.twig
@@ -11,18 +11,17 @@
{% include 'Dossier/partial.dossierHeader.html.twig' with {'dossier': dossier, 'active': 'schulden'} only %}
{{ form_start(form, {'attr': {'id': 'schulden_form', 'data-submitter': 'save', 'data-result-selector': '#schulden_form', 'data-changer': 'change', 'novalidate':'novalidate', 'autocomplete': 'off'}}) }}
- {% if dossier.isInPrullenbak %}
{{ form_row(form.arbeidsovereenkomstWerkgever) }}
+ {{ form_row(form.arbeidsovereenkomstEinddatum) }}
{{ form_row(form.arbeidsovereenkomstContract, {'attr': {'form_row_class': 'form-row__wide form-row--no-label-margin', 'class': 'radio-group radio-group__vertical'}}) }}
Dienstverband partner
{{ form_row(form.arbeidsovereenkomstPartnerWerkgever) }}
+ {{ form_row(form.arbeidsovereenkomstPartnerEinddatum) }}
{{ form_row(form.arbeidsovereenkomstPartnerContract, {'attr': {'form_row_class': 'form-row__wide form-row--no-label-margin', 'class': 'radio-group radio-group__vertical'}}) }}
{% include 'partial.files-container.html.twig' with {'form_elm': form.file, 'defaultDocumentNaam': 'Arbeidsovereenkomst'} only %}
{% include 'partial.files-list.html.twig' with {'dossierDocumenten': dossierDocumenten, 'removeFile': form.removeFile} only %}
diff --git a/templates/Dossier/partial.voorleggerSchuldenoverzicht.html.twig b/templates/Dossier/partial.voorleggerSchuldenoverzicht.html.twig
index 661d6125..0a7a5459 100644
--- a/templates/Dossier/partial.voorleggerSchuldenoverzicht.html.twig
+++ b/templates/Dossier/partial.voorleggerSchuldenoverzicht.html.twig
@@ -53,7 +53,7 @@
{% set empty = false %}
|
- {{ schuldItem.schuldeiser|default('-') }} {% if schuldItem.incassant %}/{% endif %} {{ schuldItem.incassant }}
+ {{ schuldItem.schuldeiser|default('-') }} {% if schuldItem.incassant %}/{% endif %} {{ schuldItem.incassant }}
|
{{ schuldItem.referentie }} |
{{ schuldItem.type }} |
diff --git a/templates/Allegro/allegro_srveisers.html.twig b/templates/allegro/allegro_srveisers.html.twig
similarity index 88%
rename from templates/Allegro/allegro_srveisers.html.twig
rename to templates/allegro/allegro_srveisers.html.twig
index 0ad7cafa..5e8be50b 100644
--- a/templates/Allegro/allegro_srveisers.html.twig
+++ b/templates/allegro/allegro_srveisers.html.twig
@@ -36,6 +36,10 @@
€ {{ srvEisers.SomTeruggemeldBedrag|number_format(2, ',', '.') }}
Som berekend bedrag
€ {{ srvEisers.SomBerekendBedrag|number_format(2, ',', '.') }}
+ {% if aanvraag is not null %}
+ Netto afloscapaciteit
+ € {{ aanvraag.NettoAfloscapaciteit|number_format(2, ',', '.') }}
+ {% endif %}
@@ -51,7 +55,7 @@
{{ eiser.NaamEiser }}
Referentie
{{ eiser.Referentie }}
- Code schuldeiser (Allegro)
+ Code schuldeiser
{{ eiser.CodeEiser }}
Status saldo opgave
{{ eiser.IndicatieOpgaaf }}
@@ -61,6 +65,10 @@
+ -
+ -
+ -
+ -
- Schuldregeling
- {{ eiser.IndicatieSK ? 'Saneringskrediet' : 'Schuldbemiddeling' }}
- Status voorstel
diff --git a/templates/mails/notifyAboutCorrespondentie.html.twig b/templates/mails/notifyAboutCorrespondentie.html.twig
index 65994e6b..4ccfc590 100644
--- a/templates/mails/notifyAboutCorrespondentie.html.twig
+++ b/templates/mails/notifyAboutCorrespondentie.html.twig
@@ -1,5 +1,5 @@
{% block subject -%}
- Nieuwe post van de kredietbank (GKA via Schulddossier)
+ Nieuwe post van de kredietbank (GKA via Schulddossier) [{{ dossier.id }}]
{%- endblock %}
{% block html -%}
diff --git a/templates/mails/notifyAddedAantekeningMadi.html.twig b/templates/mails/notifyAddedAantekeningMadi.html.twig
index 1d98b160..6b1165b3 100644
--- a/templates/mails/notifyAddedAantekeningMadi.html.twig
+++ b/templates/mails/notifyAddedAantekeningMadi.html.twig
@@ -1,5 +1,5 @@
{% block subject -%}
- Aantekening toegevoegd aan dossier (GKA via Schulddosier)
+ Aantekening toegevoegd aan dossier (GKA via Schulddosier) [{{ dossier.id }}]
{%- endblock %}
{% block html -%}
diff --git a/templates/mails/notifyAfkeurenGka.html.twig b/templates/mails/notifyAfkeurenGka.html.twig
index e2972f8c..d6f0f3ba 100644
--- a/templates/mails/notifyAfkeurenGka.html.twig
+++ b/templates/mails/notifyAfkeurenGka.html.twig
@@ -1,5 +1,5 @@
{% block subject -%}
- Dossier afgekeurd (GKA via Schulddossier)
+ Dossier afgekeurd (GKA via Schulddossier) [{{ dossier.id }}]
{%- endblock %}
{% block html -%}
diff --git a/templates/mails/notifyAfkeurenMadi.html.twig b/templates/mails/notifyAfkeurenMadi.html.twig
index 0c525110..eae7d9cb 100644
--- a/templates/mails/notifyAfkeurenMadi.html.twig
+++ b/templates/mails/notifyAfkeurenMadi.html.twig
@@ -1,5 +1,5 @@
{% block subject -%}
- Dossier afgekeurd (Schulddossier)
+ Dossier afgekeurd (Schulddossier) [{{ dossier.id }}]
{%- endblock %}
{% block html -%}
diff --git a/templates/mails/notifyChangedGka.html.twig b/templates/mails/notifyChangedGka.html.twig
index d3acfcd0..2b5fcc00 100644
--- a/templates/mails/notifyChangedGka.html.twig
+++ b/templates/mails/notifyChangedGka.html.twig
@@ -1,5 +1,5 @@
{% block subject -%}
- Schulddossier aangepast ({{ dossier.getSchuldhulpbureau().getNaam() }} via Schulddossier)
+ Schulddossier aangepast ({{ dossier.getSchuldhulpbureau().getNaam() }} via Schulddossier) [{{ dossier.id }}]
{%- endblock %}
{% block html -%}
diff --git a/templates/mails/notifyGoedkeurenMadi.html.twig b/templates/mails/notifyGoedkeurenMadi.html.twig
index fd5aee99..ea79368e 100644
--- a/templates/mails/notifyGoedkeurenMadi.html.twig
+++ b/templates/mails/notifyGoedkeurenMadi.html.twig
@@ -1,5 +1,5 @@
{% block subject -%}
- Dossier goedgekeurd (Schulddossier)
+ Dossier goedgekeurd (Schulddossier) [{{ dossier.id }}]
{%- endblock %}
{% block html -%}
diff --git a/templates/mails/notifyOpgevoerdMadi.html.twig b/templates/mails/notifyOpgevoerdMadi.html.twig
index cdb6fe2e..d77b0bdf 100644
--- a/templates/mails/notifyOpgevoerdMadi.html.twig
+++ b/templates/mails/notifyOpgevoerdMadi.html.twig
@@ -1,5 +1,5 @@
{% block subject -%}
- Nieuw schulddossier (Schulddossier)
+ Nieuw schulddossier (Schulddossier) [{{ dossier.id }}]
{%- endblock %}
{% block html -%}
diff --git a/templates/mails/notifyVerzendenMadi.html.twig b/templates/mails/notifyVerzendenMadi.html.twig
index 6a0d4b83..b703ae49 100644
--- a/templates/mails/notifyVerzendenMadi.html.twig
+++ b/templates/mails/notifyVerzendenMadi.html.twig
@@ -1,5 +1,5 @@
{% block subject -%}
- Nieuw schulddossier ({{ dossier.getSchuldhulpbureau().getNaam() }} via Schulddossier)
+ Nieuw schulddossier ({{ dossier.getSchuldhulpbureau().getNaam() }} via Schulddossier) [{{ dossier.id }}]
{%- endblock %}
{% block html -%}
diff --git a/templates/master.html.twig b/templates/master.html.twig
index 89c6125d..b0c85c2c 100644
--- a/templates/master.html.twig
+++ b/templates/master.html.twig
@@ -112,5 +112,6 @@
+ {% block javascripts %}{% endblock %}