lesanges/amortization
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Améliorations et simplification présentation

Browse source
This commit is contained in:
Jean-Christophe Engel 2025-05-22 08:44:31 +02:00
parent 9fe7890718
commit 255ffe10aa
6 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
_nav.html
View file

@ -1,19 +1,22 @@
{{* -*- brindille -*- *}}
<nav class="tabs">
{{if $current == 'index'}}
{{if $current == 'index' && $subsubcurrent == null}}
<aside>
{{:linkbutton label="Ajouter une immobilisation" shape="plus" href="add_asset.html" target="_dialog"}}
</aside>
{{/if}}
{{*
<ul>
<li {{if $current == 'index'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Immobilisations</a></li>
<li {{if $current == 'aide'}} class="current"{{/if}}><a href="{{$module.url}}aide.html">Aide</a></li>
</ul>
*}}
{{if $current == 'index' && $subsubcurrent != 'balance_exit'}}
<ul class="sub">
{{* <ul class="sub">*}}
<ul>
<li {{if $subcurrent == 'encours'}}class="current"{{/if}}><a href="index.html?amort=encours">En cours</a></li>
<li {{if $subcurrent == 'fini'}}class="current"{{/if}}><a href="index.html?amort=fini">Terminées</a></li>
<li {{if $subcurrent == 'archive'}}class="current"{{/if}}><a href="index.html?amort=archive">Archivées</a></li>

9
add_asset.html
View file

@ -10,7 +10,7 @@
{{:assign debut=$start_date|date_short}}
{{:assign fin=$end_date|date_short}}
{{:assign var="years_data.%d"|args:$id value=$ts_debut|cat:" "|cat:$ts_fin}}
{{:assign var="open_years.%d"|args:$id value=$label|cat:" (du "|cat:$debut|cat:" au "|cat:$fin|cat:")"}}
{{:assign var="open_years.%d"|args:$id value=$label|cat:" ("|cat:$debut|cat:" - "|cat:$fin|cat:")"}}
{{if $ts_debut <= $now && $now <= $ts_fin}}
{{:assign selected_year=$id}}
{{/if}}
@ -153,7 +153,7 @@
<fieldset>
<legend>Données de l'immobilisation</legend>
<dl>
{{:input type="select" name="id_year" label="Exercice" required=true default_empty="— Faire un choix —" options=$open_years}}
{{:input type="select" name="id_year" label="Exercice" default=$selected_year required=true default_empty="— Faire un choix —" options=$open_years}}
{{:input type="date" name="date_achat" label="Date d'acquisition" required=true default=$now|date_short}}
{{:input type="text" name="designation" label="Désignation" required=true}}
{{:input type="money" name="montant" label="Montant" required=true}}
@ -167,10 +167,9 @@
{{:input
type="list"
name="debit_account"
label="Compte d'immobilisation (20xx, 21xx, ...)"
label="Compte d'immobilisation"
required=true
target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$patterns:$selected_year
default=$immo_account
}}
{{if $projects != null}}
{{:input type="select" name="id_project" label="Projet (analytique)" options=$projects default_empty="— Aucun —"}}
@ -185,8 +184,8 @@
<dl>
{{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur plusieurs années" checked="cheched" help="Dé-cocher pour ne pas amortir"}}
<div id="div_amort">
{{:input type="date" name="date_mes" label="Date de mise en service" help="C'est la date de première utilisation ; à renseigner uniquement si différente de la date d'acquisition"}}
{{:input type="number" name="duree" label="Durée d'amortissement" required=true min=0 default=1 suffix="année(s)"}}
{{:input type="date" name="date_mes" label="Date de mise en service" help="C'est la date de première utilisation ; à renseigner uniquement si différente de la date d'acquisition"}}
</div>
</dl>
</fieldset>

21
amortization.html
View file

@ -105,17 +105,22 @@
</nav>
{{/if}}
<h3>Amortissement de «
<a class="num"
href={{"%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}}>#{{$ligne_immo.trans_id}}</a>
{{$ligne_immo.label}} » d'un montant de
{{"%f"|math:$ligne_immo.montant|money_currency}}
en date du {{$date_debut|date_short}}{{if $duree != null}} sur {{$duree}} ans{{/if}}
</h3>
<dl class="describe">
<dt>Libellé</dt>
<dd>{{$ligne_immo.label}}</dd>
<dt>Montant</dt>
<dd><strong class="money">{{"%f"|math:$ligne_immo.montant|money_currency}}</strong></dd>
<dt>Début d'amortissement</dt>
<dd>{{$date_debut|date_short}}</dd>
{{if $duree != null}}
<dt>Durée</dt>
<dd>{{$duree}} ans</dd>
{{/if}}
</dl>
{{if $linked_lines != null}}
<section class="amortissement">
<h3 class="center-block ruler">Amortissements rattachés</h3>
<h3 class="center-block ruler">Amortissements enregistrés</h3>
<table class="list">
<thead>
<tr>

1
archives.html
View file

@ -24,7 +24,6 @@
{{#load type="immo" where="$$.status = 'archived'"}}
{{:assign var="lines." value="'%s'"|args:$line}}
{{/load}}
{{:debug lines=$lines}}
{{:assign lines=$lines|implode:","}}
{{:assign lines="("|cat:$lines|cat:")"}}
{{:assign condition="line.id IN %s"|args:$lines}}

1
compute_exit_data.html
View file

@ -37,7 +37,6 @@
{{* Traiter l'envoi du formulaire *}}
{{#form on="proceed"}}
{{:debug post=$_POST}}
{{if $_POST.cession != null}}
{{if $_POST.montant_cession == null}}
{{:error message="Vous devez saisir le montant de la cession"}}

2
index.html
View file

@ -1,5 +1,5 @@
{{* -*- brindille -*- *}}
{{:admin_header title="Gestion des amortissements" custom_css="./style.css" current="module_amortissement"}}
{{:admin_header title="Immobilisations et amortissements" custom_css="./style.css" current="module_amortissement"}}
{{* barre de navigation *}}
{{if $_GET.amort == null}}