diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index a24f4b7..f06ce9f 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -109,14 +109,14 @@ {{if $status == "nsp"}} {{:linkbutton - label="Paramètres" + label="Amortir" href="add_infos.html?immo_id=%s&amort=0&op=new&type_immo=autres"|args:$immo_id shape="settings" target="_dialog" }} {{else}} {{:linkbutton - label="Paramètres" + label="Amortir" href="add_infos.html?immo_id=%s&amort=0&op=modif&type_immo=autres"|args:$immo_id shape="settings" target="_dialog" diff --git a/_nav.html b/_nav.html index f847605..913e5bc 100644 --- a/_nav.html +++ b/_nav.html @@ -5,21 +5,19 @@ + {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours"}} + {{/if}} -{{* - -*}} - {{if $current == 'index' && $subsubcurrent != 'balance_exit'}} -{{* {{elseif $subsubcurrent == 'balance_exit'}} -{{* - -*}} {{/if}} diff --git a/amortization.html b/amortization.html index 0e97af0..cd9255a 100644 --- a/amortization.html +++ b/amortization.html @@ -77,7 +77,7 @@ {{else}} {{:assign subcurrent="autres"}} {{/if}} -{{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization"}} +{{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization" type_immo=$_GET.type_immo}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach"}} @@ -97,6 +97,7 @@

{{$msg}}

{{/if}} +{{* {{if $valeur_residuelle > 0}} {{/if}} +*}}
@@ -135,6 +137,16 @@
Durée
{{$duree}} ans
{{/if}} + {{if $valeur_residuelle > 0}} +
Montant déjà amorti
+
{{"%d-%d"|math:$ligne_immo.montant:$valeur_residuelle|money_currency:false}}
+
Valeur résiduelle
+
{{$valeur_residuelle|money_currency}}
+ {{/if}} + {{if $duree != null && $valeur_residuelle > 0}} +
Annuité estimée
+
{{"%f/%d"|math:$ligne_immo.montant:$duree|money_currency}}
+ {{/if}}

Amortissements enregistrés

@@ -220,6 +232,11 @@ {{/select}} {{if $autres_amortissements != null}} +

+ Il existe des écritures d'amortissement qui ne sont pas rattachés à une immobilisation !
+ Utilisez le bouton « Attacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation. +

+{{*

Amortissements non rattachés

@@ -258,6 +275,7 @@
+ *}} {{/if}} {{/if}} {{:form_errors}} diff --git a/other_amortizations.html b/other_amortizations.html new file mode 100644 index 0000000..e817e5f --- /dev/null +++ b/other_amortizations.html @@ -0,0 +1,104 @@ +{{* -*- brindille -*- *}} + +{{* + Lister les écritures d'amortissement indépendantes + et proposer des les attacher à l'immo sélectionnée + @param immo_id = id de la ligne d'immo + *}} + +{{* récupérer les infos de l'immobilisation *}} +{{#select + line.id as immo_id, + line.debit as montant, + trans.id as trans_id, + trans.label as label, + trans.date + FROM acc_transactions_lines AS line + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + WHERE line.id = :line_id; + :line_id = $_GET.immo_id|intval + assign=ligne_immo + }} +{{else}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} +{{/select}} + +{{#select + line.id as l_id, + line.id_transaction as t_id, + line.credit as amort_amount, + line.label as l_label, + trans.date as t_date, + trans.label as t_label, + trans.id_year as amort_year, + account.id as account_id, + account.code as account_code, + account.label as account_label + FROM acc_transactions_lines AS line + INNER JOIN acc_accounts AS account ON account.id = line.id_account + INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction + INNER JOIN acc_years AS y ON y.id = trans.id_year + WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) + ORDER BY trans.date, trans.label; + assign=autre_amort +}} + {{#select + id_transaction, + id_related + FROM acc_transactions_links + WHERE id_transaction = :id_amort OR id_related = :id_amort; + :id_amort=$t_id + }} + {{else}} + {{:assign var="autres_amortissements." value=$autre_amort}} + {{/select}} +{{/select}} + +{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortissement"}} +{{* barre de navigation *}} +{{if ! $dialog}} + {{:include file="_nav.html" current="index" subcurrent="autres" subsubcurrent="amortization"}} +{{/if}} + +{{if $autres_amortissements != null}} +
+

Immobilisation « {{$ligne_immo.label}} »

+ + + + + + + + + + + + + + {{#foreach from=$autres_amortissements item="line"}} + {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.t_id}} + {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} + + + + + + + + + + {{/foreach}} + +
N°DateMontantLibelléN° compteCompte
#{{$line.t_id}}{{$line.t_date|date_short}}{{"%f"|math:$line.amort_amount|money}}{{if $line.l_label == null}} + {{$line.t_label}} + {{else}} + {{$line.l_label}} + {{/if}} + {{$line.account_code}}{{$line.account_label}} + {{:linkbutton label="Attacher" href="attach_amort.html?amort_id=%d&immo_id=%d"|args:$line.l_id:$_GET.immo_id shape="plus"}} +
+
+{{/if}} +{{:form_errors}} +{{:admin_footer}} diff --git a/style.css b/style.css index c9c23f9..fd1cbfb 100644 --- a/style.css +++ b/style.css @@ -41,3 +41,7 @@ h2[class="aide"], h3[class="aide"] { nav.amort aside { margin-top : 0; } + +.describe dt::after { + content: ' :'; +}