diff --git a/frontend/pages/reception/update/[[id]].vue b/frontend/pages/reception/update/[[id]].vue index 0236a9f..40b19af 100644 --- a/frontend/pages/reception/update/[[id]].vue +++ b/frontend/pages/reception/update/[[id]].vue @@ -4,7 +4,7 @@
- +

Réception {{ form.identificationNumber }}

@@ -694,7 +694,6 @@ async function validate() { isValidBovin.value = false isValidMerchandise.value = false - await router.push("/reception/finish-reception") return } } diff --git a/templates/reception_voucher.html.twig b/templates/reception_voucher.html.twig index 138fbc4..352e998 100644 --- a/templates/reception_voucher.html.twig +++ b/templates/reception_voucher.html.twig @@ -220,9 +220,15 @@ + {% if reception.receptionType and reception.receptionType.code == 'BOVINS' %} Type de bovins + {% else %} + + Type de marchandises + + {% endif %}

@@ -263,6 +269,9 @@

Aucun dépôt de granulés renseigné.

{% endfor %} {% else %} + {% if reception.merchandiseType %} +

{{ reception.merchandiseType.label }}

+ {% endif %} {% set buildingLabels = [] %} {% for building in reception.buildings|default([]) %} {% set buildingLabels = buildingLabels|merge([building.label]) %}