diff --git a/_archives.html b/_archives.html
index eea991f..39d87d5 100644
--- a/_archives.html
+++ b/_archives.html
@@ -2,38 +2,6 @@
{{* Liste des immobilisations archivées *}}
-{{* Immobilisation archivées prises en charge *}}
-{{#load type="immo" where="$$.status = 'archived'"}}
- {{:assign var="lines." value="'%s'"|args:$line}}
-{{/load}}
-{{:assign lines=$lines|implode:","}}
-{{:assign lines="("|cat:$lines|cat:")"}}
-{{:assign condition="line.id IN %s"|args:$lines}}
-
-{{#select
- trans.id as trans_id,
- trans.label as trans_label,
- trans.date as trans_date,
- line.id as immo_id,
- account.id as account_id,
- account.code as account_code,
- account.label as account_label,
- line.debit AS debit,
- project.label as project_label,
- 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 acc_projects AS project ON line.id_project = project.id
- WHERE !condition
- ORDER BY trans.date DESC;
- !condition=$condition
- assign="immo_archivee"
-}}
- {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}}
-{{/select}}
-
{{* Immobilisation avec une écriture de sortie de bilan *}}
{{:read file="./defaut.json" assign="config_json"}}
{{:assign config_defaut=$config_json|json_decode}}
@@ -44,9 +12,7 @@
{{:assign condition=$condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}}
{{/foreach}}
{{:assign condition=$condition|cat:"0)"}}
-{{:assign cond2=$condition|replace:"account.":"acc2."}}
-{{:assign condition=$condition|cat:" AND "|cat:$cond2}}
-{{:assign condition=$condition|cat:" AND line.debit > 0 AND NOT (trans.status & 16)"}}
+{{:assign condition=$condition|cat:" AND acc2.code = account.code AND line.debit > 0 AND line.debit = line2.credit AND NOT (trans.status & 16)"}}
{{#select
trans.id as trans_id,
@@ -58,7 +24,8 @@
account.label as account_label,
line.debit AS debit,
project.label as project_label,
- trans.id_year as trans_id_year
+ trans.id_year as trans_id_year,
+ trans2.date as exit_date
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
@@ -72,9 +39,7 @@
!condition=$condition
assign="immo_archivee"
}}
- {{if ! $trans_id|key_in:$immo_archivees}}
- {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}}
- {{/if}}
+ {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}}
{{/select}}
@@ -83,7 +48,8 @@