diff --git a/_archives.html b/_archives.html
index ce92aff..56f6b14 100644
--- a/_archives.html
+++ b/_archives.html
@@ -5,6 +5,7 @@
Cette page liste les immobilisations sorties du bilan
+{{* Immobilisation avec une écriture de sortie de bilan *}}
{{:include file="_get_config.html" keep="module.config"}}
{{* lister les immobilisations *}}
@@ -34,6 +35,7 @@
Montant
N° compte
Compte
+
Projet
@@ -53,61 +55,58 @@
line.debit AS debit,
account.id as account_id,
account.code as account_code,
- account.label as account_label
+ account.label as account_label,
+ project.label as project_label
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
}}
-
- {{* voir si l'immo est prise en charge *}}
- {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id assign="info_immo"}}
- {{:assign status=$status}}
- {{else}}
- {{:assign status=null}}
- {{/load}}
- {{if $status != "archived"}}
- {{:continue}}
- {{/if}}
- {{:assign date_mes=$info_immo.date_mes|or:$trans_date}}
{{:assign montant_immo=$debit}}
- {{* chercher le doc de sortie du bilan *}}
- {{:assign exit_date=null}}
- {{#load type="exit_link" where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id=$info_immo.id}}
- {{:assign exit_line_id=$exit_line_id}}
- {{#select
- trans.date
- FROM acc_transactions_lines AS line
- INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id
- WHERE line.id = :exit_line_id;
- :exit_line_id=$exit_line_id
- }}
- {{:assign exit_date=$date}}
- {{/select}}
+ {{* voir si l'immo est prise en charge *}}
+ {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id|intval}}
+ {{:assign status=$status}}
+ {{else}}
+ {{:assign amortissable="nsp"}}
+ {{:assign status="unknown"}}
{{/load}}
+ {{if $status == "ignored"}}
+ {{:continue}}
+ {{/if}}
- {{* déduire le montant 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
+ *}}
+ {{:assign solde_immo=$montant_immo}}
{{:assign credit_immo=null}}
- {{:assign total_credits=0}}
- {{#load
- type="credit_link"
- where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $info_immo.id
+ {{#select
+ CASE links.id_related = :immo_trans_id
+ WHEN true THEN links.id_transaction
+ WHEN false THEN links.id_related
+ END as other_id,
+ line.credit,
+ MAX(trans2.date) as exit_date
+ FROM acc_transactions AS trans
+ INNER JOIN acc_transactions_links as links
+ ON (trans.id = links.id_transaction OR trans.id = links.id_related)
+ INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id
+ INNER JOIN acc_accounts AS acc ON line.id_account = acc.id
+ INNER JOIN acc_transactions AS trans2 ON trans2.id = other_id
+ WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account
+ ORDER BY trans2.date, trans2.id
+ ;
+ :immo_trans_id=$trans_id
+ :account=$account_code
+ assign="credit_immo."
}}
- {{if $amount == null}}
- {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id;
- :credit_line_id=$credit_line_id
- }}
- {{:assign total_credits="%d+%d"|math:$total_credits:$credit}}
- {{/select}}
- {{else}}
- {{:assign total_credits="%d+%d"|math:$total_credits:$amount}}
- {{/if}}
- {{/load}}
- {{:assign solde_immo="%d-%d"|math:$montant_immo:$total_credits}}
+ {{:assign solde_immo="%d-%d"|math:$solde_immo:$credit}}
+ {{:assign exit_date=$exit_date}}
+ {{/select}}
{{if $solde_immo == 0}}
{{:assign status="archived"}}
@@ -117,6 +116,11 @@
{{:continue}}
{{/if}}
+ {{:assign nb=$credit_immo|count}}
+ {{:assign nb="%d-1"|math:$nb}}
+ {{:assign var="last_credit" from="credit_immo.%d"|args:$nb}}
+ {{:assign montant_immo=$last_credit.credit}}
+
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}}
{{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}}
{{:assign nb_immo="%d+1"|math:$nb_immo}}
@@ -145,15 +149,15 @@
{{/select}}
{{/if}}
diff --git a/_common_attach.html b/_common_attach.html
deleted file mode 100644
index 728ee1f..0000000
--- a/_common_attach.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{{* -*- brindille -*- *}}
-
-{{*
- Enregistrer l'association entre une ligne d'immo et une autre ligne (amort, credit, cession, sortie)
- @param immo_doc_id : id du doc associé à la ligne d'immobilisation
- @param trans_id : id de l'écriture à attacher
-*}}
-{{* données de l'immobilisation *}}
-{{:include file="_get_immo_data.html" immo_doc_id=$immo_doc_id|intval keep="ligne_immo, message"}}
-{{if $message != null}}
- {{:error message=$message}}
-{{/if}}
-
-{{* chercher les liaisons de l'écriture d'immobilisation *}}
-{{#select
- CASE links.id_related = :immo_trans_id
- WHEN true THEN links.id_transaction
- WHEN false THEN links.id_related
- END as linked_id
- FROM acc_transactions_links as links
- WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id;
- :immo_trans_id = $ligne_immo.trans_id
-}}
- {{:assign var="linked_transactions." value=$linked_id}}
-{{/select}}
-
-{{* ajouter la nouvelle liaison *}}
-{{:assign var="linked_transactions." value=$trans_id}}
-{{* Enregistrer les liaisons *}}
-{{:api
- method="POST"
- path="accounting/transaction/%s/transactions"|args:$ligne_immo.trans_id
- assign="result"
- assign_code="result_code"
- transactions=$linked_transactions
-}}
-
diff --git a/_common_detach.html b/_common_detach.html
deleted file mode 100644
index b4e80d0..0000000
--- a/_common_detach.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{{* -*- brindille -*- *}}
-
-{{*
- Supprimer l'association entre deux lignes
- @param immo_doc_id : id du doc associé à la ligne d'immobilisation
- @param line_id : id de la ligne à détacher
-*}}
-{{* données de l'immobilisation *}}
-{{:include file="_get_immo_data.html" immo_doc_id=$immo_doc_id|intval keep="ligne_immo, message"}}
-{{if $message != null}}
- {{:error message=$message}}
-{{/if}}
-
-{{* chercher la deuxième écriture *}}
-{{#select
- id_transaction
- FROM acc_transactions_lines
- WHERE id = :line_id;
- :line_id = $line_id|intval
-}}
- {{:assign trans_id=$id_transaction}}
-{{else}}
- {{:error message="Écriture non trouvée"}}
-{{/select}}
-
-{{*
- chercher les liaisons de l'écriture d'immobilisation
- et supprimer la liaison avec la deuxième écriture
-*}}
-{{#select
- CASE links.id_related = :immo_trans_id
- WHEN true THEN links.id_transaction
- WHEN false THEN links.id_related
- END as linked_id
- FROM acc_transactions_links as links
- WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id;
- :immo_trans_id = $ligne_immo.trans_id
- }}
- {{if $linked_id != $trans_id}}
- {{:assign var="linked_transactions." value=$linked_id}}
- {{/if}}
-{{/select}}
-
-{{* Enregistrer les liaisons *}}
-{{:api
- method="POST"
- path="accounting/transaction/%s/transactions"|args:$ligne_immo.trans_id
- assign="result"
- assign_code="result_code"
- transactions=$linked_transactions
-}}
diff --git a/_get_amort_lines.html b/_get_amort_lines.html
deleted file mode 100644
index dd115e8..0000000
--- a/_get_amort_lines.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{{* -*- brindille -*- *}}
-
-{{*
- lister les lignes d'amortissement liées à la ligne d'immobilisation
- @param immo_doc_id : id du doc associé à l'immobilisation
- @result linked_amort : lignes d'amortissement liées à la ligne d'immobilisation
- @result total_amort : montant total des amortissements de l'immobilisation
- @result created_amort : vrai s'il y a au moins un amortissement créé par le module dans la liste
-*}}
-
-{{:assign total_amort=0}}
-{{#load type="amort_link"
- where="$$.immo_doc_id = :immo_doc_id"
- :immo_doc_id = $immo_doc_id|intval
- assign="amort_info"
-}}
- {{#select
- line.id as line_id,
- line.credit as amount,
- line.label as line_label,
- trans.id as trans_id,
- trans.label as trans_label,
- trans.date as date,
- trans.id_year as year,
- account.id as account_id,
- account.code as account_code,
- account.label as account_label
- FROM acc_transactions_lines AS line
- INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id
- INNER join acc_accounts AS account on line.id_account = account.id
- WHERE line.id = :amort_line_id
- ;
- :amort_line_id = $amort_line_id
- assign="amort_line"
- }}
- {{:assign var="amort_line.amount" value=$amort_info.amount|or:$amort_line.amount}}
- {{if $amort_info.created}}
- {{:assign var="amort_line.created" value=true}}
- {{:assign var="created_amort" value=true}}
- {{/if}}
- {{:assign var="linked_amort.%s_%d"|args:$amort_line.date:$amort_info.id value=$amort_line}}
- {{:assign total_amort="%d+%d"|math:$total_amort:$amort_line.amount}}
- {{/select}}
-{{/load}}
diff --git a/_get_credit_lines.html b/_get_credit_lines.html
deleted file mode 100644
index c06adc5..0000000
--- a/_get_credit_lines.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{{* -*- brindille -*- *}}
-
-{{*
- chercher des écritures liées à l'immo paramètre au crédit du même compte
- @param immo_doc_id : id du doc associé à l'immobilisation
- @result linked_immos : liste des écritures liées
- @result total_credits : montant total des écritures
-*}}
-{{:assign linked_immos=null}}
-{{:assign total_credits=0}}
-{{#load type="credit_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$immo_doc_id|intval}}
- {{#select
- line.credit,
- line.id as line_id,
- trans.id as trans_id,
- trans.label,
- trans.date,
- trans.id_year as year,
- account.id as account_id,
- account.code as account_code,
- account.label as account_label
- FROM acc_transactions_lines AS line
- INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id
- INNER join acc_accounts AS account on line.id_account = account.id
- WHERE line.id = :credit_line_id;
- :credit_line_id=$credit_line_id
- }}
- {{:assign credit=$credit}}
- {{:assign var="linked_immos." doc=$id trans_id=$trans_id credit_line_id=$line_id label=$label amount=$credit date=$date account_id=$account_id account_code=$account_code account_label=$account_label year=$year}}
- {{/select}}
- {{if $amount == null}}
- {{:assign total_credits="%d+%d"|math:$total_credits:$credit}}
- {{else}}
- {{:assign total_credits="%d+%d"|math:$total_credits:$amount}}
- {{/if}}
-{{/load}}
diff --git a/_get_free_amort.html b/_get_free_amort.html
deleted file mode 100644
index 8a2649b..0000000
--- a/_get_free_amort.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{{* -*- brindille -*- *}}
-
-{{*
- lister les amortissement non rattachés à une immo
- @param filter_condition
-*}}
-{{#select
- line.id as line_id,
- line.id_transaction as trans_id,
- line.credit as amount,
- line.label as line_label,
- trans.date as trans_date,
- trans.label as trans_label,
- trans.id_year as year,
- account.id as account_id,
- account.code as account_code,
- account.label as account_label
- FROM acc_transactions_lines AS line
- INNER JOIN acc_accounts AS account ON account.id = line.id_account
- INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction
- WHERE credit > 0 AND (NOT trans.status & 16) AND !filter_condition
- ORDER BY trans.date, trans.label;
- !filter_condition=$filter_condition
- assign="amort_line"
-}}
- {{* voir s'il existe des lignes d'immo liées à cette ligne d'amortissement *}}
- {{:assign amort_amount=0}}
- {{:assign keep_amort=true}}
- {{#load type="amort_link"
- where="$$.amort_line_id = :amort_line_id"
- :amort_line_id=$amort_line.line_id|intval
- assign="amort_link"
- }}
- {{if $amort_link.amount == null || $amort_link.amount == 0}}
- {{:assign amort_amount=$amort_line.amount}}
- {{:assign keep_amort=false}}
- {{else}}
- {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}}
- {{/if}}
- {{else}}
- {{* pas de ligne d'immo liée à cette ligne d'amort => garder cette ligne d'amortissement *}}
- {{/load}}
- {{if $keep_amort && $amort_amount < $amort_line.amount}}
- {{:assign var="amort_line.amount" value="%d-%d"|math:$amort_line.amount:$amort_amount}}
- {{:assign var="free_amort_lines." value=$amort_line}}
- {{/if}}
-{{/select}}
diff --git a/_get_immo_data.html b/_get_immo_data.html
deleted file mode 100644
index 513ec0b..0000000
--- a/_get_immo_data.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{{* -*- brindille -*- *}}
-
-{{*
- Récupérer les infos d'une immobilisation
- @param immo_doc_id : id du document associé à l'immobilisation
- @result info_immo : infos du document associé
- @result ligne_immo : données de la base
- @result message non null si une erreur s'est produite
-*}}
-
-{{#load id=$immo_doc_id|intval assign="info_immo"}}
-{{else}}
- {{:assign error=true}}
- {{:assign message="Immobilisation non trouvée"}}
-{{/load}}
-
-{{if ! $error}}
- {{#select
- line.id as line_id,
- line.debit as amount,
- line.label as line_label,
- line.id_project as id_project,
- trans.id as trans_id,
- trans.label as trans_label,
- trans.date as date_achat,
- account.id as account_id,
- account.code as account_code,
- account.label as account_label
- FROM acc_transactions_lines AS line
- INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id
- INNER JOIN acc_accounts AS account ON line.id_account = account.id
- WHERE line.id = :line_id;
- :line_id = $info_immo.line
- assign="ligne_immo"
- }}
- {{else}}
- {{:assign message="Immobilisation non trouvée"}}
- {{/select}}
-{{/if}}
diff --git a/_immobilisations.html b/_immobilisations.html
index ab4d4d6..d287632 100644
--- a/_immobilisations.html
+++ b/_immobilisations.html
@@ -3,16 +3,16 @@
{{* Liste des immobilisations en cours d'amortissement ou amorties *}}
{{:include file="_get_config.html" keep="module.config"}}
+
-
- {{if $type_immo == "managed"}}
- Cette page liste les immobilisations en cours d'amortissement
- {{elseif $type_immo == "amortized"}}
- Cette page liste les immobilisations dont l'amortissement est terminé
- {{/if}}
-
+
+ {{if $type_immo == "managed"}}
+ Cette page liste les immobilisations en cours d'amortissement
+ {{elseif $type_immo == "amortized"}}
+ Cette page liste les immobilisations dont l'amortissement est terminé
+ {{/if}}
+
-{{if $module.table != null}}
@@ -29,6 +29,14 @@
+ {{* 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 *}}
{{:assign account_condition="("}}
{{#foreach from=$module.config.prefixes item="code"}}
@@ -36,8 +44,17 @@
{{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
{{/foreach}}
{{:assign account_condition=$account_condition|cat:"0)"}}
- {{:assign status_condition="($$.status = 'managed' OR $$.status = 'amortized')"}}
- {{:assign condition=$account_condition|cat:" AND line.debit > 0 AND "|cat:$status_condition}}
+ {{:assign doc_condition="($$.status <> 'ignored' AND $$.status <> 'archived')"}}
+
+ {{: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 total_immo = 0}}
@@ -51,81 +68,152 @@
account.id as account_id,
account.code as account_code,
trans.id_year as trans_id_year,
- info.id as immo_doc_id,
$$.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
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
- INNER JOIN !table AS info ON $$.line = line.id
+ LEFT JOIN !table AS info ON $$.line = line.id
WHERE !condition
- ORDER BY COALESCE(doc_date_achat, trans_date) DESC;
+ ORDER BY trans.date DESC;
!table=$module.table
!condition=$condition
}}
- {{if $status != "managed" && $status != "amortized"}}
- {{:continue}}
- {{/if}}
{{: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 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}}
- {{:assign label_immo=$label_immo|cat:" — "|cat:$line_label}}
+ {{:assign duration=$duration}}
+ {{:assign montant_immo=$debit}}
+ {{if $status == null}}
+ {{:assign status="unknown"}}
{{/if}}
- {{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}}
- {{#load
- type="credit_link"
- where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $immo_doc_id
- }}
- {{if $amount == null}}
- {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id;
- :credit_line_id=$credit_line_id
- }}
- {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}}
- {{/select}}
- {{else}}
- {{:assign montant_immo="%d-%d"|math:$montant_immo:$amount}}
- {{/if}}
- {{/load}}
+ {{* 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
+ *}}
+ {{#select
+ CASE links.id_related = :immo_trans_id
+ WHEN true THEN links.id_transaction
+ WHEN false THEN links.id_related
+ END as other_id,
+ line.credit
+ FROM acc_transactions AS trans
+ INNER JOIN acc_transactions_links as links
+ ON (trans.id = links.id_transaction OR trans.id = links.id_related)
+ INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id
+ INNER JOIN acc_accounts AS acc ON line.id_account = acc.id
+ WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account;
+ :immo_trans_id=$immo_trans_id
+ :account=$account_code
+ }}
+ {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}}
+ {{/select}}
+ {{* Immobilisation soldée ? *}}
+ {{* TODO marquer archivée *}}
{{if $montant_immo == 0}}
- {{* Immobilisation soldée *}}
{{:continue}}
{{/if}}
- {{* montant des amortissements liés à l'immobilisation *}}
- {{:include file="./_get_amort_lines.html" immo_doc_id=$immo_doc_id keep="total_amort"}}
- {{:assign amort_amount=$total_amort}}
+ {{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}}
+ {{: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}}
+ {{#foreach from=$amort_lines key="amort_trans_id" item="lines"}}
+ {{:assign nb=$lines|count}}
+ {{* lister les docs de liaison de l'écriture d'amortissement *}}
+ {{:assign links=null}}
+ {{#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}}
+
+ {{#foreach from=$lines item="line"}}
+ {{* voir s'il existe une ligne associée à l'écriture d'amortissement *}}
+ {{:assign line_link_exist=false}}
+ {{#foreach from=$links item="link"}}
+ {{if $link.amort_line_id == $line.amort_line_id}}
+ {{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}}
+ {{:assign line_link_exist=true}}
+ {{/if}}
+ {{/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 *}}
{{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}}
- {{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}}
+ {{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}}
+ {{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}} {{* ?? *}}
{{:assign nb_immo="%d+1"|math:$nb_immo}}
{{:assign total_immo="%d+%d"|math:$total_immo:$montant_immo}}
{{: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}}
+ {{/if}}
+
diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html
index 0401feb..1f08e9b 100644
--- a/_immobilisations_autres.html
+++ b/_immobilisations_autres.html
@@ -1,186 +1,199 @@
{{* -*- brindille -*- *}}
-{{* Liste des immobilisations non gérées ou non entièrement affectées *}}
+{{* Liste des immobilisations non amortissables ou non (encore) gérées *}}
{{:include file="_get_config.html" keep="module.config"}}
-
- Cette page liste les immobilisations pas encore prises en charge
- par le module ou les écritures de la balance d'ouverture initiale
- dont le montant n'est pas encore totalement affecté
-
{{:input type="radio-btn" name="classify" value="managed" label="Immobilisation à amortir" help="Cette immobilisation sera classée parmi les immobilisations amortissables" default=$choix_defaut}}
+ {{:input type="radio-btn" name="classify" value="amortized" label="Amortissement terminé" help="Cette immobilisation sera classée parmi les immobilisations amorties" default=$choix_defaut}}
{{:input type="radio-btn" name="classify" value="archived" label="Immobilisation sortie du bilan" help="Cette immobilisation sera classée parmi les immobilisations sorties du bilan" default=$choix_defaut}}
{{:input type="radio-btn" name="classify" value="ignored" label="Immobilisation à ignorer" help="Cette écriture n'apparaitra plus dans la liste des immobilisations" default=$choix_defaut}}