diff --git a/_archives.html b/_archives.html index 671ceb4..9252b3b 100644 --- a/_archives.html +++ b/_archives.html @@ -51,6 +51,7 @@ 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, @@ -149,7 +150,7 @@ #{{$trans_id}} {{$trans_date|date_short}} {{$exit_date|date_short}} - {{$trans_label}} + {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} {{"%f"|math:$montant_immo|money_html:false|raw}} {{$account_code}} {{$account_label}} diff --git a/_immobilisations.html b/_immobilisations.html index 00d2c40..fc44739 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -54,6 +54,7 @@ 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 @@ -167,7 +168,7 @@ #{{$immo_trans_id}} {{$trans_date|date_short}} - {{$trans_label}} + {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} {{$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 5fa9b49..8d82edf 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -75,6 +75,7 @@ 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, @@ -154,7 +155,7 @@ #{{$trans_id}} {{$trans_date|date_short}} - {{$trans_label}} + {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} {{"%f"|math:$debit|money_html:false|raw}} {{$account_code}} {{$account_label}} diff --git a/_unfinished.html b/_unfinished.html index b639914..cdf42af 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 ; les montants seront additionnés par numéro de compte + Cocher les lignes concernées

Montants sélectionnés diff --git a/amortization.html b/amortization.html index 61801cf..86da589 100644 --- a/amortization.html +++ b/amortization.html @@ -10,6 +10,7 @@ {{#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, @@ -241,7 +242,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
+
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null}} — {{$ligne_immo.line_label}}{{/if}}
Montant
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
Début d'amortissement