diff --git a/_immobilisations.html b/_immobilisations.html index 9c4b6e6..2bb7174 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -30,13 +30,18 @@
{{* vérifier l'existence de la table du module *}} - {{#load limit="1"}} - {{:assign table_presente=true}} + {{if $module.table != null}} + {{:assign columns="$$.duration as duration, $$.status as status,"}} + {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} + {{:assign doc_condition1="($$.status <> 'ignored' AND $$.status <> 'archived')"}} + {{:assign doc_condition2="$$.status IS NULL"}} {{else}} - {{:assign table_presente=false}} - {{/load}} + {{:assign columns=""}} + {{:assign table_join=""}} + {{:assign doc_condition1="0"}} + {{:assign doc_condition2="1"}} + {{/if}} - {{if $table_presente}} {{* lister les immobilisations *}} {{:assign account_condition="("}} {{#foreach from=$module.config.prefixes item="code"}} @@ -44,7 +49,7 @@ {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} {{/foreach}} {{:assign account_condition=$account_condition|cat:"0)"}} - {{:assign doc_condition="($$.status <> 'ignored' AND $$.status <> 'archived')"}} + {{*:assign doc_condition="($$.status <> 'ignored' AND $$.status <> 'archived')"*}} {{:assign filter_condition="NOT ("}} {{#foreach from=$module.config.filters item="filter"}} @@ -52,9 +57,9 @@ {{: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 filter_condition="("|cat:$doc_condition2|cat:" 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 condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition1|cat:")"}} {{:assign nb_immo=0}} {{:assign total_immo = 0}} @@ -67,16 +72,17 @@ line.label AS line_label, account.id as account_id, account.code as account_code, - trans.id_year as trans_id_year, - $$.duration as duration, - $$.status as status + !columns + trans.id_year as trans_id_year FROM acc_transactions AS trans 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_years AS years ON trans.id_year = years.id - LEFT JOIN !table AS info ON $$.line = line.id + !table_join WHERE !condition ORDER BY trans.date DESC; + !columns=$columns + !table_join=$table_join !table=$module.table !condition=$condition }} @@ -250,9 +256,9 @@ {{/if}} -{{/if}} +{{*/if*}} - {{if $nb_immo == 0 || ! $table_presente}} + {{if $nb_immo == 0}}Aucune immobilisation
{{/if}}