diff --git a/_immobilisations.html b/_immobilisations.html index 2f28b30..8765d7f 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -3,9 +3,9 @@ {{* Liste des immobilisations en cours ou amorties *}}
- {{if $type_immo == "encours"}} + {{if $type_immo == "managed"}}

Immobilisations en cours

- {{elseif $type_immo == "amortie"}} + {{elseif $type_immo == "amortized"}}

Immobilisations amorties

{{/if}} {{:assign nb_immo=0}} @@ -133,10 +133,11 @@ {{* classement par onglet *}} - {{if $type_immo == "encours" && $amort_amount >= $debit}}{{:continue}}{{/if}} - {{if $type_immo == "encours" && $status == "amortized"}}{{:continue}}{{/if}} + {{if $type_immo == "managed" && $amort_amount >= $debit}}{{:continue}}{{/if}} + {{if $type_immo == "managed" && $status == "amortized"}}{{:continue}}{{/if}} {{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}} - {{if $type_immo == "amortie" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}} + {{if $type_immo == "amortized" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}} + {{:assign nb_immo="%d+1"|math:$nb_immo}} #{{$trans_id}} @@ -150,14 +151,14 @@ {{if ! $exist_amort}} {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&amort=1&op=modif&type_immo=%s"|args:$immo_id:$type_immo + href="add_infos.html?immo_id=%s&op=modif&type_immo=%s"|args:$immo_id:$type_immo shape="settings" target="_dialog" }} {{elseif $status == "unknown"}} {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&amort=1&op=new&type_immo=%s"|args:$immo_id:$type_immo + href="add_infos.html?immo_id=%s&op=new&type_immo=%s"|args:$immo_id:$type_immo shape="settings" target="_dialog" }} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 76f9b0d..21669c9 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -6,6 +6,12 @@

Autres immobilisations

{{:assign nb_immo=0}} +
+
+ {{:input type="checkbox" value=1 name="unhide" label="Afficher les écritures marquées ignorées" }} +
+
+ @@ -59,8 +65,14 @@ {{else}} {{:assign status="unknown"}} {{/load}} - {{if $status != "unknown"}} - {{:continue}} + {{if $_POST.unhide == null}} + {{if $status != "unknown"}} + {{:continue}} + {{/if}} + {{else}} + {{if $status != "ignored" && $status != "unknown"}} + {{:continue}} + {{/if}} {{/if}} {{* voir s'il existe des écritures d'amortissement associées *}} @@ -88,7 +100,7 @@ account.code LIKE '28%'; :line_id = $immo_id|intval }} - {{if $status == "unknown" && $amort_amount != null}} + {{if $amort_amount != null}} {{:assign ignore=true}} {{else}} {{:assign ignore=false}} @@ -111,14 +123,14 @@ {{if $status == "unknown"}} {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&amort=0&op=new&type_immo=autre"|args:$immo_id + href="add_infos.html?immo_id=%s&op=new&type_immo=autre"|args:$immo_id shape="settings" target="_dialog" }} {{else}} {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&amort=0&op=modif&type_immo=autre"|args:$immo_id + href="add_infos.html?immo_id=%s&op=modif&type_immo=autre"|args:$immo_id shape="settings" target="_dialog" }} @@ -137,3 +149,15 @@

Aucune immobilisation

{{/if}} + + diff --git a/_nav.html b/_nav.html index f5c6b94..fc5c3c3 100644 --- a/_nav.html +++ b/_nav.html @@ -1,11 +1,11 @@ {{* -*- brindille -*- *}}