diff --git a/_archives.html b/_archives.html index 4a679bf..9252b3b 100644 --- a/_archives.html +++ b/_archives.html @@ -89,8 +89,7 @@ WHEN true THEN links.id_transaction WHEN false THEN links.id_related END as other_id, - line.credit, - MAX(trans2.date) as exit_date + line.credit FROM acc_transactions AS trans INNER JOIN acc_transactions_links as links ON (trans.id = links.id_transaction OR trans.id = links.id_related) @@ -105,7 +104,6 @@ assign="credit_immo." }} {{:assign solde_immo="%d-%d"|math:$solde_immo:$credit}} - {{:assign exit_date=$exit_date}} {{/select}} {{if $solde_immo == 0}} @@ -152,7 +150,7 @@ #{{$trans_id}} {{$trans_date|date_short}} {{$exit_date|date_short}} - {{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}} + {{$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 92a6022..3bc7f54 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -1,6 +1,6 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations en cours d'amortissement ou amorties *}} +{{* Liste des immobilisations en cours ou amorties *}}
@@ -100,7 +100,6 @@ }} {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}} {{/select}} - {{* Immobilisation soldée ? *}} {{if $montant_immo == 0}} {{:continue}} {{/if}} @@ -108,7 +107,7 @@ {{* voir s'il existe des écritures d'amortissement associées *}} {{:assign amort_lines=null}} {{#select - l_amort.credit as amount, + (l_amort.credit) as amount, CASE links.id_related = t_immo.id WHEN true THEN links.id_transaction WHEN false THEN links.id_related @@ -125,7 +124,6 @@ assign="amort_lines." }} {{/select}} - {{:assign amort_amount=0}} {{#foreach from=$amort_lines item="elem"}} {{* voir s'il existe un doc associé à l'écriture d'amortissement *}} @@ -162,7 +160,7 @@ #{{$immo_trans_id}} {{$trans_date|date_short}} - {{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}} + {{$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 05849bb..5308366 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -153,7 +153,7 @@ #{{$trans_id}} {{$trans_date|date_short}} - {{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}} + {{$trans_label}}{{if $line_label != null}} — {{$line_label}}{{/if}} {{"%f"|math:$debit|money_html:false|raw}} {{$account_code}} {{$account_label}} diff --git a/amortization.html b/amortization.html index 4edf953..86da589 100644 --- a/amortization.html +++ b/amortization.html @@ -242,7 +242,7 @@
Immobilisation
-
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}
+
#{{$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
@@ -292,9 +292,10 @@ {{"%f"|math:$line.amort_amount|money_html:false|raw}} {{"%f"|math:$solde|money_html:false|raw}} - {{$line.trans_label}} - {{if $line.amort_label != null && $line.amort_label != $line.trans_label}} - — {{$line.amort_label}} + {{if $line.amort_label == null}} + {{$line.trans_label}} + {{else}} + {{$line.amort_label}} {{/if}} {{$line.account_code}} diff --git a/other_amortizations.html b/other_amortizations.html index 7018b2e..84ac835 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -122,7 +122,7 @@ {{if $autres_amortissements != null}}
-

Immobilisation « {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}} »

+

Immobilisation « {{$ligne_immo.label}}{{if $ligne_immo.line_label != null}} — {{$ligne_immo.line_label}}{{/if}} »

@@ -144,7 +144,7 @@ diff --git a/save_amort.html b/save_amort.html index d34e8c0..3a2f0f9 100644 --- a/save_amort.html +++ b/save_amort.html @@ -28,7 +28,7 @@ {{/select}} {{:assign date_debut=$ligne_immo.date}} {{:assign var="amort_label" value="Amortissement %s"|args:$ligne_immo.label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} +{{if $ligne_immo.line_label != null}} {{:assign amort_label=$amort_label|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} diff --git a/transfer.html b/transfer.html index 02a6f5d..c855750 100644 --- a/transfer.html +++ b/transfer.html @@ -157,7 +157,7 @@ {{/if}} {{* écritures liées *}} - {{:assign var="linked_transactions" value=$transactions|keys}} + {{:assign var="linked_transactions" value=$_GET.trans|explode:","}} {{* enregistrer l'écriture *}} {{:api
{{$line.trans_date|date_short}} {{"%f"|math:$line.amort_amount|money_html:false|raw}} {{$line.trans_label}} - {{if $line.line_label != null && $line.line_label != $line.trans_label}} - {{$line.line_label}}{{/if}} + {{if $line.line_label != null}} - {{$line.line_label}}{{/if}} {{$line.account_code}} {{$line.account_label}}