diff --git a/link_immo.html b/link_immo.html
index d3e08a5..df74f5a 100644
--- a/link_immo.html
+++ b/link_immo.html
@@ -5,7 +5,7 @@
paramètre et proposer de les attacher à l'immo paramètre
@param immo_doc_id : document associé à l'immo
@param filter : si vrai ne montrer que les écritures du compte de l'immobilisation (et sous-comptes)
- dans le cas contraire, montrer les écritures du compte d'immo à deux chiffres (et sous-comptes)
+ dans le cas contraire, montrer les écritures de tous les comptes d'immo
*}}
{{:include file="_get_immo_data.html" immo_doc_id=$_GET.immo_doc_id|intval keep="info_immo, ligne_immo, message"}}
@@ -32,11 +32,23 @@
{{*
lister les écritures au crédit du compte de l'immobilisation
*}}
+{{:include file="_get_config.html" keep="module.config"}}
{{if $_GET.filter}}
- {{:assign account_code=$ligne_immo.account_code|cat:"%"}}
+ {{:assign account_code=$ligne_immo.account_code|cat:"%"|quote_sql}}
+ {{:assign account_condition="account.code LIKE "|cat:$account_code}}
{{else}}
- {{:assign account_code=$ligne_immo.account_code|substr:0:2|cat:"%"}}
+ {{:assign account_condition="("}}
+ {{#foreach from=$module.config.prefixes item="account_code"}}
+ {{:assign account_code=$account_code|cat:"%"|quote_sql}}
+ {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$account_code|cat:" OR "}}
+ {{/foreach}}
+ {{#foreach from=$module.config.unfinished item="account_code"}}
+ {{:assign account_code=$account_code|cat:"%"|quote_sql}}
+ {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$account_code|cat:" OR "}}
+ {{/foreach}}
+ {{:assign account_condition=$account_condition|cat:"0)"}}
{{/if}}
+
{{:assign date_immo=$info_immo.date_achat|or:$ligne_immo.date_achat}}
{{#select
@@ -55,7 +67,8 @@
INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction
INNER JOIN acc_accounts AS account ON account.id = line.id_account
INNER JOIN acc_years AS y ON y.id = trans.id_year
- WHERE account.code LIKE :account_code AND credit > 0
+ WHERE !account_condition
+ AND credit > 0
AND trans.date > :date_immo
AND credit_line_id NOT IN (
SELECT json_extract(link.document, '$.credit_line_id') AS credit_line_id FROM !table as link
@@ -64,7 +77,7 @@
SELECT json_extract(exit_link.document, '$.exit_line_id') AS line_id FROM !table as exit_link
WHERE json_extract(exit_link.document, '$.type') == "exit_link")
ORDER BY trans.date, trans.label;
- :account_code = $account_code
+ !account_condition = $account_condition
!table = $module.table
:date_immo = $date_immo
assign="credit_line"
@@ -86,22 +99,20 @@
}}
{{/if}}
-{{if $ligne_immo.account_code|substr:0:2 != $ligne_immo.account_code}}
-