diff --git a/_archives.html b/_archives.html index 9252b3b..671ceb4 100644 --- a/_archives.html +++ b/_archives.html @@ -51,7 +51,6 @@ trans.date as trans_date, trans.id_year as trans_id_year, line.id as immo_id, - line.label as line_label, line.debit AS debit, account.id as account_id, account.code as account_code, @@ -150,7 +149,7 @@ #{{$trans_id}} {{$trans_date|date_short}} {{$exit_date|date_short}} - {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} + {{$trans_label}} {{"%f"|math:$montant_immo|money_html:false|raw}} {{$account_code}} {{$account_label}} diff --git a/_immobilisations.html b/_immobilisations.html index fc44739..00d2c40 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -54,7 +54,6 @@ trans.date as trans_date, line.id as immo_line_id, line.debit AS debit, - line.label AS line_label, account.id as account_id, account.code as account_code, trans.id_year as trans_id_year @@ -168,7 +167,7 @@ #{{$immo_trans_id}} {{$trans_date|date_short}} - {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} + {{$trans_label}} {{$montant_immo|money_html:false|raw}} {{if $duration != null}}{{$duration}}{{/if}} {{$amort_amount|money_html:false|raw}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 8d82edf..6ebb556 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -75,7 +75,6 @@ trans.label as trans_label, trans.date as trans_date, line.id as immo_id, - line.label as line_label, account.id as account_id, account.code as account_code, account.label as account_label, @@ -155,7 +154,7 @@ #{{$trans_id}} {{$trans_date|date_short}} - {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} + {{$trans_label}} {{"%f"|math:$debit|money_html:false|raw}} {{$account_code}} {{$account_label}} @@ -166,6 +165,11 @@ shape="settings" target="_dialog" }} + {{:linkbutton + label="Amortissements" + href="amortization.html?immo_id=%s&type_immo=other"|args:$immo_id + shape="table" + }} {{/select}} diff --git a/_unfinished.html b/_unfinished.html index cdf42af..b639914 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -32,7 +32,7 @@
Transférer une ou plusieurs lignes vers une immobilisation amortissable

- Cocher les lignes concernées + Cocher les lignes concernées ; les montants seront additionnés par numéro de compte

Montants sélectionnés diff --git a/add_infos.html b/add_infos.html index 7b3b924..32cca72 100644 --- a/add_infos.html +++ b/add_infos.html @@ -152,7 +152,6 @@ {{if $info_immo != null}} {{:assign date_defaut=$info_immo.date}} {{:assign duree_defaut=$info_immo.duration}} - {{:assign choix_defaut=$info_immo.status}} {{else}} {{:assign duree_defaut=null}} {{/if}} diff --git a/amortization.html b/amortization.html index 86da589..23dc3f4 100644 --- a/amortization.html +++ b/amortization.html @@ -10,7 +10,6 @@ {{#select line.id as immo_id, line.debit as montant, - line.label as line_label, trans.id as trans_id, trans.label as label, trans.date, @@ -34,10 +33,6 @@ {{:assign status=$status}} {{/load}} -{{if $status == 'ignored'}} - {{:error message="Cette immobilisation ne doit pas être amortie"}} -{{/if}} - {{* chercher des écritures liées à l'immo courante au crédit du même compte et déduire leur montant de celui de l'immo *}} @@ -242,7 +237,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null}} — {{$ligne_immo.line_label}}{{/if}}
+
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
Montant
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
Début d'amortissement