Prise en compte écritures gérées uniquement (immo, crédit, amort)

This commit is contained in:
Jean-Christophe Engel 2026-04-29 11:38:32 +02:00
parent 463d5d109e
commit f8f4da59b6

View file

@ -3,16 +3,16 @@
{{* Liste des immobilisations en cours d'amortissement ou amorties *}} {{* Liste des immobilisations en cours d'amortissement ou amorties *}}
{{:include file="_get_config.html" keep="module.config"}} {{:include file="_get_config.html" keep="module.config"}}
<section class="immobilisation">
<p class="help"> <p class="help">
{{if $type_immo == "managed"}} {{if $type_immo == "managed"}}
Cette page liste les immobilisations en cours d'amortissement Cette page liste les immobilisations en cours d'amortissement
{{elseif $type_immo == "amortized"}} {{elseif $type_immo == "amortized"}}
Cette page liste les immobilisations dont l'amortissement est terminé Cette page liste les immobilisations dont l'amortissement est terminé
{{/if}} {{/if}}
</p> </p>
{{if $module.table != null}}
<table class="list"> <table class="list">
<thead> <thead>
<tr> <tr>
@ -29,14 +29,6 @@
</thead> </thead>
<tbody> <tbody>
{{* vérifier l'existence de la table du module *}}
{{#load limit="1"}}
{{:assign table_presente=true}}
{{else}}
{{:assign table_presente=false}}
{{/load}}
{{if $table_presente}}
{{* lister les immobilisations *}} {{* lister les immobilisations *}}
{{:assign account_condition="("}} {{:assign account_condition="("}}
{{#foreach from=$module.config.prefixes item="code"}} {{#foreach from=$module.config.prefixes item="code"}}
@ -44,17 +36,8 @@
{{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
{{/foreach}} {{/foreach}}
{{:assign account_condition=$account_condition|cat:"0)"}} {{:assign account_condition=$account_condition|cat:"0)"}}
{{:assign doc_condition="($$.status <> 'ignored' AND $$.status <> 'archived')"}} {{:assign status_condition="($$.status = 'managed' OR $$.status = 'amortized')"}}
{{:assign condition=$account_condition|cat:" AND line.debit > 0 AND "|cat:$status_condition}}
{{:assign filter_condition="NOT ("}}
{{#foreach from=$module.config.filters item="filter"}}
{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
{{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}}
{{/foreach}}
{{:assign filter_condition=$filter_condition|cat:"0)"}}
{{:assign filter_condition="($$.status IS NULL AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:")"}}
{{:assign condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition|cat:")"}}
{{:assign nb_immo=0}} {{:assign nb_immo=0}}
{{:assign total_immo = 0}} {{:assign total_immo = 0}}
@ -68,152 +51,105 @@
account.id as account_id, account.id as account_id,
account.code as account_code, account.code as account_code,
trans.id_year as trans_id_year, trans.id_year as trans_id_year,
info.id as immo_doc_id,
$$.duration as duration, $$.duration as duration,
$$.label as doc_label,
$$.amount as doc_amount,
$$.date_achat as doc_date_achat,
$$.date as doc_date_mes,
$$.status as status $$.status as status
FROM acc_transactions AS trans FROM acc_transactions AS trans
INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id
INNER JOIN acc_accounts AS account ON line.id_account = account.id INNER JOIN acc_accounts AS account ON line.id_account = account.id
INNER JOIN acc_years AS years ON trans.id_year = years.id INNER JOIN acc_years AS years ON trans.id_year = years.id
LEFT JOIN !table AS info ON $$.line = line.id INNER JOIN !table AS info ON $$.line = line.id
WHERE !condition WHERE !condition
ORDER BY trans.date DESC; ORDER BY COALESCE(doc_date_achat, trans_date) DESC;
!table=$module.table !table=$module.table
!condition=$condition !condition=$condition
}} }}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$immo_trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$immo_trans_id}}
{{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}}
{{:assign duration=$duration}} {{:assign montant_immo=$doc_amount|or:$debit}}
{{:assign montant_immo=$debit}} {{:assign immo_date = $doc_date_achat|or:$trans_date}}
{{if $status == null}} {{:assign label_immo=$doc_label|or:$trans_label}}
{{:assign status="unknown"}} {{if $line_label != null && $line_label != $label_immo}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}}
{{/if}} {{/if}}
{{* chercher des écritures liées à l'immo courante au crédit du même compte {{*
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 et déduire leur montant de celui de l'immo
*}} *}}
{{#select {{#load
CASE links.id_related = :immo_trans_id type="immo_link"
WHEN true THEN links.id_transaction where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $immo_doc_id
WHEN false THEN links.id_related }}
END as other_id, {{if $amount == null}}
line.credit {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id;
FROM acc_transactions AS trans :credit_line_id=$credit_line_id
INNER JOIN acc_transactions_links as links }}
ON (trans.id = links.id_transaction OR trans.id = links.id_related) {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}}
INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id {{/select}}
INNER JOIN acc_accounts AS acc ON line.id_account = acc.id {{else}}
WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account; {{:assign montant_immo="%d-%d"|math:$montant_immo:$amount}}
:immo_trans_id=$immo_trans_id {{/if}}
:account=$account_code {{/load}}
}}
{{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}}
{{/select}}
{{* Immobilisation soldée ? *}} {{* Immobilisation soldée ? *}}
{{* TODO marquer archivée *}} {{* TODO ¿ marquer archivée ? *}}
{{if $montant_immo == 0}} {{if $montant_immo == 0}}
{{:continue}} {{:continue}}
{{/if}} {{/if}}
{{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} {{* chercher des lignes des écritures d'amortissement liées à la ligne d'immobilisation *}}
{{:assign amort_lines=null}} {{:assign amort_lines=null}}
{{#select
l_amort.credit as amount,
CASE links.id_related = t_immo.id
WHEN true THEN links.id_transaction
WHEN false THEN links.id_related
END as amort_trans_id,
l_amort.id AS amort_line_id
FROM acc_transactions_lines as l_immo
INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction
INNER JOIN acc_transactions_links as links
ON (t_immo.id = links.id_transaction OR t_immo.id = links.id_related)
INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction
INNER JOIN acc_accounts AS account ON l_amort.id_account = account.id
WHERE l_immo.id = :line_id AND l_amort.credit <> 0 AND account.code LIKE '28%';
:line_id = $immo_line_id|intval
assign="line"
}}
{{:assign var="amort_lines.%d."|args:$amort_trans_id value=$line}}
{{/select}}
{{:assign amort_amount=0}} {{:assign amort_amount=0}}
{{#foreach from=$amort_lines key="amort_trans_id" item="lines"}} {{#load type="amort_link"
{{:assign nb=$lines|count}} where="$$.immo_doc_id = :immo_doc_id"
{{* lister les docs de liaison de l'écriture d'amortissement *}} :immo_doc_id = $immo_doc_id
{{:assign links=null}} assign="amort_link"
{{#load type="link"
where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id"
:immo_line_id = $immo_line_id
:amort_trans_id = $amort_trans_id
assign="links."
}} }}
{{/load}} {{if $amount == null}}
{{#select credit FROM acc_transactions_lines WHERE id = :amort_line_id;
{{#foreach from=$lines item="line"}} :amort_line_id = $amort_line_id
{{* voir s'il existe une ligne associée à l'écriture d'amortissement *}} }}
{{:assign line_link_exist=false}} {{:assign amort_amount="%d+%d"|math:$amort_amount:$credit}}
{{#foreach from=$links item="link"}} {{/select}}
{{if $link.amort_line_id == $line.amort_line_id}} {{else}}
{{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}} {{:assign amort_amount="%d+%d"|math:$amort_amount:$amount}}
{{:assign line_link_exist=true}} {{/if}}
{{/if}} {{/load}}
{{/foreach}}
{{if ! $line_link_exist}}
{{if $nb == 1}}
{{* créer la liaison ligne immo <-> ligne amort *}}
{{*:debug lier_immo_line_id=$immo_line_id lier_amort_trans_id=$amort_trans_id avec_amort_line_id=$amort_line_id*}}
{{:save
key=""|uuid
type="link"
immo_line_id=$immo_line_id
amort_line_id=$amort_line_id
amort_trans_id=$amort_trans_id
}}
{{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}}
{{/if}}
{{/if}}
{{/foreach}}
{{/foreach}}
{{if $amort_amount == 0}}
{{:assign exist_amort=false}}
{{else}}
{{:assign exist_amort=true}}
{{:assign amort_amount=$amort_amount}}
{{/if}}
{{* classement par onglet *}} {{* classement par onglet *}}
{{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}} {{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}}
{{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}} {{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}}
{{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}} {{* ?? *}}
{{:assign nb_immo="%d+1"|math:$nb_immo}} {{:assign nb_immo="%d+1"|math:$nb_immo}}
{{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}} {{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}}
{{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}}
{{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}} {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}}
<tr> <tr>
<td class="num"><a href={{$trans_url}}>#{{$immo_trans_id}}</a></td> <td class="num"><a href="{{$trans_url}}">#{{$immo_trans_id}}</a></td>
<td>{{$trans_date|date_short}}</td> <td>{{$immo_date|date_short}}</td>
<td>{{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}}</td> <td>{{$label_immo}}</td>
<td class="money">{{$montant_immo|money_html:false|raw}}</td> <td class="money">{{$montant_immo|money_html:false|raw}}</td>
<td class="money">{{if $duration != null}}{{$duration}}{{/if}}</td> <td class="money">{{if $duration != null}}{{$duration}}{{/if}}</td>
<td class="money">{{$amort_amount|money_html:false|raw}}</td> <td class="money">{{$amort_amount|money_html:false|raw}}</td>
<td class="money">{{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}}</td> <td class="money">{{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}}</td>
<td><a href={{$compte_url}}>{{$account_code}}</a></td> <td><a href="{{$compte_url}}">{{$account_code}}</a></td>
<td class="actions"> <td class="actions">
{{if ! $exist_amort || $status == "unknown"}} {{*if $amort_amount == 0*}}
{{:linkbutton {{:linkbutton
label="Paramètres" label="Détails"
href="add_infos.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo href="details_immo.html?immo_doc_id=%s"|args:$immo_doc_id
shape="settings" shape="search"
}} }}
{{* target="_dialog"*}} {{* target="_dialog"*}}
{{/if}} {{*/if*}}
{{:linkbutton {{:linkbutton
label="Amortissements" label="Amortissements"
href="amortization.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo href="amortization.html?immo_line_id=%s&type_immo=%s&immo_doc_id=%s"|args:$immo_line_id:$type_immo:$immo_doc_id shape="table"
shape="table"
}} }}
</td> </td>
</tr> </tr>
@ -250,9 +186,8 @@
</tr> </tr>
{{/if}} {{/if}}
</tfoot> </tfoot>
{{/if}}
</table> </table>
{{if $nb_immo == 0 || ! $table_presente}} {{/if}}
<p class="block alert">Aucune immobilisation</p> {{if $nb_immo == 0 || $module.table == null}}
{{/if}} <p class="block alert">Aucune immobilisation</p>
</section> {{/if}}