lesanges/equipment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

correction erreur retour de sortie temporaire

Browse Source
This commit is contained in:
Jean-Christophe Engel 2025-03-27 11:38:43 +01:00
parent 610af4e6a8
commit c6177b4438
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mouvements/dupliquer_mouvement.html
View File

@ -96,13 +96,18 @@
order="$$.date"
assign="movement"
}}
{{if! $insere}}
{{if
$mvt_new.direction == "input" && $date >= $mvt_new.date ||
$mvt_new.direction == "output" && $date > $mvt_new.date
}}
{{if ! $insere}}
{{if $mvt_new.date < $date}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{elseif $mvt_new.date == $date}}
{{if $mvt_new.direction == "input" && $type_mvt != "retour"}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{elseif $mvt_new.direction == "output" && $type_mvt == "temporaire"}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{/if}}
{{/if}}
{{/if}}
{{:assign var="movements_new." from=movement}}

16
mouvements/entrees/retour.html
View File

@ -35,6 +35,7 @@
{{:assign var="mvt_new.date" value=$_POST.date|parse_date}}
{{:assign var="mvt_new.operation" value=$_POST.operation}}
{{:assign var="mvt_new.amount" value=$_POST.amount}}
{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt_new.direction:$mvt_new.operation}}
{{*
lister les mouvements
@ -50,13 +51,18 @@
order="$$.date"
assign="movement"
}}
{{if! $insere}}
{{if
$mvt_new.direction == "input" && $date >= $mvt_new.date ||
$mvt_new.direction == "output" && $date > $mvt_new.date
}}
{{if ! $insere}}
{{if $mvt_new.date < $date}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{elseif $mvt_new.date == $date}}
{{if $mvt_new.direction == "input" && $type_mvt != "retour"}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{elseif $mvt_new.direction == "output" && $type_mvt == "temporaire"}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{/if}}
{{/if}}
{{/if}}
{{:assign var="movements_new." from=movement}}

15
mouvements/modifier_mouvement.html
View File

@ -86,13 +86,18 @@
assign="movement"
}}
{{if $key != $_GET.key}}
{{if! $insere}}
{{if
$mvt_new.direction == "input" && $date >= $mvt_new.date ||
$mvt_new.direction == "output" && $date > $mvt_new.date
}}
{{if ! $insere}}
{{if $mvt_new.date < $date}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{elseif $mvt_new.date == $date}}
{{if $mvt_new.direction == "input" && $type_mvt != "retour"}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{elseif $mvt_new.direction == "output" && $type_mvt == "temporaire"}}
{{:assign var="movements_new." from=mvt_new}}
{{:assign insere=true}}
{{/if}}
{{/if}}
{{/if}}
{{:assign var="movements_new." from=movement}}