From 09fa44e6aa3a1c4fd995ae687304141ce9172e36 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Fri, 31 Oct 2025 09:26:35 +0100 Subject: [PATCH] =?UTF-8?q?Autoriser=20attachement=20=C3=A9critures=20aux?= =?UTF-8?q?=20sorties=20sauf=20retours?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- movements/copy_movement.html | 6 +++--- movements/input_equipment.html | 2 +- movements/modify_movement.html | 6 +++--- movements/output_equipment.html | 7 +++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/movements/copy_movement.html b/movements/copy_movement.html index 880b774..4c68f63 100644 --- a/movements/copy_movement.html +++ b/movements/copy_movement.html @@ -278,9 +278,9 @@ {{/if}} {{if $mvt_new.direction == "input"}} {{:input type="select" name="storage" default=$mvt_new.storage label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}} - {{if $type_mvt != "retour"}} - {{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}} - {{/if}} + {{/if}} + {{if $type_mvt != "retour"}} + {{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}} {{/if}} {{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}} {{if $mvt_new.direction == "output" && $type_mvt == "temporaire"}} diff --git a/movements/input_equipment.html b/movements/input_equipment.html index deff4cc..f98294a 100644 --- a/movements/input_equipment.html +++ b/movements/input_equipment.html @@ -42,7 +42,7 @@ {{:assign var="equipment.notowned" value="%d+%d"|math:$equipment.notowned:$_POST.amount|intval}} {{/if}} - {{* documents liés *}} + {{* écritures liées *}} {{#foreach from=$_POST.transactions item="value"}} {{:assign var="transactions." value=$value|intval}} {{/foreach}} diff --git a/movements/modify_movement.html b/movements/modify_movement.html index 67e9601..ce5eebd 100644 --- a/movements/modify_movement.html +++ b/movements/modify_movement.html @@ -304,9 +304,9 @@ {{if $storage != null}} {{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}} {{/if}} - {{if $type_mvt != "retour"}} - {{:input type="list" name="transactions" default=$mvt_new.transactions label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}} - {{/if}} + {{/if}} + {{if $type_mvt != "retour"}} + {{:input type="list" name="transactions" default=$mvt_new.transactions label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}} {{/if}} {{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}} {{if $mvt_new.direction == "output" && $type_mvt == "temporaire"}} diff --git a/movements/output_equipment.html b/movements/output_equipment.html index 0db44ed..38be7d5 100644 --- a/movements/output_equipment.html +++ b/movements/output_equipment.html @@ -126,6 +126,11 @@ {{:assign var="equipment.out" value="%d+%d"|math:$equipment.out:$_POST.amount|intval}} {{/if}} + {{* écritures liées *}} + {{#foreach from=$_POST.transactions item="value"}} + {{:assign var="transactions." value=$value|intval}} + {{/foreach}} + {{:save key=$equipment.key validate_schema="../equipment.schema.json" @@ -152,6 +157,7 @@ comment=$_POST.remarques|trim user=$user.id return_date=$return_date|parse_date + transactions=$transactions }} {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}} {{/form}} @@ -205,6 +211,7 @@ multiple=true max=1 }} + {{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}} {{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}} {{:input id="set_return_date" type="checkbox" value=1 name="set_return_date" label="Fixer une date de retour" help="Cocher pour fixer une date de retour"}}