diff --git a/_immobilisations.html b/_immobilisations.html index ab4d4d6..93648ec 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -76,7 +76,7 @@ {{:assign montant_immo=$doc_amount|or:$debit}} {{:assign immo_date = $doc_date_achat|or:$trans_date}} {{:assign label_immo=$doc_label|or:$trans_label}} - {{if $line_label != null && $line_label != $label_immo}} + {{if $label_immo|strpos:$line_label === false}} {{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}} {{/if}} diff --git a/amortization.html b/amortization.html index cafea18..7d73749 100644 --- a/amortization.html +++ b/amortization.html @@ -15,7 +15,7 @@ {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} {{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} +{{if $label_immo|strpos:$ligne_immo.line_label === false}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} {{if $info_immo.amount != null}} diff --git a/attach_amort.html b/attach_amort.html index a6d05bb..95767e2 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -14,7 +14,7 @@ {{/if}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} +{{if $label_immo|strpos:$ligne_immo.line_label === false}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} {{:assign montant_immo=$info_immo.amount|or:$ligne_immo.amount}} diff --git a/attach_credit.html b/attach_credit.html index 0652ce3..e081434 100644 --- a/attach_credit.html +++ b/attach_credit.html @@ -14,7 +14,7 @@ {{/if}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} +{{if $label_immo|strpos:$ligne_immo.line_label === false }} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} diff --git a/balance_sheet_exit.html b/balance_sheet_exit.html index a561c80..f3c4ae0 100644 --- a/balance_sheet_exit.html +++ b/balance_sheet_exit.html @@ -18,7 +18,7 @@ *}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} +{{if $label_immo|strpos:$ligne_immo.line_label === false}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} diff --git a/compute_exit_data.html b/compute_exit_data.html index c824af5..f45a6fe 100644 --- a/compute_exit_data.html +++ b/compute_exit_data.html @@ -19,7 +19,7 @@ {{/if}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} +{{if $label_immo|strpos:$ligne_immo.line_label === false}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} diff --git a/exit_step1.html b/exit_step1.html index 83b6752..5744fb6 100644 --- a/exit_step1.html +++ b/exit_step1.html @@ -13,7 +13,7 @@ {{/if}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.trans_label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} +{{if $label_immo|strpos:$ligne_immo.line_label === false}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.trans_id}} @@ -123,12 +123,13 @@ {{/select}} {{:admin_header title="Immobilisation sortie du bilan" custom_css="./style.css" current="module_amortization"}} + {{if $_GET.from == "exit"}} {{:assign current="other"}} {{else}} {{:assign current="archived"}} {{/if}} -{{:include file="_nav.html" current=$current subcurrent="exit"}} +{{*:include file="_nav.html" current=$current subcurrent="exit"*}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach_avoir"}} @@ -146,7 +147,7 @@
| #{{$exit_line.trans_id}} | +#{{$exit_line.trans_id}} | {{$exit_line.date|date_short}} | {{if $exit_line.line_label != null}} @@ -301,7 +302,20 @@ |
Aucune écriture de sortie du bilan. Vérifiez l'attachement d'écriture d'avoir.
+Aucune écriture de sortie du bilan avec un
+ montant de {{$solde|money_currency_html:false|raw}} au crédit du
+ compte {{$ligne_immo.account_code}} — {{$ligne_immo.account_label}} ;
+
+ Vérifiez si vous avez correctement attaché les éventuelles écritures d'avoir.
+
+ Si vous avez supprimé l'écriture de sortie de bilan, il faut
+ la recréer avant de pouvoir classer cette immobilisation
+ « Sortie du bilan » !
+