Fusion branche main

This commit is contained in:
Jean-Christophe Engel 2025-06-26 10:11:47 +02:00
commit ff4b295cf6
7 changed files with 9 additions and 9 deletions

View file

@ -1,6 +1,6 @@
{{* -*- brindille -*- *}} {{* -*- brindille -*- *}}
{{* Liste des immobilisations amortissable ou à définir *}} {{* Liste des immobilisations en cours ou amorties *}}
<section class="immobilisation"> <section class="immobilisation">
{{if $type_immo == "encours"}} {{if $type_immo == "encours"}}

View file

@ -20,7 +20,7 @@
<li {{if $subcurrent == 'encours'}}class="current"{{/if}}><a href="index.html?type_immo=encours">En cours</a></li> <li {{if $subcurrent == 'encours'}}class="current"{{/if}}><a href="index.html?type_immo=encours">En cours</a></li>
<li {{if $subcurrent == 'amortie'}}class="current"{{/if}}><a href="index.html?type_immo=amortie">Amorties</a></li> <li {{if $subcurrent == 'amortie'}}class="current"{{/if}}><a href="index.html?type_immo=amortie">Amorties</a></li>
<li {{if $subcurrent == 'sortie'}}class="current"{{/if}}><a href="index.html?type_immo=sortie">Sorties du bilan</a></li> <li {{if $subcurrent == 'sortie'}}class="current"{{/if}}><a href="index.html?type_immo=sortie">Sorties du bilan</a></li>
<li {{if $subcurrent == 'autres'}}class="current"{{/if}}><a href="index.html?type_immo=autres">Autres</a></li> <li {{if $subcurrent == 'autre'}}class="current"{{/if}}><a href="index.html?type_immo=autres">Autres</a></li>
</ul> </ul>
{{/if}} {{/if}}

View file

@ -117,11 +117,11 @@
status=$status status=$status
}} }}
{{if $_POST.amortir}} {{if $_POST.amortir}}
{{:assign amort="encours"}} {{:assign type_immo="encours"}}
{{else}} {{else}}
{{:assign amort="autres"}} {{:assign type_immo="autre"}}
{{/if}} {{/if}}
{{:redirect force="index.html?ok=1&msg=immobilisation&amort=%s"|args:$amort}} {{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}}
{{/form}} {{/form}}
{{:admin_header title="Ajout immobilisation" current="module_amortissement"}} {{:admin_header title="Ajout immobilisation" current="module_amortissement"}}

View file

@ -63,7 +63,7 @@
}} }}
{{if ! $_POST.amortir}} {{if ! $_POST.amortir}}
{{:assign type_immo="autres"}} {{:assign type_immo="autre"}}
{{else}} {{else}}
{{:assign type_immo=$_GET.type_immo}} {{:assign type_immo=$_GET.type_immo}}
{{/if}} {{/if}}

View file

@ -115,7 +115,7 @@
{{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}} {{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}}
{{:assign subcurrent="encours"}} {{:assign subcurrent="encours"}}
{{else}} {{else}}
{{:assign subcurrent="autres"}} {{:assign subcurrent="autre"}}
{{/if}} {{/if}}
{{:include {{:include

View file

@ -34,7 +34,7 @@
{{/select}} {{/select}}
{{/load}} {{/load}}
{{if $type_immo == "autres"}} {{if $type_immo == "autre"}}
{{:include file="_immobilisations_autres.html"}} {{:include file="_immobilisations_autres.html"}}
{{elseif $type_immo == "sortie"}} {{elseif $type_immo == "sortie"}}
{{:include file="_archives.html"}} {{:include file="_archives.html"}}

View file

@ -260,7 +260,7 @@
}} }}
{{/if}} {{/if}}
{{:redirect to="index.html?amort=sortie"}} {{:redirect to="index.html?type_immo=sortie"}}
{{/form}} {{/form}}
{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}} {{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}}