diff --git a/_immobilisations.html b/_immobilisations.html index fa31b31..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,105 +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 }} {{: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}} - {{* - 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 *}} - {{#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}} + {{#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 ? *}} + {{* TODO marquer archivée *}} {{if $montant_immo == 0}} {{:continue}} {{/if}} - {{* chercher des lignes des écritures d'amortissement liées à la ligne d'immobilisation *}} + {{* 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}} - {{#load type="amort_link" - where="$$.immo_doc_id = :immo_doc_id" - :immo_doc_id = $immo_doc_id - assign="amort_link" + {{#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." }} - {{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}} + {{/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}} - - - + + + - + @@ -186,8 +250,9 @@ {{/if}} +{{/if}}
#{{$immo_trans_id}}{{$immo_date|date_short}}{{$label_immo}}#{{$immo_trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}} {{$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 $amort_amount == 0*}} + {{if ! $exist_amort || $status == "unknown"}} {{:linkbutton - label="Détails" - href="details_immo.html?immo_doc_id=%s"|args:$immo_doc_id - shape="search" + label="Paramètres" + href="add_infos.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo + shape="settings" }} - {{* target="_dialog"*}} - {{*/if*}} +{{* target="_dialog"*}} + {{/if}} {{:linkbutton label="Amortissements" - 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" + href="amortization.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo + shape="table" }}
-{{/if}} -{{if $nb_immo == 0 || $module.table == null}} -

Aucune immobilisation

-{{/if}} + {{if $nb_immo == 0 || ! $table_presente}} +

Aucune immobilisation

+ {{/if}} +
diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 781940a..1f08e9b 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -1,187 +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é -

+
-{{:assign saved_hides=$module.config.hides}} -{{:assign var="user_hides" from="saved_hides.%s"|args:$logged_user.id}} +

+ Cette page liste les écritures pas (encore) prises en charge par le module et sans écriture d'amortissement associée. +

-{{if $_POST|count == 0}} - {{:assign unhide=$user_hides.unhide_other}} -{{else}} - {{if $_POST.unhide == null}} - {{:assign unhide=0}} + {{: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}} {{else}} - {{: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 $_POST.unhide == null}} + {{:assign unhide=0}} + {{else}} + {{: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 $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 $unhide}} + {{:assign checked="checked"}} {{/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*}} +
+
+ {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }} +
+
-
-
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées" }} -
-
+ + + + + + + + + + + + + -{{if $immo_lines|count > 0}} -
N°DateLibelléMontantN° compteCompte
- - - - - - - - - - - - - - - - {{#foreach from=$immo_lines item="line"}} + {{* vérifier l'existence de la table du module *}} + {{#load limit="1"}} + {{: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')"}} + {{:assign doc_condition2="$$.status IS NULL"}} + {{else}} + {{:assign columns=""}} + {{:assign table_join=""}} + {{:assign doc_condition1="0"}} + {{:assign doc_condition2="1"}} + {{/load}} - {{if $unhide == null}} - {{if $status == "ignored"}} + {{* lister les immobilisations *}} + {{: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 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_condition1|cat:")"}} + + {{:assign nb_immo=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 + ORDER BY trans.date DESC; + !columns=$columns + !table_join=$table_join + !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}} + + {{if $status == null}} + {{:assign status="unknown"}} + {{/if}} + + {{if $unhide == null}} + {{if $status != "unknown"}} + {{:continue}} + {{/if}} + {{else}} + {{if $status != "ignored" && $status != "unknown"}} + {{:continue}} + {{/if}} + {{* vérifier si le libellé aurait pu être filtré *}} + {{#foreach from=$module.config.filters item="filter"}} + {{if $filter|strpos:$trans_label !== false}} + {{:assign status="ignored"}} + {{/if}} + {{/foreach}} + {{/if}} + + {{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} + {{:assign amort_lines=null}} + {{#select + l_amort.credit as amort_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="amort_lines." + }} + {{/select}} + {{:assign amort_amount=0}} + {{#foreach from=$amort_lines item="line"}} + {{* voir s'il existe un doc associé à l'écriture d'amortissement *}} + {{#load type="link" + where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id AND $$.amort_line_id = :amort_line_id" + :immo_line_id = $immo_line_id + :amort_trans_id = $line.amort_trans_id + :amort_line_id = $line.amort_line_id + }} + {{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}} + {{else}} + {{* TODO À VÉRIFIER (cas multi-lignes) *}} + {{:assign amort_amount="%d+%d"|math:$amort_amount:$line.amount}} + {{/load}} + {{/foreach}} + {{if $amort_amount != 0}} {{:continue}} {{/if}} - {{else}} - {{* vérifier si le libellé aurait pu être filtré *}} - {{#foreach from=$module.config.filters item="filter"}} - {{if $filter|strpos:$trans_label !== false}} - {{:assign status="ignored"}} - {{/if}} - {{/foreach}} - {{/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}} - - - - - - - - - - - - - {{/foreach}} - -
N°LigneDateLibelléMontantAffectéResteN° compteCompte
#{{$line.immo_trans_id}}{{$line.immo_line_id}}{{$trans_date|date_short}}{{$line.trans_label}}{{if $line.line_label != null && $line.line_label != $line.trans_label}} — {{$line.line_label}}{{/if}}{{"%f"|math:$line.debit|money_html:false|raw}}{{"%f"|math:$line.amount|money_html:false|raw}}{{"%f"|math:$reste|money_html:false|raw}}{{$line.account_code}}{{$line.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"*}} -
-{{else}} -

Aucune immobilisation

-{{/if}} + {{:assign nb_immo="%d+1"|math:$nb_immo}} + + #{{$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" + }} + + + {{/select}} + + + {{if $nb_immo == 0}} +

Aucune immobilisation

+ {{/if}} +
diff --git a/amortization.html b/amortization.html index 926eb52..cf162a2 100644 --- a/amortization.html +++ b/amortization.html @@ -3,16 +3,10 @@ {{* 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 *}} -{{* 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}} - +{{* récupérer les infos de l'immobilisation *}} {{#select line.id as immo_line_id, line.debit as montant, @@ -20,113 +14,167 @@ trans.id as immo_trans_id, trans.label as label, trans.date, - account.code as account_code, - account.label as account_label + account.code as account_code 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" + :line_id = $_GET.immo_line_id|intval + assign=ligne_immo }} {{else}} - {{:error message="Immobilisation non trouvée"}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{/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}} -{{: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}} +{{#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}} -{{if $info_immo.status == 'ignored'}} +{{if $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}} -{{#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}} +{{#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}} {{: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*}} -{{if $info_immo.status == "amortized"}} +{{* 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"}} {{: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}} -{{* 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}} +{{* 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)"}} {{:assign autres_amortissements=false}} -{{if $valeur_residuelle > 0}} - {{* Chercher des amortissements non rattachés à une immo *}} +{{#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 *}} {{#select - 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; + 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 }} - {{* 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 - }} + {{* 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}} {{else}} - {{:assign autres_amortissements=true}} + {{:assign keep=false}} {{/load}} + {{if $keep}} + {{:assign autres_amortissements=true}} + {{/if}} + {{else}} + {{:assign autres_amortissements=true}} {{/select}} -{{/if}} +{{/select}} {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}} @@ -152,16 +200,16 @@ {{if $_GET.ok}} {{if $_GET.msg|match:"attach"}} - {{:assign msg="Attachement amortissement %s effectué"|args:$_GET.trans_id}} + {{:assign msg="Attachement écriture %s effectué"|args:$_GET.trans_id}} {{elseif $_GET.msg|match:"detach"}} - {{:assign msg="Détachement amortissement %s affectué"|args:$_GET.trans_id}} + {{:assign msg="Détachement écriture %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 amortissement"}} + {{:assign msg="Échec attachement"}} {{elseif $_GET.msg|match:"amortissement"}} {{:assign msg="Échec enregistrement amortissement"}} {{/if}} @@ -174,7 +222,7 @@

{{:linkbutton label="Sortir du bilan" - 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 + href="balance_sheet_exit.html?immo_line_id=%s&type_immo=%s"|args:$_GET.immo_line_id:$_GET.type_immo shape="export" class="main" }} @@ -190,22 +238,14 @@

Immobilisation
-
#{{$ligne_immo.immo_trans_id}} {{$label_immo}}
-
Compte d'immobilisation
-
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
-
Montant de l'immobilisation
+
#{{$ligne_immo.immo_trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}
+
Montant
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
- {{if $total_credits > 0}} -
Montant des avoirs
-
{{"%f"|math:$total_credits|money_currency_html:false|raw}}
-
Montant à amortir
-
{{"%f"|math:$solde|money_currency_html:false|raw}}
- {{/if}}
Début d'amortissement
{{$date_debut|date_short}}
- {{if $info_immo.duration != null}} + {{if $duree != null}}
Durée
-
{{$info_immo.duration}} ans
+
{{$duree}} ans
{{/if}} {{if $valeur_residuelle > 0}}
Montant des amortissements
@@ -213,9 +253,9 @@
Valeur nette comptable
{{$valeur_residuelle|money_currency_html:false|raw}}
{{/if}} - {{if $info_immo.duration != null && $valeur_residuelle > 0}} + {{if $duree != null && $valeur_residuelle > 0}}
Annuité estimée
-
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$info_immo.duration|money_currency_html:false|raw}}
+
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$duree|money_currency_html:false|raw}}
{{/if}}
@@ -237,13 +277,13 @@ - {{#foreach from=$linked_amort|ksort item="line"}} + {{#foreach from=$linked_amort item="line"}} {{* données de l'écriture *}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.amort_trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} {{:assign solde="%f-%d"|math:$solde:$line.amort_amount}} - #{{$line.amort_trans_id}} + #{{$line.amort_trans_id}} {{$line.amort_date|date_short}} {{"%f"|math:$line.amort_amount|money_html:false|raw}} {{"%f"|math:$solde|money_html:false|raw}} @@ -253,10 +293,10 @@ — {{$line.amort_line_label}} {{/if}} - {{$line.account_code}} + {{$line.account_code}} {{$line.account_label}} - {{:linkbutton label="Détacher" href="detach_amort.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$ligne_immo.immo_line_id:$_GET.immo_doc_id shape="minus"}} + {{:linkbutton label="Détacher" href="detach_amort.html?amort_line_id=%d&immo_line_id=%d"|args:$line.amort_line_id:$ligne_immo.immo_line_id shape="minus"}} {{/foreach}} @@ -267,11 +307,16 @@

Aucun amortissement enregistré pour cette immobilisation

{{/if}} -{{if $autres_amortissements}} -

- 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. -

+{{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. +

+ {{/if}} {{/if}} {{:form_errors}} {{:admin_footer}} diff --git a/attach_amort.html b/attach_amort.html index f643f9a..4770afa 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -1,168 +1,74 @@ {{* -*- brindille -*- *}} {{* - Enregistrer la liaison entre une ligne d'écriture d'amortissement - et une ligne d'écriture d'immobilisation - @param immo_line_id : numéro de ligne de l'écriture d'immobilisation - @param amort_line_id : numéro de ligne de l'écriture d'amortissement - @param immo_doc_id : numéro du doc d'immo + Enregistrer la liaison entre une écriture d'amortissement et + l'écriture d'immobilisation correspondante *}} {{* chercher l'écriture d'immobilisation *}} {{#select - line.id_transaction as immo_trans_id, - trans.label as trans_label, - line.label as line_label - FROM acc_transactions_lines as line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - WHERE line.id = :line_id; + id_transaction + FROM acc_transactions_lines + WHERE id = :line_id; :line_id = $_GET.immo_line_id|intval - assign="ligne_immo" }} + {{:assign immo_trans_id=$id_transaction}} {{else}} - {{:error message="Immobilisation non trouvée"}} + {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_line_id}} {{/select}} -{{* chercher le doc associé à l'immo *}} -{{#load id=$_GET.immo_doc_id|intval}} - {{:assign label_immo=$label|or:$ligne_immo.trans_label}} -{{else}} - {{:error message="Immobilisation non trouvée"}} -{{/load}} - -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} - {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} -{{/if}} - {{* chercher l'écriture d'amortissement *}} {{#select - line.credit as amount, - line.label as line_label, - trans.date as amort_date, - trans.label as trans_label, - trans.id as trans_id, - acc.code as account_code, - acc.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 acc on line.id_account = acc.id - WHERE line.id = :line_id; + id_transaction + FROM acc_transactions_lines + WHERE id = :line_id; :line_id = $_GET.amort_line_id|intval - assign="amort_line" +}} + {{:assign amort_trans_id=$id_transaction}} +{{else}} + {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_line_id}} +{{/select}} + +{{* 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 = $immo_trans_id +}} + {{:assign var="linked_transactions." value=$linked_id}} +{{/select}} + +{{* ajouter la nouvelle liaison *}} +{{:assign var="linked_transactions." value=$amort_trans_id}} +{{:api + method="POST" + path="accounting/transaction/%s/transactions"|args:$immo_trans_id + assign="result" + assign_code="result_code" + transactions=$linked_transactions +}} + +{{* vérifier si cette liaison est déjà présente dans les documents pour éviter les doublons *}} +{{#load type="link" + where="$$.immo_line_id = :immo_line_id AND + $$.amort_trans_id = :amort_trans_id AND + $$.amort_line_id = :amort_line_id" + :immo_line_id=$_GET.immo_line_id|intval + :amort_trans_id = $amort_trans_id + :amort_line_id = $_GET.amort_line_id|intval + limit=1 }} {{else}} - {{:error message="Amortissement non trouvé"}} -{{/select}} -{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$amort_line.trans_id}} - -{{* montant de l'écriture d'amortissement déjà affecté *}} -{{:assign montant_affecte=0}} -{{#load type="amort_link" assign="linked_amort." - where="$$.amort_line_id = :amort_line_id" - :amort_line_id = $_GET.amort_line_id|intval -}} - {{:assign montant_affecte="%d+%d"|math:$montant_affecte:$amount}} + {{:save + key=""|uuid + type="link" + immo_line_id=$_GET.immo_line_id|intval + amort_line_id=$_GET.amort_line_id|intval + amort_trans_id=$amort_trans_id + }} {{/load}} -{{:assign reste="%d-%d"|math:$amort_line.amount:$montant_affecte}} - -{{* Traiter l'envoi du formulaire *}} -{{#form on="save"}} - - {{* vérifier que le montant saisi est inférieur au reste *}} - {{if $_POST.montant == null}} - {{if $montant_affecte == 0}} - {{:assign saved_amount=null}} - {{else}} - {{:assign saved_amount=$reste}} - {{/if}} - {{else}} - {{:assign montant_amort=$_POST.montant|money_int}} - {{if $montant_amort > $reste}} - {{:assign reste_nb="%f"|math:$reste|money_currency:false}} - {{:error message="Le montant de l'amortissement ne peut être supérieur au reste (%s)"|args:$reste_nb}} - {{/if}} - {{if $montant_amort == $amort_line.amount}} - {{:assign saved_amount=null}} - {{else}} - {{:assign saved_amount=$montant_amort}} - {{/if}} - {{/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.immo_trans_id - }} - {{:assign var="linked_transactions." value=$linked_id}} - {{/select}} - - {{* ajouter la nouvelle liaison *}} - {{:assign var="linked_transactions." value=$amort_line.trans_id}} - {{:api - method="POST" - path="accounting/transaction/%s/transactions"|args:$ligne_immo.immo_trans_id - assign="result" - assign_code="result_code" - transactions=$linked_transactions - }} - - {{* vérifier si cette liaison est déjà présente dans les documents pour éviter les doublons *}} - {{* TODO voir si nécessaire ? *}} - {{#load type="amort_link" - where="$$.immo_doc_id = :immo_doc_id AND $$.amort_line_id = :amort_line_id" - :immo_doc_id=$_GET.immo_doc_id|intval - :amort_line_id = $_GET.amort_line_id|intval - limit=1 - }} - {{else}} - {{:save - key=""|uuid - type="amort_link" - immo_doc_id=$_GET.immo_doc_id|intval - amort_line_id=$_GET.amort_line_id|intval - amount=$saved_amount - }} - {{/load}} - - {{:redirect force="amortization.html?immo_line_id=%s&immo_doc_id=%s&ok=1&msg=attach_amort"|args:$_GET.immo_line_id:$_GET.immo_doc_id}} -{{/form}} - -{{:admin_header title="Amortir l'immobilisation" custom_css="./style.css" current="module_amortization"}} - -{{* barre de navigation *}} -{{if ! $dialog}} - {{:include file="_nav.html" current="config" subcurrent="init" subsubcurrent="parameter"}} -{{/if}} -{{:form_errors}} - -
-
-
Immobilisation
-
{{$label_immo}}
-
Amortissement
-
#{{$amort_line.trans_id}} {{$label_immo}}
-
Montant de l'écriture d'amortissement
-
{{$amort_line.amount|money_currency_html:false|raw}}
-
Montant déjà affecté
-
{{"%f"|math:$montant_affecte|money_currency_html:false|raw}}
-
Montant restant à affecter
-
{{"%f"|math:$reste|money_currency_html:false|raw}}
-
-
- -
-
-
- {{:input type="money" name="montant" label="Montant" default=$reste required=true help="Montant de l'amortissement"}} -
-
-

- {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}} -

-
- +{{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_line_id:$amort_trans_id}} diff --git a/attach_immo.html b/attach_immo.html deleted file mode 100644 index 3fa8001..0000000 --- a/attach_immo.html +++ /dev/null @@ -1,162 +0,0 @@ -{{* -*- brindille -*- *}} -{{:admin_header title="Écritures au crédit du compte d'immobilisation" custom_css="./style.css" current="module_amortization"}} - -{{* - Enregistrer la liaison entre une ligne d'immobilisation et - une ligne d'écriture au crédit du compte de l'immobilisation - @param credit_line_id : ligne d'écriture au crédit du compte de l'immobilisation - @param immo_doc_id : numéro du doc d'immo -*}} - -{{* chercher l'écriture d'immobilisation *}} -{{#load id=$_GET.immo_doc_id|intval assign="doc_immo"}} -{{else}} - {{:error message="Immobilisation non gérée ; vous devez d'abord renseigner ses informations"}} -{{/load}} -{{#select - line.id as immo_line_id, - line.id_transaction as immo_trans_id, - line.label as line_label, - trans.label as trans_label - FROM acc_transactions_lines as line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - WHERE line.id = :line_id; - :line_id = $doc_immo.line - assign="ligne_immo" -}} -{{else}} - {{:error message="Immobilisation non trouvée"}} -{{/select}} - -{{:assign label_immo=$doc_immo.label|or:$ligne_immo.trans_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}} - -{{* chercher l'écriture au crédit du compte d'immobilisation *}} -{{#select - line.id_transaction as credit_trans_id, - line.credit as amount, - trans.label as trans_label, - line.label as line_label - FROM acc_transactions_lines as line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - WHERE line.id = :line_id; - :line_id = $_GET.credit_line_id|intval - assign="credit_line" -}} -{{else}} - {{:error message="Impossible de trouver l'écriture au crédit du compte de l'immobilisation de la ligne « %s »"|args:$ligne_immo.trans_label}} -{{/select}} -{{:assign credit_trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$credit_line.credit_trans_id}} - -{{* montant de l'écriture de crédit déjà affecté *}} -{{:assign montant_affecte=0}} -{{#load type="immo_link" assign="linked_immo." - where="$$.credit_line_id = :credit_line_id" - :credit_line_id = $_GET.credit_line_id|intval -}} - {{:assign montant_affecte="%d+%d"|math:$montant_affecte:$amount}} -{{/load}} -{{:assign reste="%d-%d"|math:$credit_line.amount:$montant_affecte}} - -{{* Traiter l'envoi du formulaire *}} -{{#form on="save"}} - {{* vérifier que le montant saisi est inférieur au reste *}} - {{if $_POST.montant == null}} - {{if $montant_affecte == 0}} - {{:assign saved_credit=null}} - {{else}} - {{:assign saved_credit=$reste}} - {{/if}} - {{else}} - {{:assign montant_credit=$_POST.montant|money_int}} - {{if $montant_credit > $reste}} - {{:assign reste_nb="%f"|math:$reste|money_currency:false}} - {{:error message="Le montant de l'avoir ne peut être supérieur au reste (%s)"|args:$reste_nb}} - {{/if}} - {{if $montant_credit == $credit_line.amount}} - {{:assign saved_credit=null}} - {{else}} - {{:assign saved_credit=$montant_credit}} - {{/if}} - {{/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.immo_trans_id -}} - {{:assign var="linked_transactions." value=$linked_id}} -{{/select}} - -{{* ajouter la nouvelle liaison *}} -{{:assign var="linked_transactions." value=$credit_line.credit_trans_id}} - -{{* Enregistrer les liaisons *}} -{{:api - method="POST" - path="accounting/transaction/%s/transactions"|args:$ligne_immo.immo_trans_id - assign="result" - assign_code="result_code" - transactions=$linked_transactions -}} - -{{* - TODO ? vérifier le succès avant d'enregistrer le doc ? -*}} - -{{* enregistrer la liaison des lignes d'immo *}} -{{:save - key=""|uuid - type="immo_link" - immo_doc_id=$_GET.immo_doc_id|intval - credit_line_id=$_GET.credit_line_id|intval - amount=$saved_credit -}} - -{{:redirect force="details_immo.html?immo_doc_id=%s&ok=1&msg=attach_immo"|args:$_GET.immo_doc_id}} -{{/form}} - -{{if ! $dialog}} - {{:include - file="_nav.html" - current="config" - subcurrent="other" - subsubcurrent="immo" - type_immo="other" -}} -{{/if}} -{{:form_errors}} - -
-
-
Immobilisation
-
{{$label_immo}}
-
Écriture au crédit du compte d'immobilisation
-
#{{$credit_line.credit_trans_id}} {{$credit_line.trans_label}}{{if $credit_line.line_label != null && $credit_line.line_label != $credit_line.trans_label}} — {{$credit_line.line_label}}{{/if}}
-
Montant de l'écriture
-
{{$credit_line.amount|money_currency_html:false|raw}}
-
Montant déjà affecté
-
{{"%f"|math:$montant_affecte|money_currency_html:false|raw}}
-
Montant restant à affecter
-
{{"%f"|math:$reste|money_currency_html:false|raw}}
-
-
- -
-
-
- {{:input type="money" name="montant" label="Montant" default=$reste help="Montant de l'avoir"}} -
-
-

- {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}} -

-
- diff --git a/detach_amort.html b/detach_amort.html index caae1a0..c078c3f 100644 --- a/detach_amort.html +++ b/detach_amort.html @@ -3,9 +3,6 @@ {{* Supprimer l'association entre une écriture d'amortissement et une écriture d'immobilisation - @param immo_line_id : id de la ligne d'immo - @param amort_line_id : id de la ligne d'amortissement - @param immo_doc_id : id du doc associé à l'immo *}} {{* chercher l'écriture d'immobilisation *}} @@ -17,7 +14,7 @@ }} {{:assign immo_trans_id=$id_transaction}} {{else}} - {{:error message="Immobilisation non trouvée"}} + {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_line_id}} {{/select}} {{* chercher l'écriture d'amortissement *}} @@ -29,7 +26,7 @@ }} {{:assign amort_id=$id_transaction}} {{else}} - {{:error message="Amortissement non trouvé"}} + {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_line_id}} {{/select}} {{* @@ -60,13 +57,15 @@ }} {{* supprimer le doc de liaison entre les lignes *}} -{{#load type="amort_link" - where="$$.immo_doc_id = :immo_doc_id AND $$.amort_line_id = :amort_line_id" - :immo_doc_id=$_GET.immo_doc_id|intval +{{#load type="link" + where="$$.immo_line_id = :immo_line_id AND + $$.amort_trans_id = :amort_trans_id AND + $$.amort_line_id = :amort_line_id" + :immo_line_id=$_GET.immo_line_id|intval + :amort_trans_id = $amort_id|intval :amort_line_id = $_GET.amort_line_id|intval }} {{:delete id=$id}} {{/load}} -{{:redirect - to="amortization.html?immo_line_id=%s&ok=1&msg=detach&immo_doc_id=%s"|args:$_GET.immo_line_id:$_GET.immo_doc_id}} +{{:redirect to="amortization.html?immo_line_id=%s&ok=1&msg=detach&trans_id=%s"|args:$_GET.immo_line_id:$amort_id}} diff --git a/details_immo.html b/details_immo.html deleted file mode 100644 index 0954f68..0000000 --- a/details_immo.html +++ /dev/null @@ -1,159 +0,0 @@ -{{* -*- brindille -*- *}} - -{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} - -{{* - Afficher les détails d'une immmo - - permettre l'association d'une immo au crédit du compte de l'immo - - permettre de modifier les paramètres de l'immo - @param (OBSOLÈTE ?) immo_line_id : numéro de ligne de l'écriture d'immobilisation - @param immo_doc_id : numéro du doc d'immo -*}} - -{{* - TODO : permettre la modification des param (en cas d'erreur de saisie) - TODO : permettre de corriger le montant de l'amort et/ou de supprimer l'attachement - FAIT : déduire montant au crédit de la ligne d'immo -*}} - -{{* 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 - trans.id as immo_trans_id, - trans.label as label, - trans.date as date_achat, - line.id as immo_line_id, - line.debit as montant, - line.label as line_label, - 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}} - {{:error message="Immobilisation non trouvée"}} -{{/select}} - -{{:assign var="info_immo.amount" value=$info_immo.amount|or:$ligne_immo.montant}} -{{:assign var="info_immo.date_achat" value=$info_immo.date_achat|or:$ligne_immo.date_achat}} -{{:assign var="info_immo.date_mes" value=$info_immo.date_mes|or:$ligne_immo.date_achat}} -{{:assign var="info_immo.label" value=$info_immo.label|or:$ligne_immo.label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $info_immo.label}} - {{:assign var="info_immo.label" value=$info_immo.label|cat:" — "|cat:$ligne_immo.line_label}} -{{/if}} - -{{* - 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 linked_immos=null}} -{{:assign total_credits=0}} -{{#load type="immo_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} - {{#select - line.credit, - trans.id - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - WHERE line.id = :credit_line_id; - :credit_line_id=$credit_line_id - }} - {{:assign credit=$credit}} - {{:assign credit_trans_id=$id}} - {{/select}} - {{:assign var="linked_immos." value=$credit_trans_id}} - {{if $amount == null}} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} - {{else}} - {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} - {{/if}} -{{/load}} -{{:assign solde="%d-%d"|math:$info_immo.amount:$total_credits}} - -{{:assign total_amort=0}} -{{* lister les docs d'amortissement liées à la ligne d'immobilisation *}} -{{#load type="amort_link" - where="$$.immo_doc_id = :immo_doc_id" - :immo_doc_id=$_GET.immo_doc_id|intval -}} - {{if $amount != null}} - {{:assign total_amort="%d+%d"|math:$total_amort:$amount}} - {{else}} - {{#select credit FROM acc_transactions_lines WHERE id = :amort_line_id; - :amort_line_id=$amort_line_id - }} - {{:assign total_amort="%d+%d"|math:$total_amort:$credit}} - {{/select}} - {{/if}} -{{/load}} - -{{* barre de navigation *}} -{{if ! $dialog}} - {{if $total_credits == 0 && $total_amort == 0}} - {{:assign subsubcurrent="credit"}} - {{else}} - {{:assign subsubcurrent=null}} - {{/if}} - {{:include file="_nav.html" current="index" subcurrent="details" subsubcurrent=$subsubcurrent}} -{{/if}} -{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} - -{{if $_GET.ok}} - {{if $_GET.msg|match:"attach_amort"}} - {{:assign msg="Attachement amortissement effectué"}} - {{elseif $_GET.msg|match:"attach_immo"}} - {{:assign msg="Attachement avoir effectué"}} - {{elseif $_GET.msg|match:"info"}} - {{:assign msg="Données de l'immobilisation enregistrées"}} - {{/if}} -

{{$msg}}

-{{elseif $_GET.err}} - {{:assign msg="L'opération a échoué"}} -

{{$msg}}

-{{/if}} - -

- Paramètres de l'immobilisation - #{{$ligne_immo.immo_trans_id}} -

-
-
-
Immobilisation
-
#{{$ligne_immo.immo_trans_id}} {{$info_immo.label}}
-
Compte d'immobilisation
-
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
-
Montant de l'immobilisation
-
{{"%f"|math:$info_immo.amount|money_currency_html:false|raw}}
- {{if $total_credits > 0}} -
Montant des avoirs
-
{{"%f"|math:$total_credits|money_currency_html:false|raw}}
-
Écritures d'avoir
-
- {{#foreach from=$linked_immos item="id"}} - {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$id}} - #{{$id}} - {{/foreach}} - {{*:debug linked_immos=$linked_immos*}} -
-
Montant à amortir
-
{{"%f"|math:$solde|money_currency_html:false|raw}}
- {{/if}} -
Date d'acquisition
-
{{$info_immo.date_achat|date_short}}
- {{if $info_immo.date_mes != null && $info_immo.date_mes != $info_immo.date_achat}} -
Date de mise en service
-
{{$info_immo.date_mes|date_short}}
- {{/if}} -
Durée d'amortissement
-
{{$info_immo.duration}} ans
-
Montant des amortissements
-
{{$total_amort|money_currency_html:false|raw}}
-
-
diff --git a/ignore.html b/ignore.html index 96254fd..e396a77 100644 --- a/ignore.html +++ b/ignore.html @@ -62,7 +62,7 @@
Écriture
-
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
+
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
Montant
{{"%f"|math:$ligne_immo.amount|money_currency_html:false|raw}}
diff --git a/link.schema.json b/link.schema.json deleted file mode 100644 index 1524b55..0000000 --- a/link.schema.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "$schema": "https://json-schema.org/draft/2020-12/schema", - "description": "Schéma des liens entre documents", - "type": "object", - "properties": { - "type": { - "type": "string", - "enum": ["amort_link", "immo_link"] - }, - "immo_doc_id" : { - "description": "identifiant du document d'immobilisation associé", - "type" : "integer", - "exclusiveMinimum": 0 - }, - "amort_line_id" : { - "description": "numéro de ligne d'amortissement associée à l'immobilisation", - "type": "integer", - "exclusiveMinimum": 0 - }, - "credit_line_id": { - "description": "numéro de ligne au crédit du compte de l'immobilisation", - "type": "integer", - "exclusiveMinimum": 0 - }, - "amount": { - "description": "montant de la ligne d'amortissement ou de crédit", - "type": ["number", "null"] - } - }, - "required": ["type", "immo_doc_id"], - "if": {"properties": {"type": {"const": "amort_link"}}, "required": ["type"]}, - "then": {"required": ["amort_line_id"]}, - "else": - "if": {"properties": {"type": {"const": "immo_link"}}, "required": ["type"]}, - "then": {"required": ["credit_line_id"]}, -} diff --git a/link_immo.html b/link_immo.html deleted file mode 100644 index 3543ab8..0000000 --- a/link_immo.html +++ /dev/null @@ -1,142 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Lister les écritures au crédit du compte de l'immobilisation - paramètre et proposer de les attacher à l'immo paramètre - @param immo_doc_id : document associé à l'immo - *}} - -{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} -{{else}} - {{:error message="Informations de l'immobilisation non trouvées"}} -{{/load}} - -{{* récupérer les infos de l'immobilisation *}} -{{#select - trans.id as immo_trans_id, - trans.label as label, - trans.date as date_achat, - line.id as immo_line_id, - line.label as line_label, - line.debit as montant, - account.code as account_code - 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}} - {{:error message="Immobilisation « %s » non trouvée"|args:$info_immo.line}} -{{/select}} -{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} -{{:assign label_immo=$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}} - -{{* - lister les écritures au crédit du compte de l'immobilisation - variante : utiliser une jointure ; pas forcément plus efficace -*}} -{{#select - line.id as credit_line_id, - line.id_transaction as credit_trans_id, - line.credit as credit_amount, - line.label as line_label, - trans.id as immo_trans_id, - trans.date as trans_date, - trans.label as trans_label, - trans.id_year as credit_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 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 = :account_code AND credit > 0 - AND credit_trans_id NOT IN ( - SELECT - CASE WHEN id_transaction = credit_trans_id THEN id_transaction - ELSE id_related - END AS other_id - FROM acc_transactions_links WHERE other_id = credit_trans_id) - ORDER BY trans.date, trans.label; - :account_code = $ligne_immo.account_code - assign="other_immos." - }} -{{/select}} - -{{:admin_header title="Écritures au crédit du compte d'immobilisation" custom_css="./style.css" current="module_amortization"}} - -{{* barre de navigation *}} -{{if ! $dialog}} - {{:include - file="_nav.html" - current="config" - subcurrent="other" - subsubcurrent="immo" - type_immo="other" -}} -{{/if}} - -
-
- - Écritures au crédit du compte d'immobilisation « {{$ligne_immo.account_code}} » - - -
-
-
Immobilisation
-
#{{$ligne_immo.immo_trans_id}} {{$label_immo}}
-
Montant
-
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
-
Date de l'écriture d'immobilisation
-
{{$ligne_immo.date_achat|date_short}}
-
-
-
- - {{if $other_immos != null}} - - - - - - - - - - - - - - {{#foreach from=$other_immos item="line"}} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.credit_trans_id}} - {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.credit_year}} - - - - - - - - - - {{/foreach}} - -
N°DateMontantLibelléN° compteCompte
#{{$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}} -
-{{:form_errors}} -{{:admin_footer}} diff --git a/other_amortizations.html b/other_amortizations.html index ec439b7..91b379a 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -4,7 +4,6 @@ Lister les écritures d'amortissement indépendantes et proposer des les attacher à l'immo sélectionnée @param immo_line_id = id de la ligne d'immo - @param immo_doc_id id du doc d'immo associé *}} {{* récupérer les infos de l'immobilisation *}} @@ -18,19 +17,11 @@ assign=ligne_immo }} {{else}} - {{:error message="Immobilisation non trouvée"}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{/select}} -{{#load id=$_GET.immo_doc_id|intval}} - {{:assign label_immo=$label|or:$ligne_immo.label}} -{{else}} - {{:error message="Informations de l'immobilisation %s (%s) non trouvées"|args:$_GET.immo_line_id:$ligne_immo.label}} -{{/load}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} - {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} -{{/if}} - {{:include file="_get_config.html" keep="module.config"}} + {{if $_POST.unhide == null}} {{:assign filter_condition=" NOT ("}} {{#foreach from=$module.config.filters item="filter"}} @@ -63,26 +54,46 @@ !filter_condition=$filter_condition assign="amort" }} - {{* 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.amort_line_id|intval - assign="amort_link" + + {{* voir s'il existe des écritures liées avec un numéro de compte d'immobilisation *}} + {{#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 }} - {{if $amort_link.amount == null || $amort_link.amount == 0}} - {{:assign amort_amount=$amort.amort_amount}} - {{:assign keep_amort=false}} + {{* 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}} {{else}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}} + {{:assign keep=false}} + {{/load}} + {{if $keep}} + {{:assign var="autres_amortissements." value=$amort}} {{/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.amort_amount}} - {{:assign var="free_amort_lines." value=$amort}} - {{/if}} + {{:assign var="autres_amortissements." value=$amort}} + {{/select}} {{/select}} {{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}} @@ -95,7 +106,7 @@ subcurrent="other" subsubcurrent="amortization" type_immo="other" - autres_amort=$free_amort_lines + autres_amort=$autres_amortissements }} {{/if}} @@ -105,13 +116,13 @@
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées"}} + {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }}
-{{if $free_amort_lines != null}} +{{if $autres_amortissements != null}}
-

Immobilisation « {{$label_immo}} »

+

Immobilisation « {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}} »

@@ -125,24 +136,20 @@ - {{#foreach from=$free_amort_lines item="line"}} + {{#foreach from=$autres_amortissements item="line"}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.amort_trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} - + - + {{/foreach}} diff --git a/save_amort.html b/save_amort.html index 6a8459c..4aa8e64 100644 --- a/save_amort.html +++ b/save_amort.html @@ -3,7 +3,6 @@ {{* Créer une écriture d'amortissement @param immo_line_id : id de la ligne d'immobilisation - @param immo_doc_id : id du doc associé à l'immo *}} {{* Infos de l'immobilisation *}} @@ -12,7 +11,7 @@ line.debit as montant, line.id_project as project_id, line.label as line_label, - trans.id as immo_trans_id, + trans.id as trans_id, trans.label, trans.date, account.code as account_code @@ -22,90 +21,106 @@ LEFT JOIN acc_projects AS project ON line.id_project = project.id WHERE line.id = :line_id; :line_id = $_GET.immo_line_id|intval - assign="ligne_immo" + assign=ligne_immo }} {{else}} - {{:error message="Immobilisation non trouvée"}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{/select}} {{:assign date_debut=$ligne_immo.date}} - -{{#load id=$_GET.immo_doc_id|intval}} - {{:assign duree=$duration}} - {{if $date_mes != null}} - {{:assign date_debut=$date_mes}} - {{/if}} - {{:assign status=$status}} - {{:assign amort_label=$label|or:$ligne_immo.label}} - {{if $amount != null}} - {{:assign var="ligne_immo.montant" value=$amount}} - {{/if}} -{{else}} - {{:error message="Informations de l'immobilisation « %s » non trouvées ; vous devez d'abord les renseigner"|args:$ligne_immo.label}} -{{/load}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $amort_label}} +{{:assign var="amort_label" value="Amortissement %s"|args:$ligne_immo.label}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} {{:assign amort_label=$amort_label|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} -{{:assign var="amort_label" value="Amortissement %s"|args:$amort_label}} + +{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} + {{:assign duree=$duration}} + {{:assign date_debut=$date}} + {{:assign status=$status}} +{{else}} + {{:error message="Vous devez renseigner la date de mise en service et la durée d'immobilisation"}} +{{/load}} {{if $status == "amortized" || $status == "archived"}} {{:error message="Cette immobilisation est complètement amortie ; il est impossible d'ajouter une écriture d'amortissement"}} {{/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}} -{{#load - type="immo_link" - where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $_GET.immo_doc_id|intval +{{#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.trans_id + :account=$ligne_immo.account_code }} - {{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 total_credits="%d+%d"|math:$total_credits:$credit}} +{{/select}} {{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} {{:assign solde=$ligne_immo.montant}} -{{* chercher des écritures d'amortissement liées à la ligne d'immobilisation *}} -{{#load - type="amort_link" - where="$$.immo_doc_id = :immo_doc_id" - order="$$.date" - :immo_doc_id=$_GET.immo_doc_id|intval +{{* chercher des écritures d'amortissement liées à l'immobilisation *}} +{{#select + l_amort.credit as amort_amount, + l_amort.label as amort_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 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" +}} + {{#load type="link" + where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id" + order="$$.date" + assign="line" + :immo_line_id=$_GET.immo_line_id|intval :amort_trans_id=$amort_line.amort_trans_id }} - {{#select - line.credit, - trans.date as amort_date, - 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}} - {{/select}} -{{/load}} + {{if $line.amort_line_id == $amort_line.amort_line_id}} + {{:assign var="linked_amort." value=$amort_line}} + {{/if}} + {{else}} + {{:assign var="linked_amort." value=$amort_line}} + {{/load}} +{{/select}} + {{:assign total_amort=0}} {{:assign valeur_residuelle=$ligne_immo.montant}} -{{#foreach from=$linked_amort|ksort item="line"}} - {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$line.amort_amount}} - {{:assign total_amort="%d+%d"|math:$total_amort:$line.amort_amount}} - {{:assign date_debut=$line.amort_date}} - {{:assign code_amort=$line.account_code}} - {{:assign amort_account_label=$line.account_label}} +{{#foreach from=$linked_amort}} + {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} + {{:assign total_amort="%d+%d"|math:$total_amort:$amort_amount}} + {{:assign date_debut=$amort_date}} + {{:assign code_amort=$account_code}} + {{:assign amort_account_label=$account_label}} + {{:assign amort_label=$amort_label}} {{/foreach}} {{if $valeur_residuelle == 0}} @@ -206,7 +221,7 @@ }} {{if $account_ok == null}} {{:assign compte=$credit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s"|args:$compte:$selected_chart}} + {{:redirect url="add_account.html?account=%s&chart=%s&immo_line_id=%s"|args:$compte:$selected_chart:$_GET.immo_line_id}} {{/if}} {{* vérifier que le montant ne dépasse pas le solde restant *}} @@ -241,7 +256,7 @@ date=$_POST.date_amort label=$_POST.designation lines=$lines - linked_transactions=$ligne_immo.immo_trans_id|intval + linked_transactions=$ligne_immo.trans_id|intval }} {{* enregistrer la liaison des lignes *}} @@ -260,13 +275,14 @@ {{if $amort_trans_id != null}} {{:save key=""|uuid - type="amort_link" - immo_doc_id=$_GET.immo_doc_id|intval + type="link" + immo_line_id=$_GET.immo_line_id|intval amort_line_id=$amort_line_id|intval + amort_trans_id=$result.id }} {{/if}} - {{:redirect force="amortization.html?immo_line_id=%s&immo_doc_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_line_id:$_GET.immo_doc_id}} + {{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_line_id}} {{/form}} {{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}} diff --git a/schema.json b/schema.json index 23a924b..2acebc3 100644 --- a/schema.json +++ b/schema.json @@ -14,20 +14,11 @@ "description": "durée de l'amortissement en années", "type": "integer" }, - "label" : { - "description" : "libellé de l'immobilisation si besoin", - "type" : ["string", "null"] - }, "amount" : { "description": "montant de l'immobilisation si besoin", "type": ["integer", "null"] }, - "date_achat" : { - "description" : "date d'achat de l'immobilisation si besoin", - "type" : ["string", "null"], - "format" : "date" - }, - "date_mes" : { + "date" : { "description" : "date de mise en service de l'immobilisation", "type" : ["string", "null"], "format" : "date" @@ -37,5 +28,5 @@ "enum" : ["managed", "amortized", "archived", "ignored"] } }, - "required": ["type", "line", "duration", "status"] + "required": ["type", "line", "duration", "date"] } diff --git a/scripts.js b/scripts.js index babf511..7496328 100644 --- a/scripts.js +++ b/scripts.js @@ -14,13 +14,14 @@ function toggleInputs(idcb, idfields) { function toggleVisibility(idcheck, fields) { const elem = document.getElementById(idcheck); - fields.forEach(function (field) { + for (let id of fields) { + const field = document.getElementById(id); if (elem.checked) { - field.classList.remove('hidden'); + field.setAttribute('class', ''); } else { - field.classList.add('hidden'); + field.setAttribute('class', 'hidden'); } - }); + } } // fixer l'exercice des sélecteurs de compte diff --git a/style.css b/style.css index 8998179..6836da9 100644 --- a/style.css +++ b/style.css @@ -35,15 +35,17 @@ h2[class="aide"], h3[class="aide"] { } .informations dl.describe { - grid-template-columns : 25rem 1fr; + grid-template-columns : 20rem 1fr; } .informations dl.describe > dt { + flex: 0 0 15rem; margin-right: 0; white-space: nowrap; } .informations dl.describe > dd { + flex: 0 0 calc(100% - 20rem); margin-right: 0; } @@ -74,23 +76,7 @@ table.list tbody tr.ignored:nth-child(even) { font-style: italic; background: rgba(255, 255, 200, 0.5); } -html.dark table.list tbody tr.ignored:nth-child(odd) { - font-style: italic; - background: rgba(100, 100, 0, 0.4); -} -html.dark table.list tbody tr.ignored:nth-child(even) { - font-style: italic; - background: rgba(100, 100, 0, 0.4); -} html.dialog.dark { filter: none !important; } - -html.dialog.dark main { - background-color : #ddd; -} - -html.dark .block.alert { - background-color : rgba(87, 206, 235, 0.5); -}
#{{$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}} - {{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}} + {{: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"}}