Amélioration cohérence infos formulaires
This commit is contained in:
parent
36f840b3c6
commit
5848d73196
3 changed files with 33 additions and 25 deletions
|
|
@ -202,7 +202,12 @@
|
|||
{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
|
||||
{{/form}}
|
||||
|
||||
{{:admin_header title="Dupliquer un mouvement" custom_css="./../style.css" current="module_equipment"}}
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{:assign mvt_label="entrée"}}
|
||||
{{else}}
|
||||
{{:assign mvt_label="sortie"}}
|
||||
{{/if}}
|
||||
{{:admin_header title="Dupliquer une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
|
||||
{{:form_errors}}
|
||||
|
||||
{{*
|
||||
|
|
@ -261,9 +266,7 @@
|
|||
}}
|
||||
{{/if}}
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{if $storage != null}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
{{/if}}
|
||||
{{: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}}
|
||||
|
|
|
|||
|
|
@ -219,7 +219,12 @@
|
|||
{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
|
||||
{{/form}}
|
||||
|
||||
{{:admin_header title="Modifier un mouvement" custom_css="./../style.css" current="module_equipment"}}
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{:assign mvt_label="entrée"}}
|
||||
{{else}}
|
||||
{{:assign mvt_label="sortie"}}
|
||||
{{/if}}
|
||||
{{:admin_header title="Modifier une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
|
||||
{{:form_errors}}
|
||||
|
||||
{{*
|
||||
|
|
@ -232,11 +237,6 @@
|
|||
{{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}}
|
||||
{{:assign var="user.%s"|args:$id value=$nom}}
|
||||
{{/select}}
|
||||
{{#load type="link" where="$$.direction="output" AND $$.temp_key = :mvt_key" :mvt_key=$mvt_new.key limit=1}}
|
||||
{{:assign retour=true}}
|
||||
{{else}}
|
||||
{{:assign retour=false}}
|
||||
{{/load}}
|
||||
{{/if}}
|
||||
|
||||
{{#load type="storage" order="$$.name"}}
|
||||
|
|
@ -274,10 +274,11 @@
|
|||
{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="entree">
|
||||
<legend>Informations facultatives</legend>
|
||||
<dl>
|
||||
{{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}}
|
||||
{{if $prop == 1 && $mvt_new.direction == "output"}}
|
||||
{{:input
|
||||
type="list"
|
||||
name="user"
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@
|
|||
<dd>{{$mvt.date|date_short}}</dd>
|
||||
<dt>Quantité</dt>
|
||||
<dd>{{$mvt.amount}}</dd>
|
||||
{{if $mvt.direction == "output" && $type_mvt != "retour"}}
|
||||
<dt>Membre destinataire</dt>
|
||||
<dd>
|
||||
{{if $mvt.user != null}}
|
||||
|
|
@ -77,6 +78,8 @@
|
|||
{{else}}—
|
||||
{{/if}}
|
||||
</dd>
|
||||
{{/if}}
|
||||
{{if $mvt.direction == "input"}}
|
||||
<dt>Lieu de stockage</dt>
|
||||
<dd>
|
||||
{{if $storage != null}}
|
||||
|
|
@ -84,6 +87,7 @@
|
|||
{{else}}—
|
||||
{{/if}}
|
||||
</dd>
|
||||
{{/if}}
|
||||
<dt>Écritures liées</dt>
|
||||
<dd>
|
||||
{{#foreach from=$mvt.transactions item="trans"}}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue