diff --git a/_immobilisations.html b/_immobilisations.html
index d287632..fa31b31 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}}
+ Aucune immobilisation
- {{if $nb_immo == 0 || ! $table_presente}}
-
@@ -29,14 +29,6 @@
- {{* 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"}}
@@ -44,17 +36,8 @@
{{: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 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 status_condition="($$.status = 'managed' OR $$.status = 'amortized')"}}
+ {{:assign condition=$account_condition|cat:" AND line.debit > 0 AND "|cat:$status_condition}}
{{:assign nb_immo=0}}
{{:assign total_immo = 0}}
@@ -68,152 +51,105 @@
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
- LEFT JOIN !table AS info ON $$.line = line.id
+ INNER JOIN !table AS info ON $$.line = line.id
WHERE !condition
- ORDER BY trans.date DESC;
+ ORDER BY COALESCE(doc_date_achat, trans_date) DESC;
!table=$module.table
!condition=$condition
}}
{{: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 duration=$duration}}
- {{:assign montant_immo=$debit}}
- {{if $status == null}}
- {{:assign status="unknown"}}
+ {{: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}}
{{/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
*}}
- {{#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}}
+ {{#load
+ type="immo_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}}
{{* Immobilisation soldée ? *}}
- {{* TODO marquer archivée *}}
+ {{* TODO ¿ marquer archivée ? *}}
{{if $montant_immo == 0}}
{{:continue}}
{{/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}}
- {{#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 type="amort_link"
+ where="$$.immo_doc_id = :immo_doc_id"
+ :immo_doc_id = $immo_doc_id
+ assign="amort_link"
}}
- {{/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}}
+ {{if $amount == null}}
+ {{#select credit FROM acc_transactions_lines WHERE id = :amort_line_id;
+ :amort_line_id = $amort_line_id
+ }}
+ {{:assign amort_amount="%d+%d"|math:$amort_amount:$credit}}
+ {{/select}}
+ {{else}}
+ {{:assign amort_amount="%d+%d"|math:$amort_amount:$amount}}
+ {{/if}}
+ {{/load}}
{{* classement par onglet *}}
{{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 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}}
-
@@ -250,9 +186,8 @@
{{/if}}
-{{/if}}
#{{$immo_trans_id}}
- {{$trans_date|date_short}}
- {{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}}
+ #{{$immo_trans_id}}
+ {{$immo_date|date_short}}
+ {{$label_immo}}
{{$montant_immo|money_html:false|raw}}
{{if $duration != null}}{{$duration}}{{/if}}
{{$amort_amount|money_html:false|raw}}
{{"%d-%d"|math:$montant_immo:$amort_amount|money_html:false|raw}}
- {{$account_code}}
+ {{$account_code}}
- {{if ! $exist_amort || $status == "unknown"}}
+ {{*if $amort_amount == 0*}}
{{:linkbutton
- label="Paramètres"
- href="add_infos.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo
- shape="settings"
+ label="Détails"
+ href="details_immo.html?immo_doc_id=%s"|args:$immo_doc_id
+ shape="search"
}}
-{{* target="_dialog"*}}
- {{/if}}
+ {{* target="_dialog"*}}
+ {{*/if*}}
{{:linkbutton
label="Amortissements"
- href="amortization.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo
- shape="table"
+ 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"
}}
Aucune immobilisation
+{{/if}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 1f08e9b..781940a 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -1,199 +1,187 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations non amortissables ou non (encore) gérées *}} +{{* Liste des immobilisations non gérées ou non entièrement affecté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é +
-- Cette page liste les écritures pas (encore) prises en charge par le module et sans écriture d'amortissement associée. -
+{{:assign saved_hides=$module.config.hides}} +{{:assign var="user_hides" from="saved_hides.%s"|args:$logged_user.id}} - {{:assign saved_hides=$module.config.hides}} - {{:assign var="user_hides" from="saved_hides.%s"|args:$logged_user.id}} - - {{if $_POST|count == 0}} - {{:assign unhide=$user_hides.unhide_other}} +{{if $_POST|count == 0}} + {{:assign unhide=$user_hides.unhide_other}} +{{else}} + {{if $_POST.unhide == null}} + {{:assign unhide=0}} {{else}} - {{if $_POST.unhide == null}} - {{:assign unhide=0}} - {{else}} - {{:assign unhide=1}} + {{:assign unhide=1}} + {{/if}} + {{:assign var="user_hides.unhide_other" value=$unhide"}} + {{:assign var="saved_hides.%s"|args:$logged_user.id value=$user_hides}} + {{:save key="config" hides=$saved_hides}} +{{/if}} +{{if $unhide}} + {{:assign checked="checked"}} +{{/if}} + +{{* vérifier l'existence de la table du module *}} +{{if $module.table != null}} + {{:assign columns="$$.status as status, SUM($$.amount) as amount,"}} + {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} + {{:assign doc_condition="($$.status IS NULL OR $$.status == 'managed' OR $$.status == 'ignored')"}} +{{else}} + {{:assign columns=""}} + {{:assign table_join=""}} + {{:assign doc_condition="1"}} +{{/if}} + +{{* + lister les immobilisations non prises en charge par le module + ou dont le montant n'a pas été totalement affecté +*}} +{{:assign account_condition="("}} +{{#foreach from=$module.config.prefixes item="code"}} + {{:assign code=$code|cat:"%"|quote_sql}} + {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} +{{/foreach}} +{{:assign account_condition=$account_condition|cat:"0)"}} + +{{if $unhide == null}} + {{: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)"}} +{{else}} + {{:assign filter_condition="1"}} +{{/if}} + +{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:" AND "|cat:$doc_condition}} + +{{:assign nb_managed=0}} +{{:assign nb_ignored=0}} +{{:assign nb_null=0}} +{{:assign nb_other=0}} +{{#select + trans.id as immo_trans_id, + trans.label as trans_label, + trans.date as trans_date, + line.id as immo_line_id, + line.debit AS debit, + line.label AS line_label, + account.id as account_id, + account.code as account_code, + account.label as account_label, + !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 + !table_join + WHERE !condition + GROUP BY immo_line_id + ORDER BY trans.date DESC; + !columns=$columns + !table_join=$table_join + !table=$module.table + !condition=$condition + assign="immo_line" + }} + {{* + parmi les immos gérées, ne conserver que celles dont le montant dans le doc est non nul + et inférieur au montant de l'écriture d'immo + *}} + {{if $immo_line.status == 'managed'}} + {{if $immo_line.amount == null || $immo_line.amount == 0 || $immo_line.amount == $immo_line.debit}} + {{:continue}} {{/if}} - {{:assign var="user_hides.unhide_other" value=$unhide"}} - {{:assign var="saved_hides.%s"|args:$logged_user.id value=$user_hides}} - {{:save key="config" hides=$saved_hides}} {{/if}} - {{if $unhide}} - {{:assign checked="checked"}} + {{if $status == null}} + {{:assign nb_null="%d+1"|math:$nb_null}} + {{elseif $status == 'managed'}} + {{:assign nb_managed="%d+1"|math:$nb_managed}} + {{elseif $status == 'ignored'}} + {{:assign nb_ignored="%d+1"|math:$nb_ignored}} + {{else}} + {{:assign nb_other="%d+1"|math:$nb_other}} {{/if}} - + {{:assign var="immo_lines." value=$immo_line}} +{{/select}} +{{*:debug lines=$immo_lines nb_lines=$immo_lines|count nb_null=$nb_null nb_managed=$nb_managed nb_ignored=$nb_ignored nb_other=$nb_other unhide=$unhide*}} -| N° | -Date | -Libellé | -Montant | -N° compte | -Compte | -- |
|---|
| N° | +Ligne | +Date | +Libellé | +Montant | +Affecté | +Reste | +N° compte | +Compte | ++ |
|---|---|---|---|---|---|---|---|---|---|
| #{{$immo_trans_id}} | -{{$trans_date|date_short}} | -{{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}} | -{{"%f"|math:$debit|money_html:false|raw}} | -{{$account_code}} | -{{$account_label}} | -- {{:linkbutton - label="Paramètres" - href="add_infos.html?immo_line_id=%s&type_immo=other"|args:$immo_line_id - shape="settings" - target="_dialog" - }} - | -
Aucune immobilisation
- {{/if}} - + {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.immo_trans_id}} + {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.trans_id_year}} + {{:assign reste="%d-%d"|math:$line.debit:$line.amount}} +Aucune immobilisation
+{{/if}} diff --git a/amortization.html b/amortization.html index cf162a2..926eb52 100644 --- a/amortization.html +++ b/amortization.html @@ -3,10 +3,16 @@ {{* Lister les écritures d'amortissement associées à une immobilisation @param immo_line_id : id de la ligne d'immo + @param immo_doc_id : id du doc associé à l'immo @param type_immo : managed, amortized, archived, others *}} -{{* récupérer les infos de l'immobilisation *}} +{{* données de l'immobilisation *}} +{{#load type="immo" id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + {{#select line.id as immo_line_id, line.debit as montant, @@ -14,167 +20,113 @@ trans.id as immo_trans_id, trans.label as label, trans.date, - account.code as account_code + 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 = $_GET.immo_line_id|intval - assign=ligne_immo + :line_id = $info_immo.line + assign="ligne_immo" }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/select}} -{{:assign date_debut=$ligne_immo.date}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} -{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} - {{:assign duree=$duration}} - {{:assign date_debut=$date}} - {{:assign status=$status}} -{{/load}} +{{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date}} +{{:assign label_immo=$info_immo.label|or:$ligne_immo.label}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} + {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} +{{/if}} +{{if $info_immo.amount != null}} + {{:assign var="ligne_immo.montant" value=$info_immo.amount}} +{{/if}} -{{if $status == 'ignored'}} +{{if $info_immo.status == 'ignored'}} {{:error message="Cette immobilisation ne doit pas être amortie"}} {{/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 *}} {{:assign total_credits=0}} -{{#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=$ligne_immo.immo_trans_id - :account=$ligne_immo.account_code - }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} -{{/select}} +{{#load type="immo_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} + {{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 var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} {{:assign solde=$ligne_immo.montant}} +{{*:debug info_immo=$info_immo ligne_immo=$ligne_immo total_credits=$total_credits solde=$solde*}} -{{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} -{{#select - l_amort.credit as amort_amount, - l_amort.label as amort_line_label, - l_amort.id as amort_line_id, - CASE WHEN links.id_related = t_immo.id - THEN links.id_transaction - ELSE links.id_related - END as amort_trans_id, - trans.date as amort_date, - trans.label as amort_trans_label, - trans.id_year as amort_year, - account.id as account_id, - account.code as account_code, - account.label as account_label - 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_transactions as trans on l_amort.id_transaction = trans.id - INNER join acc_accounts as account on l_amort.id_account = account.id - WHERE l_immo.id = :line_id AND account.code LIKE '28%' - ORDER BY trans.date; - :line_id = $_GET.immo_line_id|intval - assign="amort_line" -}} - {{* lister les lignes d'amortissement liées à la ligne d'immobilisation *}} - {{#load type="link" - where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id AND $$.amort_line_id = :amort_line_id" - assign="line" - :immo_line_id=$_GET.immo_line_id|intval - :amort_trans_id=$amort_line.amort_trans_id - :amort_line_id = $amort_line.amort_line_id - }} - {{:assign var="linked_amort." value=$amort_line}} - {{/load}} - {{if $date_debut == null}} - {{:assign date_debut=$amort_date}} - {{/if}} -{{/select}} - -{{if $status == "amortized"}} +{{if $info_immo.status == "amortized"}} {{:assign amort_amount=$ligne_immo.montant}} {{:assign valeur_residuelle=0}} {{else}} {{:assign valeur_residuelle=$ligne_immo.montant}} - {{#foreach from=$linked_amort}} - {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} - {{/foreach}} {{/if}} -{{* Autres amortissements non rattachés *}} -{{:include file="_get_config.html" keep="module.config"}} -{{: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)"}} +{{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} +{{#load type="amort_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id = $_GET.immo_doc_id|intval +}} + {{#select + line.id as amort_line_id, + line.credit, + line.label as amort_line_label, + trans.id as amort_trans_id, + trans.label as amort_trans_label, + trans.date as amort_date, + trans.id_year as amort_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.amort_amount" value=$amount|or:$credit}} + {{:assign var="linked_amort.%s_%d"|args:$amort_date:$id value=$amort_line}} + {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_line.amort_amount}} + {{/select}} +{{/load}} {{:assign autres_amortissements=false}} -{{#select - line.id_transaction AS amort_trans_id - 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 - INNER JOIN acc_years AS y ON y.id = trans.id_year - WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) AND !filter_condition - ORDER BY trans.date, trans.label; - !filter_condition=$filter_condition - assign="amort" -}} - {{* voir s'il existe des écritures liées avec un numéro de compte d'immobilisation *}} +{{if $valeur_residuelle > 0}} + {{* Chercher des amortissements non rattachés à une immo *}} {{#select - links.id_transaction, - links.id_related, - trans.id AS trans_id - FROM acc_transactions_links AS links - INNER JOIN acc_transactions AS trans ON ( - CASE - WHEN links.id_transaction = :id_amort THEN links.id_related - WHEN links.id_related = :id_amort THEN links.id_transaction - END) = trans.id - INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - WHERE - links.id_transaction = :id_amort OR links.id_related = :id_amort - AND acc.code LIKE '21%' - LIMIT 1 - ; - :id_amort=$amort.amort_trans_id + line.id as amort_line_id, + line.id_transaction AS amort_trans_id + 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 + INNER JOIN acc_years AS y ON y.id = trans.id_year + WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) + ORDER BY trans.date, trans.label; }} - {{* voir s'il existe un doc associé à une ligne de l'amortissement *}} - {{:assign keep=true}} - {{#load type="link" - where="$$.amort_trans_id = :amort_trans_id" - :amort_trans_id = $amort.amort_trans_id - }} - {{if $amort_line_id == $amort.amort_line_id}} - {{:assign keep=false}} - {{:break}} - {{/if}} + {{* cette ligne d'amortissement a-t-elle un doc associé ? *}} + {{#load type="amort_link" + where="$$.amort_line_id = :amort_line_id" + :amort_line_id = $amort_line_id + }} {{else}} - {{:assign keep=false}} - {{/load}} - {{if $keep}} {{:assign autres_amortissements=true}} - {{/if}} - {{else}} - {{:assign autres_amortissements=true}} + {{/load}} {{/select}} -{{/select}} +{{/if}} {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}} @@ -200,16 +152,16 @@ {{if $_GET.ok}} {{if $_GET.msg|match:"attach"}} - {{:assign msg="Attachement écriture %s effectué"|args:$_GET.trans_id}} + {{:assign msg="Attachement amortissement %s effectué"|args:$_GET.trans_id}} {{elseif $_GET.msg|match:"detach"}} - {{:assign msg="Détachement écriture %s affectué"|args:$_GET.trans_id}} + {{:assign msg="Détachement amortissement %s affectué"|args:$_GET.trans_id}} {{elseif $_GET.msg|match:"amortissement"}} {{:assign msg="Amortissement enregistré"}} {{/if}}{{$msg}}
{{elseif $_GET.err}} {{if $_GET.msg|match:"attach"}} - {{:assign msg="Échec attachement"}} + {{:assign msg="Échec attachement amortissement"}} {{elseif $_GET.msg|match:"amortissement"}} {{:assign msg="Échec enregistrement amortissement"}} {{/if}} @@ -222,7 +174,7 @@{{:linkbutton label="Sortir du bilan" - href="balance_sheet_exit.html?immo_line_id=%s&type_immo=%s"|args:$_GET.immo_line_id:$_GET.type_immo + href="balance_sheet_exit.html?immo_line_id=%s&immo_doc_id=%s&type_immo=%s"|args:$_GET.immo_line_id:$_GET.immo_doc_id:$_GET.type_immo shape="export" class="main" }} @@ -238,14 +190,22 @@
Aucun amortissement enregistré pour cette immobilisation
{{/if}} -{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} - - {{* Autres amortissements non rattachés *}} - - {{if $autres_amortissements}} -
- Il existe des écritures d'amortissement qui ne sont pas rattachées à une immobilisation !
- Utilisez le bouton « Rattacher une écriture » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.
-
+ Il y a des écritures d'amortissement qui ne sont pas rattachées à une immobilisation !
+ Utilisez le bouton « Rattacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.
+
{{$msg}}
+{{elseif $_GET.err}} + {{:assign msg="L'opération a échoué"}} +{{$msg}}
+{{/if}} + +| N° | +Date | +Montant | +Libellé | +N° compte | +Compte | ++ |
|---|---|---|---|---|---|---|
| #{{$line.credit_trans_id}} | +{{$line.trans_date|date_short}} | +{{"%f"|math:$line.credit_amount|money_html:false|raw}} | +{{$line.trans_label}} + {{if $line.line_label != null && $line.line_label != $line.trans_label}} - {{$line.line_label}}{{/if}} + | +{{$line.account_code}} | +{{$line.account_label}} | ++ {{:linkbutton label="Attacher" href="attach_immo.html?credit_line_id=%d&immo_doc_id=%s"|args:$line.credit_line_id:$_GET.immo_doc_id shape="plus"}} + | +
Sélectionner une écriture d'avoir ou autre réduction du montant de l'acquisition pour l'associer à l'immobilisation
+ {{else}} +Aucune écriture au crédit du compte « {{$ligne_immo.account_code}} »
+ {{/if}} +| #{{$line.amort_trans_id}} | +#{{$line.amort_trans_id}} | {{$line.trans_date|date_short}} | {{"%f"|math:$line.amort_amount|money_html:false|raw}} | {{$line.trans_label}} {{if $line.line_label != null && $line.line_label != $line.trans_label}} - {{$line.line_label}}{{/if}} | -{{$line.account_code}} | +{{$line.account_code}} | {{$line.account_label}} | - {{:linkbutton label="Attacher" href="attach_amort.html?amort_line_id=%d&immo_line_id=%d"|args:$line.amort_line_id:$_GET.immo_line_id shape="plus"}} + {{if $_GET.init == null}} + {{:linkbutton label="Attacher" href="attach_amort.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$_GET.immo_line_id:$_GET.immo_doc_id shape="plus"}} + {{elseif $_GET.init}} + {{:linkbutton label="Attacher" href="attach_amort_init.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$_GET.immo_line_id:$_GET.immo_doc_id shape="plus"}} + {{/if}} |