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 -*- *}} - {{if $current == 'index' && $subsubcurrent == null}} + {{if $current == "index" && $subsubcurrent == null}} - {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours" || $type_immo == "autre"}} + {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "managed" || $type_immo == "other"}} {{/if}} - {{if $current == 'index'}} {{* && $subsubcurrent != 'balance_exit' *}} + {{if $current == "index"}} {{* && $subsubcurrent != "balance_exit" *}} - En cours - Amorties - Sorties du bilan - Autres + En cours + Amorties + Sorties du bilan + Autres {{/if}} - {{if $subsubcurrent == 'amortization'}} + {{if $subsubcurrent == "amortization"}} Amortissements - {{elseif $subsubcurrent == 'balance_exit'}} + {{elseif $subsubcurrent == "balance_exit"}} Sortie de bilan diff --git a/add_asset.html b/add_asset.html index 0c2a654..2ec8c91 100644 --- a/add_asset.html +++ b/add_asset.html @@ -117,9 +117,9 @@ status=$status }} {{if $_POST.amortir}} - {{:assign type_immo="encours"}} + {{:assign type_immo="managed"}} {{else}} - {{:assign type_immo="autre"}} + {{:assign type_immo="other"}} {{/if}} {{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}} {{/form}} diff --git a/add_infos.html b/add_infos.html index fb5ccb0..7aaa8ff 100644 --- a/add_infos.html +++ b/add_infos.html @@ -2,15 +2,12 @@ {{* @param immo_id - @param amort = 1 si immo amortissable, 0 si non @param op = new ou modif - @param type_immo : encours, amortie, sortie, autre + @param type_immo : managed, amortized, archived, other *}} -{{if $_GET.op == "modif"}} - {{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} - {{/load}} -{{/if}} +{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} +{{/load}} {{* Traiter l'envoi du formulaire *}} {{#form on="save"}} @@ -70,10 +67,8 @@ status=$status }} - {{if $_POST.classify == "managed"}} - {{:assign type_immo="encours"}} - {{elseif $_POST.classify == "amortized"}} - {{:assign type_immo="amortie"}} + {{if $_POST.classify == "managed" || $_POST.classify == "amortized"}} + {{:assign type_immo=$_POST.classify}} {{else}} {{:assign type_immo=$_GET.type_immo}} {{/if}} @@ -89,23 +84,30 @@ {{:include file="_nav.html" current="index"}} {{/if}} -{{* renseigner ou modifier la date de mise en service et la durée d'amortissement *}} -{{if $_GET.amort == 0}} - {{:assign disabled=1}} - {{:assign default=""}} +{{if $info_immo == null}} + {{:assign default=$_GET.type_immo}} {{else}} - {{:assign disabled=0}} - {{:assign default="managed"}} + {{:assign default=$info_immo.status}} {{/if}} +{{if $_GET.type_immo == "managed" || $_GET.type_immo == "amortized"}} + {{:assign disabled=0}} +{{else}} + {{:assign disabled=1}} +{{/if}} + +{{* + - classer l'immobilisation + - renseigner ou modifier la date de mise en service et la durée d'amortissement + *}} Faites un choix (obligatoire) {{:input type="radio" name="classify" value="managed" label="Amortir" help="Amortir cette immobilisation" default=$default onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}} - {{:input type="radio" name="classify" value="amortized" label="Marquer amortie" help="Cette immobilisation sera classée parmi les immobilisations amorties" onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}} - {{:input type="radio" name="classify" value="ignored" label="Ignorer l'écriture" help="Cette écriture n'apparaitra plus dans la liste des immobilisations" onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}} + {{:input type="radio" name="classify" value="amortized" label="Amortissement terminé" help="Cette immobilisation sera classée parmi les immobilisations amorties" default=$default onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}} + {{:input type="radio" name="classify" value="ignored" label="Ignorer l'écriture" help="Cette écriture n'apparaitra plus dans la liste des immobilisations" default=$default onclick="toggleInputs('div_inputs','f_classify_managed', 'f_classify_amortized')"}} {{if $info_immo != null}} {{:assign date_defaut=$info_immo.date}} diff --git a/amortization.html b/amortization.html index c8280c0..1a84a12 100644 --- a/amortization.html +++ b/amortization.html @@ -3,7 +3,7 @@ {{* Lister les écritures d'amortissement associées à une immobilisation @param immo_id : id de la ligne d'immo - @param type_immo : encours, amortie, sortie, autres + @param type_immo : managed, amortized, archived, others *}} {{* récupérer les infos de l'immobilisation *}} @@ -114,14 +114,14 @@ {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}} {{* barre de navigation *}} -{{if $_GET.type_immo == "amortie" || $valeur_residuelle== 0 }} - {{:assign subcurrent="amortie"}} -{{elseif $_GET.type_immo == "sortie"}} - {{:assign subcurrent="sortie"}} -{{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}} - {{:assign subcurrent="encours"}} +{{if $_GET.type_immo == "amortized" || $valeur_residuelle== 0 }} + {{:assign subcurrent="amortized"}} +{{elseif $_GET.type_immo == "archived"}} + {{:assign subcurrent="archived"}} +{{elseif $_GET.type_immo == null || $_GET.type_immo == "managed"}} + {{:assign subcurrent="managed"}} {{else}} - {{:assign subcurrent="autre"}} + {{:assign subcurrent="other"}} {{/if}} {{:include @@ -241,7 +241,7 @@ Aucun amortissement enregistré pour cette immobilisation {{/if}} -{{if $_GET.type_immo == null || $_GET.type_immo != "amortie"}} +{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} {{* Autres amortissements non rattachés *}} diff --git a/index.html b/index.html index ac5c003..586ea5b 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ {{* barre de navigation *}} {{if $_GET.type_immo == null}} - {{:assign type_immo="encours"}} + {{:assign type_immo="managed"}} {{else}} {{:assign type_immo=$_GET.type_immo}} {{/if}} @@ -34,11 +34,11 @@ {{/select}} {{/load}} -{{if $type_immo == "autre"}} +{{if $type_immo == "other"}} {{:include file="_immobilisations_autres.html"}} -{{elseif $type_immo == "sortie"}} +{{elseif $type_immo == "archived"}} {{:include file="_archives.html"}} -{{elseif $type_immo == "encours" || $type_immo == "amortie"}} +{{elseif $type_immo == "managed" || $type_immo == "amortized"}} {{:include file="_immobilisations.html"}} {{/if}} diff --git a/other_amortizations.html b/other_amortizations.html index 6e32724..84d6eaa 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -61,9 +61,9 @@ {{:include file="_nav.html" current="index" - subcurrent="autre" + subcurrent="other" subsubcurrent="amortization" - type_immo="autre" + type_immo="other" autres_amort=$autres_amortissements }} {{/if}} diff --git a/save_amort.html b/save_amort.html index 1c9df59..06f5a26 100644 --- a/save_amort.html +++ b/save_amort.html @@ -214,7 +214,7 @@ {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="index" subcurrent="encours" subsubcurrent="amortization"}} + {{:include file="_nav.html" current="index" subcurrent="managed" subsubcurrent="amortization"}} {{/if}} {{:form_errors}}
Aucune immobilisation
Aucun amortissement enregistré pour cette immobilisation