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 @@
| {{$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}} | 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