Retour de sortie temporaire : correction erreur membre
This commit is contained in:
parent
11d4946b92
commit
6c5ea7e064
@ -204,6 +204,12 @@
|
|||||||
}}
|
}}
|
||||||
|
|
||||||
{{* enregistrer le mouvement modifié *}}
|
{{* enregistrer le mouvement modifié *}}
|
||||||
|
{{if $user == null}}
|
||||||
|
{{:assign user_id=$mvt_new.user}}
|
||||||
|
{{else}}
|
||||||
|
{{:assign user_id=$user.id}}
|
||||||
|
{{/if}}
|
||||||
|
|
||||||
{{:save
|
{{:save
|
||||||
key=$_GET.key
|
key=$_GET.key
|
||||||
validate_schema="movement.schema.json"
|
validate_schema="movement.schema.json"
|
||||||
@ -214,7 +220,7 @@
|
|||||||
equipment=$eqpmt_key
|
equipment=$eqpmt_key
|
||||||
date=$mvt_new.date
|
date=$mvt_new.date
|
||||||
comment=$mvt_new.comment
|
comment=$mvt_new.comment
|
||||||
user=$user.id
|
user=$user_id
|
||||||
storage=$_POST.storage
|
storage=$_POST.storage
|
||||||
}}
|
}}
|
||||||
{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
|
{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
|
||||||
@ -228,13 +234,17 @@
|
|||||||
-------------------- Préparer la saisie --------------------
|
-------------------- Préparer la saisie --------------------
|
||||||
*}}
|
*}}
|
||||||
|
|
||||||
{{* récupérer les infos de la catégorie *}}
|
|
||||||
{{#load key=$equipment.category assign="category"}}{{/load}}
|
{{#load key=$equipment.category assign="category"}}{{/load}}
|
||||||
|
|
||||||
{{if $mvt_new.user != null}}
|
{{if $mvt_new.user != null}}
|
||||||
{{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}}
|
{{#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}}
|
{{:assign var="user.%s"|args:$id value=$nom}}
|
||||||
{{/select}}
|
{{/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}}
|
{{/if}}
|
||||||
|
|
||||||
{{#load type="storage" order="$$.name"}}
|
{{#load type="storage" order="$$.name"}}
|
||||||
@ -253,7 +263,7 @@
|
|||||||
{{/if}}
|
{{/if}}
|
||||||
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
|
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
|
||||||
{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
|
{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
|
||||||
{{if $prop == 1 && $mvt_new.direction == "output"}}
|
{{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}}
|
||||||
{{:input
|
{{:input
|
||||||
type="list"
|
type="list"
|
||||||
name="user"
|
name="user"
|
||||||
|
Loading…
Reference in New Issue
Block a user