diff --git a/mouvements/dupliquer_mouvement.html b/mouvements/dupliquer_mouvement.html
index 86c1f50..dd6a507 100644
--- a/mouvements/dupliquer_mouvement.html
+++ b/mouvements/dupliquer_mouvement.html
@@ -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}}
diff --git a/mouvements/entrees/retour.html b/mouvements/entrees/retour.html
index f2667e9..4021240 100644
--- a/mouvements/entrees/retour.html
+++ b/mouvements/entrees/retour.html
@@ -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}}
diff --git a/mouvements/modifier_mouvement.html b/mouvements/modifier_mouvement.html
index e8a8ee5..857340a 100644
--- a/mouvements/modifier_mouvement.html
+++ b/mouvements/modifier_mouvement.html
@@ -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}}