diff --git a/_archives.html b/_archives.html index 56f6b14..da3f19c 100644 --- a/_archives.html +++ b/_archives.html @@ -5,7 +5,6 @@ Cette page liste les immobilisations sorties du bilan

-{{* Immobilisation avec une écriture de sortie de bilan *}} {{:include file="_get_config.html" keep="module.config"}} {{* lister les immobilisations *}} @@ -66,47 +65,54 @@ ORDER BY trans.date DESC; !condition=$condition }} - {{:assign montant_immo=$debit}} {{* voir si l'immo est prise en charge *}} - {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id|intval}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id assign="info_immo"}} {{:assign status=$status}} {{else}} - {{:assign amortissable="nsp"}} - {{:assign status="unknown"}} + {{:assign status=null}} {{/load}} - {{if $status == "ignored"}} + {{if $status != "archived"}} {{:continue}} {{/if}} + {{:assign date_mes=$info_immo.date_mes|or:$trans_date}} + {{:assign montant_immo=$debit}} + + {{* chercher le doc de sortie du bilan *}} + {{:assign exit_date=null}} + {{#load type="exit_link" where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id=$info_immo.id}} + {{:assign exit_line_id=$exit_line_id}} + {{#select + trans.date + FROM acc_transactions_lines AS line + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + WHERE line.id = :exit_line_id; + :exit_line_id=$exit_line_id + }} + {{:assign exit_date=$date}} + {{/select}} + {{/load}} {{* chercher des écritures liées à l'immo courante au crédit du même compte et déduire leur montant de celui de l'immo *}} - {{:assign solde_immo=$montant_immo}} {{:assign credit_immo=null}} - {{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as other_id, - line.credit, - MAX(trans2.date) as exit_date - FROM acc_transactions AS trans - INNER JOIN acc_transactions_links as links - ON (trans.id = links.id_transaction OR trans.id = links.id_related) - INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id - INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - INNER JOIN acc_transactions AS trans2 ON trans2.id = other_id - WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account - ORDER BY trans2.date, trans2.id - ; - :immo_trans_id=$trans_id - :account=$account_code - assign="credit_immo." + {{:assign total_credits=0}} + {{#load + type="credit_link" + where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $info_immo.id }} - {{:assign solde_immo="%d-%d"|math:$solde_immo:$credit}} - {{:assign exit_date=$exit_date}} - {{/select}} + {{if $amount == null}} + {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; + :credit_line_id=$credit_line_id + }} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{/select}} + {{else}} + {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} + {{/if}} + {{/load}} + {{:assign solde_immo="%d-%d"|math:$montant_immo:$total_credits}} {{if $solde_immo == 0}} {{:assign status="archived"}} @@ -116,11 +122,6 @@ {{:continue}} {{/if}} - {{:assign nb=$credit_immo|count}} - {{:assign nb="%d-1"|math:$nb}} - {{:assign var="last_credit" from="credit_immo.%d"|args:$nb}} - {{:assign montant_immo=$last_credit.credit}} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}} {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} {{:assign nb_immo="%d+1"|math:$nb_immo}} @@ -149,12 +150,12 @@ {{/select}} - #{{$trans_id}} - {{$trans_date|date_short}} + #{{$trans_id}} + {{$date_mes|date_short}} {{$exit_date|date_short}} {{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}} {{"%f"|math:$montant_immo|money_html:false|raw}} - {{$account_code}} + {{$account_code}} {{$account_label}} {{$project_label}} diff --git a/_immobilisations.html b/_immobilisations.html index d287632..1546725 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,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="credit_link" + where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $immo_doc_id + }} + {{if $amount == null}} + {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; + :credit_line_id=$credit_line_id + }} + {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}} + {{/select}} + {{else}} + {{:assign montant_immo="%d-%d"|math:$montant_immo:$amount}} + {{/if}} + {{/load}} {{* 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="eye" }} -{{* 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_doc_id=%s&type_immo=%s"|args:$immo_doc_id:$type_immo shape="table" }}
- {{if $nb_immo == 0 || ! $table_presente}} -

Aucune immobilisation

- {{/if}} -
+{{/if}} +{{if $nb_immo == 0 || $module.table == null}} +

Aucune immobilisation

+{{/if}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 1f08e9b..992e20c 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}} -
-
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }} -
-
+ {{: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 les écritures ignorées" }} +
+ - {{* 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 $immo_lines|count > 0}} +
DateLibelléMontantN° compteCompte
+ + + + + + + + + + + + + + + + {{#foreach from=$immo_lines item="line"}} - {{* 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}} + {{if $unhide == null}} + {{if $status == "ignored"}} {{: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 nb_immo="%d+1"|math:$nb_immo}} - - - - - - - - - - {{/select}} - -
LigneDateLibelléMontantAffectéResteN° compteCompte
#{{$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" - }} -
- {{if $nb_immo == 0}} -

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}} + + #{{$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"|args:$immo_line_id + shape="settings" + }} +{{* target="_dialog"*}} + + + {{/foreach}} + + +{{else}} +

Aucune immobilisation

+{{/if}} diff --git a/amortization.html b/amortization.html index cf162a2..1af7148 100644 --- a/amortization.html +++ b/amortization.html @@ -2,179 +2,141 @@ {{* 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, line.label as line_label, trans.id as immo_trans_id, trans.label as label, - trans.date, - account.code as account_code + trans.date as date_achat, + 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_achat}} +{{: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}} -{{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} -{{:assign solde=$ligne_immo.montant}} - -{{* 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}} +{{#load type="credit_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}} -{{/select}} +{{/load}} +{{:assign solde="%d-%d"|math:$ligne_immo.montant:$total_credits}} -{{if $status == "amortized"}} - {{:assign amort_amount=$ligne_immo.montant}} +{{if $info_immo.status == "amortized"}} + {{:assign amort_amount=$solde}} {{: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}} + {{:assign valeur_residuelle=$solde}} {{/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)"}} - -{{: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" +{{* 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 }} - {{* 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 + 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 ; - :id_amort=$amort.amort_trans_id + :amort_line_id = $amort_line_id + assign="amort_line" }} - {{* 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}} + {{: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}} + +{{if $valeur_residuelle > 0}} + {{* Chercher des amortissements non rattachés à une immo *}} + {{#select + line.id as amort_line_id, + line.id_transaction AS amort_trans_id, + line.credit as amort_amount + 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; + 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_line_id + assign="amort_link" + }} + {{if $amort_link.amount == null || $amort_link.amount == 0}} + {{:assign amort_amount=$amort.amort_amount}} + {{:assign keep_amort=false}} + {{else}} + {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}} {{/if}} {{else}} - {{:assign keep=false}} + {{* pas de ligne d'immo liée à cette ligne d'amort => garder cette ligne d'amortissement *}} {{/load}} - {{if $keep}} - {{:assign autres_amortissements=true}} + {{if $keep_amort && $amort_amount < $amort.amort_amount}} + {{:assign var="free_amort_lines." value=$amort}} {{/if}} - {{else}} - {{:assign autres_amortissements=true}} {{/select}} -{{/select}} +{{/if}} {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}} @@ -195,21 +157,21 @@ subcurrent="%s"|args:$subcurrent subsubcurrent="amortization" type_immo=$_GET.type_immo - autres_amort=$autres_amortissements + autres_amort=$free_amort_lines }} {{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,15 +184,14 @@

{{: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_doc_id=%s&type_immo=%s"|args:$_GET.immo_doc_id:$_GET.type_immo shape="export" class="main" }}

- Il sera possible de choisir la date de sortie, d'indiquer - le montant de la cession le cas échéant et de modifier les - comptes associés. + Il sera possible de choisir la date de sortie et d'indiquer + le montant de la cession le cas échéant.

@@ -238,24 +199,32 @@
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}}
+
#{{$ligne_immo.immo_trans_id}} {{$label_immo}}
+
Compte d'immobilisation
+
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
Début d'amortissement
{{$date_debut|date_short}}
- {{if $duree != null}} + {{if $info_immo.duration != null}}
Durée
-
{{$duree}} ans
+
{{$info_immo.duration}} ans
+ {{/if}} +
Montant de l'immobilisation
+
{{"%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}} {{if $valeur_residuelle > 0}}
Montant des amortissements
-
{{"%d-%d"|math:$ligne_immo.montant:$valeur_residuelle|money_currency_html:false|raw}}
-
Valeur nette comptable
+
{{"%d-%d"|math:$solde:$valeur_residuelle|money_currency_html:false|raw}}
+
Valeur nette résiduelle
{{$valeur_residuelle|money_currency_html:false|raw}}
{{/if}} - {{if $duree != null && $valeur_residuelle > 0}} + {{if $info_immo.duration != null && $valeur_residuelle > 0}}
Annuité estimée
-
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$duree|money_currency_html:false|raw}}
+
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$solde:$info_immo.duration|money_currency_html:false|raw}}
{{/if}}
@@ -277,13 +246,13 @@ - {{#foreach from=$linked_amort item="line"}} + {{#foreach from=$linked_amort|ksort 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}} @@ -293,10 +262,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"|args:$line.amort_line_id:$ligne_immo.immo_line_id shape="minus"}} + {{:linkbutton label="Détacher" href="detach_amort.html?immo_doc_id=%s&amort_line_id=%s"|args:$_GET.immo_doc_id:$line.amort_line_id shape="minus"}} {{/foreach}} @@ -307,16 +276,11 @@

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

- {{/if}} +{{if $free_amort_lines}} +

+ 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}} {{:form_errors}} {{:admin_footer}} diff --git a/attach_amort.html b/attach_amort.html index 4770afa..31e0ae9 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -1,74 +1,231 @@ {{* -*- brindille -*- *}} {{* - Enregistrer la liaison entre une écriture d'amortissement et - l'écriture d'immobilisation correspondante + Enregistrer la liaison entre une ligne d'écriture d'amortissement + et une ligne d'écriture d'immobilisation + @param immo_doc_id : numéro du doc d'immo + @param amort_line_id : numéro de ligne de l'écriture d'amortissement *}} -{{* chercher l'écriture d'immobilisation *}} -{{#select - id_transaction - FROM acc_transactions_lines - WHERE id = :line_id; - :line_id = $_GET.immo_line_id|intval -}} - {{:assign immo_trans_id=$id_transaction}} +{{* données de l'immobilisation *}} +{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} + {{:assign label_immo=$label|or:$ligne_immo.trans_label}} {{else}} - {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + +{{#select + line.id_transaction as immo_trans_id, + line.debit as montant, + 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 = $info_immo.line + assign="ligne_immo" +}} +{{else}} + {{:error message="Immobilisation non trouvée"}} {{/select}} +{{:assign montant_immo=$info_immo.amount|or:$ligne_immo.montant}} + +{{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 - id_transaction - FROM acc_transactions_lines - WHERE id = :line_id; + 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; :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}} + {{:error message="Amortissement non trouvé"}} {{/select}} +{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$amort_line.trans_id}} -{{* 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 +{{* 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 - limit=1 }} -{{else}} - {{: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 - }} + {{:assign montant_affecte="%d+%d"|math:$montant_affecte:$amount}} {{/load}} -{{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_line_id:$amort_trans_id}} +{{: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 || $_POST.montant == 0}} + {{:assign montant_amort=$reste}} + {{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}} + + {{* vérifier que le montant total des amortissements ne dépasse pas la valeur de l'immo *}} + {{* montant de l'immo *}} + {{:assign total_credits=0}} + {{#load + type="credit_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 montant_immo="%d-%d"|math:$montant_immo:$total_credits}} + + {{* montant des amortissements *}} + {{:assign total_amort=0}} + {{#load + type="amort_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id=$_GET.immo_doc_id|intval + }} + {{if $amount == null || $amount == 0}} + {{#select + line.credit + 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 total_amort="%d+%d"|math:$total_amort:$credit}} + {{/select}} + {{else}} + {{:assign total_amort="%d+%d"|math:$total_amort:$amount}} + {{/if}} + {{/load}} + + {{:assign vnc="%d-%d"|math:$montant_immo:$total_amort}} + {{:assign total_amort="%d+%d"|math:$total_amort:$montant_amort}} + {{if $total_amort > $montant_immo}} + {{:assign ma="%f"|math:$montant_amort|money_currency:false}} + {{:assign vnc="%f"|math:$vnc|money_currency:false}} + {{:error message="Le montant de l'amortissement (%s) dépasse la valeur résiduelle de l'immobilisation (%s)"|args:$ma:$vnc}} + {{/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}} + + {{* immo soldée ? *}} + {{if $total_amort == $montant_immo}} + {{:assign status="amortized"}} + {{:save + key=$info_immo.key + status=$status + }} + {{/if}} + + {{:redirect force="amortization.html?immo_doc_id=%s&type_immo=%s&ok=1&msg=attach_amort"|args:$_GET.immo_doc_id:$status}} +{{/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}}
+ {{if $montant_affecte > 0}} +
Montant déjà affecté
+
{{"%f"|math:$montant_affecte|money_currency_html:false|raw}}
+
Montant restant à affecter
+
{{"%f"|math:$reste|money_currency_html:false|raw}}
+ {{/if}} +
+
+ +
+
+
+ {{: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"}} +

+
+ diff --git a/attach_immo.html b/attach_immo.html new file mode 100644 index 0000000..a824041 --- /dev/null +++ b/attach_immo.html @@ -0,0 +1,162 @@ +{{* -*- 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="credit_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="credit_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/balance_sheet_exit.html b/balance_sheet_exit.html index e7d9ba7..227adf4 100644 --- a/balance_sheet_exit.html +++ b/balance_sheet_exit.html @@ -2,10 +2,15 @@ {{* Sortir une immobilisation du bilan - @param immo_line_id : id de la ligne d'immobilisation + @param immo_doc_id : id du doc associé à l'immo *}} {{* Infos de l'immobilisation *}} +{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + {{#select line.debit as montant, trans.id AS trans_id, @@ -16,114 +21,105 @@ 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 + :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_achat}} -{{:assign ts_mes=$ligne_immo.date_achat|strtotime}} - -{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} - {{:assign ts_mes=$date|strtotime}} - {{:assign date_debut=$date}} - {{:assign duree_amort=$duration}} -{{/load}} +{{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}} +{{if $info_immo.amount != null}} + {{:assign var="ligne_immo.montant" value=$info_immo.amount}} +{{/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 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.trans_id - :account=$ligne_immo.account_code +{{#load + type="credit_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id = $info_immo.id + assign="credit_link" }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} -{{/select}} + {{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}} +{{else}} + {{* + TODO : à garder ? + pas de doc => voir liaison écritures + *}} + {{#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 + }} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{/select}} +{{/load}} {{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} -{{* chercher des écritures d'amortissement liées à l'immobilisation *}} {{:assign total_amort=0}} -{{:assign amort_number=0}} -{{#select - l_amort.credit as amort_amount, - 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 - 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%' - ; - :line_id = $_GET.immo_line_id|intval - assign="amort_line" +{{#load type="amort_link" + where="$$.immo_doc_id = :immo_doc_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" - 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 + FROM acc_transactions_lines AS line + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + WHERE line.id = :amort_line_id + ; + :amort_line_id = $amort_line_id + assign="amort_line" }} - {{if $line.amort_line_id == $amort_line.amort_line_id}} - {{:assign amort_number="%d+1"|math:$amort_number}} - {{:assign total_amort="%d+%d"|math:$total_amort:$amort_line.amort_amount}} - {{if $first_amort_date == null}} - {{:assign first_amort_date=$amort_line.date}} - {{elseif $amort_line.date < $first_amort_date}} - {{:assign first_amort_date=$amort_line.date}} - {{/if}} - {{if $last_amort_date == null}} - {{:assign last_amort_date=$amort_line.date}} - {{elseif $amort_line.date > $last_amort_date}} - {{:assign last_amort_date=$amort_line.date}} - {{/if}} - {{/if}} - {{else}} - {{:assign amort_number="%d+1"|math:$amort_number}} - {{:assign total_amort="%d+%d"|math:$total_amort:$amort_line.amort_amount}} - {{if $first_amort_date == null}} - {{:assign first_amort_date=$amort_line.date}} - {{elseif $amort_line.date < $first_amort_date}} - {{:assign first_amort_date=$amort_line.date}} - {{/if}} - {{if $last_amort_date == null}} - {{:assign last_amort_date=$amort_line.date}} - {{elseif $amort_line.date > $last_amort_date}} - {{:assign last_amort_date=$amort_line.date}} - {{/if}} - {{/load}} -{{/select}} + {{:assign amort_amount=$amount|or:$credit}} + {{:assign total_amort="%d+%d"|math:$total_amort:$amort_amount}} + {{:assign var="linked_amort.%s_%d"|args:$amort_date:$id value=$amort_line}} + {{/select}} +{{/load}} +{{:assign amort_number=$linked_amort|count}} + +{{#foreach from=$linked_amort|ksort item="line"}} + {{if $first_amort_date == null}} + {{:assign first_amort_date=$line.amort_date}} + {{/if}} + {{if $last_amort_date == null}} + {{:assign last_amort_date=$line.amort_date}} + {{elseif $line.amort_date > $last_amort_date}} + {{:assign last_amort_date=$line.amort_date}} + {{/if}} +{{/foreach}} {{if $total_amort == 0}} {{if $info_immo.status == "amortized"}} {{:assign total_amort=$ligne_immo.montant}} {{/if}} {{else}} - {{:assign date_debut=$last_amort_date|strtotime}} - {{:assign date_debut="%d+(60*60*24)"|math:$date_debut|date:"Y-m-d"}} + {{:assign date_debut=$last_amort_date}} {{/if}} {{:assign ts_debut=$date_debut|strtotime}} +{{:assign ts_debut="%d+(60*60*24)"|math:$ts_debut}} +{{:assign date_debut=$ts_debut|date:"Y-m-d"}} {{:assign valeur_nette="%f-%f"|math:$ligne_immo.montant:$total_amort}} {{* @@ -139,7 +135,8 @@ {{:assign fin=$end_date|date_short}} {{:assign var="open_years.%d"|args:$id value=$label|cat:" (du "|cat:$debut|cat:" au "|cat:$fin|cat:")"}} {{else}} - {{:error message="Aucun exercice ouvert pour enregistrer un amortissement"}} + {{:assign debut=$date_debut|date_short}} + {{:error message="Aucun exercice ouvert pour enregistrer un amortissement à partir du %s"|args:$debut}} {{/years}} {{if $years|count == 1}} {{:assign default_year=$years.0.id}} @@ -154,39 +151,12 @@ {{:error message="Vous devez renseigner la date de sortie"}} {{/if}} - {{* vérifier la validité de la date de mise en service *}} - {{if $_POST.date_mes != null}} - {{:assign ts_mes=$_POST.date_mes|parse_date|strtotime}} - {{if $ts_mes < $ligne_immo.date_achat|strtotime || $ts_mes > $first_amort_date|strtotime}} - {{:assign immo_date=$ligne_immo.date_achat|date_short}} - {{:assign amort_date=$first_amort_date|date_short}} - {{:error message="La date de mise en service doit être postérieure à la date d'acquisition de l'immobilisation (%s) et antérieure à la date du premier amortissement (%s)"|args:$immo_date:$amort_date}} - {{/if}} - {{/if}} - - {{* vérifier la validité de la durée d'immobilisation *}} - {{if $valeur_nette > 0}} - {{if $info_immo.duration == null}} - {{if $_POST.duree == null}} - {{:error message="Vous devez renseigner la durée de l'immobilisation"}} - {{elseif $_POST.duree < $amort_number}} - {{:error message="La durée de l'amortissement ne peut être inférieure au nombre d'écritures d'amortissement (%d)"|args:$amort_number}} - {{else}} - {{:assign duree_amort=$_POST.duree}} - {{/if}} - {{/if}} - {{/if}} - {{* vérifier la validité de la date de sortie *}} - {{if $info_immo.date != null}} - {{if $_POST.date_sortie|parse_date < $info_immo.date}} - {{:assign immo_date=$info_immo.date|date_short}} + {{if $info_immo.date_mes != null}} + {{if $_POST.date_sortie|parse_date < $info_immo.date_mes}} + {{:assign immo_date=$info_immo.date_mes|date_short}} {{:error message="La date de sortie doit être postérieure à la date de mise en service de l'immobilisation (%s)"|args:$immo_date}} {{/if}} - {{elseif $_POST.date_mes != null}} - {{if $_POST.date_sortie|parse_date < $_POST.date_mes|parse_date}} - {{:error message="La date de sortie doit être postérieure à la date de mise en service de l'immobilisation (%s)"|args:$_POST.date_mes}} - {{/if}} {{elseif $_POST.date_sortie|parse_date < $ligne_immo.date_achat}} {{:assign immo_date=$ligne_immo.date_achat|date_short}} {{:error message="La date de sortie doit être postérieure à la date d'acquisition de l'immobilisation (%s)"|args:$immo_date}} @@ -196,38 +166,39 @@ {{:error message="La date de sortie doit être postérieure à la date du dernier amortissement (%s)"|args:$last_amort_date}} {{/if}} - {{* vérifier que la date de sortie est située dans un exercice ouvert *}} {{:assign ts_exit = $_POST.date_sortie|parse_date|strtotime}} - {{:assign ok=false}} - {{:assign msg_amort=""}} - {{#foreach from=$years}} - {{if $id == $_POST.id_year}} - {{:assign selected_year=$id}} + {{:assign exercice_ok=false}} + {{* vérifier que la date de sortie est dans l'exercice choisi *}} + {{#foreach from=$years item="current_year"}} + {{if $current_year.id == $_POST.id_year}} + {{:assign selected_year=$current_year.id}} {{if $start_date|strtotime <= $ts_exit && $ts_exit <= $end_date|strtotime}} - {{:assign ok=true}} + {{:assign current_year=$current_year}} + {{:assign exercice_ok=true}} {{:break}} {{/if}} {{/if}} - - {{* voir si des amortissements ont été oubliés *}} - {{if $valeur_nette > 0 && $info_immo.status != "amortized" && $start_date|strtotime > $last_amort_date|strtotime && $end_date|strtotime < $now}} - {{:assign debut=$start_date|date_short}} - {{:assign fin=$end_date|date_short}} - {{:assign msg_amort=$msg_amort|cat:"\n"|cat:" - "|cat:$label|cat:" : du "|cat:$debut|cat:" au "|cat:$fin}} - {{/if}} {{/foreach}} - {{if ! $ok}} + {{if ! $exercice_ok}} {{:error message="La date choisie n'est pas dans l'exercice sélectionné !"}} {{/if}} - {{if $msg_amort != ""}} - {{:error message="Vous devez d'abord enregistrer les amortissements des exercices suivants : %s"|args:$msg_amort}} + + {{* voir si des amortissements ont été oubliés *}} + {{if $valeur_nette > 0 && $info_immo.status != "amortized"}} + {{if $current_year.start_date <= $date_debut && $date_debut <= $current_year.end_date}} + {{:assign amort_ok=true}} + {{else}} + {{:assign amort_ok=false}} + {{/if}} + {{if ! $amort_ok}} + {{:error message="Vous devez d'abord enregistrer les amortissements des exercices précédents"}} + {{/if}} {{/if}} - {{:redirect to="compute_exit_data.html?immo_line_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s"|args:$_GET.immo_line_id:$total_amort:$selected_year:$ts_mes:$ts_debut:$ts_exit:$duree_amort}} + {{:redirect to="compute_exit_data.html?immo_doc_id=%s&amort_amount=%s&year=%s&date_debut=%s&exit_date=%s"|args:$_GET.immo_doc_id:$total_amort:$selected_year:$ts_debut:$ts_exit}} {{/form}} {{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortization"}} -{{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index" subcurrent="%s"|args:$_GET.type_immo subsubcurrent="balance_exit"}} {{/if}} @@ -243,10 +214,10 @@
Montant
{{$ligne_immo.montant|money_currency_html:false|raw}}
Date d'acquisition
-
{{$ligne_immo.date_achat|date_short}}
- {{if $info_immo.date != null && $info_immo.date != $ligne_immo.date_achat}} +
{{$info_immo.date_achat|or:$ligne_immo.date_achat|date_short}}
+ {{if $info_immo.date_mes != null && $info_immo.date_mes != $ligne_immo.date_achat}}
Date de mise en service
-
{{$info_immo.date|date_short}}
+
{{$info_immo.date_mes|date_short}}
{{/if}} {{if $info_immo.duration != null}}
Durée de l'amortissement
@@ -256,23 +227,13 @@
{{$total_amort|money_currency_html:false|raw}} (à la date de début de l'exercice)
Valeur nette résiduelle
{{$valeur_nette|money_currency_html:false|raw}} (à la date de début de l'exercice)
+ {{if $last_amort_date != null}} +
Date du dernier amortissement
+
{{$last_amort_date|date_short}}
+ {{/if}} - {{if $valeur_nette > 0}} - {{if $info_immo.date == null || $info_immo.duration == null}} -
- Informations sur l'immobilisation -
- {{if $info_immo.date == null}} - {{:input type="date" name="date_mes" label="Date de mise en service" help="C'est la date de première utilisation ; à renseigner uniquement si différente de la date d'acquisition"}} - {{/if}} - {{if $info_immo.duration == null}} - {{:input type="number" name="duree" label="Durée d'amortissement" required=true min=1 help="La durée est nécessaire pour calculer l'amortissement complémentaire"}} - {{/if}} -
-
- {{/if}} - {{/if}} +
Informations de sortie
diff --git a/compute_exit_data.html b/compute_exit_data.html index 25231bd..c8c50af 100644 --- a/compute_exit_data.html +++ b/compute_exit_data.html @@ -3,14 +3,18 @@ {{* Calculer les valeurs de la sortie et saisir le montant de la cession (optionnel) paramètres : - - immo_line_id : numéro de ligne de l'écriture d'immobilisation - - amort_amount : montant des amortissements - - year : exercice de la date de sortie de l'immobilisation - - date_mes : datede mise en service de l'immobilisation - - date_debut : date de début de la période d'amortissement complémentaire - - exit_date : date de sortie de l'immobilisation - - duree_amort : durée de l'amortiseement (optionnel) + @param immo_doc_id : id du doc associé à l'immo + @param amort_amount : montant des amortissements + @param year : exercice de la date de sortie de l'immobilisation + @param date_debut : date de début de la période d'amortissement complémentaire + @param exit_date : date de sortie de l'immobilisation *}} +{{* TODO *}} +{{* Infos de l'immobilisation *}} +{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} {{#select line.debit as montant, @@ -22,41 +26,62 @@ 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 + :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}} {{* 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.trans_id - :account=$ligne_immo.account_code - }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} -{{/select}} +{{#load + type="credit_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id = $info_immo.id + assign="credit_link" +}} + {{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}} +{{else}} + {{* + TODO : à garder ? + pas de doc => voir liaison écritures + *}} + {{#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 + }} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{/select}} +{{/load}} {{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} - {{:assign valeur_nette="%f-%f"|math:$ligne_immo.montant:$_GET.amort_amount}} + {{:assign amort_comp=0}} {{* amortissement complémentaire jqà date sortie *}} {{if $valeur_nette > 0}} {{:assign nbjours="1+(%d-%d)/(60*60*24)"|math:$_GET.exit_date:$_GET.date_debut}} - {{:assign annuite="%f/%f"|math:$ligne_immo.montant:$_GET.duree_amort}} + {{:assign annuite="%f/%f"|math:$ligne_immo.montant:$info_immo.duration}} {{:assign amort_comp="round(%f/365*%f, 0)"|math:$annuite:$nbjours}} {{:assign amort_comp="min(%f, %f)"|math:$valeur_nette:$amort_comp}} {{/if}} @@ -69,7 +94,7 @@ {{/if}} {{/if}} - {{:redirect to="write_exit.html?immo_line_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s&cession=%s"|args:$_GET.immo_line_id:$_GET.amort_amount:$_GET.year:$_GET.date_mes:$_GET.date_debut:$_GET.exit_date:$_GET.duree_amort:$_POST.montant_cession}} + {{:redirect to="write_exit.html?immo_doc_id=%s&amort_amount=%s&year=%s&date_debut=%s&exit_date=%s&cession=%s"|args:$_GET.immo_doc_id:$_GET.amort_amount:$_GET.year:$_GET.date_debut:$_GET.exit_date:$_POST.montant_cession}} {{/form}} {{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortization"}} @@ -91,14 +116,12 @@
{{$ligne_immo.montant|money_currency_html:false|raw}}
Date d'acquisition
{{$ligne_immo.date_achat|date_short}}
- {{if $_GET.date_mes != $ligne_immo.date_achat|strtotime}} + {{if $info_immo.date_mes != null && $info_immo.date_mes != $ligne_immo.date_achat}}
Date de mise en service
-
{{$_GET.date_mes|date:"d/m/Y"}}
- {{/if}} - {{if $_GET.duree_amort != null && $_GET.duree_amort != 0}} -
Durée de l'amortissement
-
{{$_GET.duree_amort}} ans
+
{{$info_immo.date_mes|date_short}}
{{/if}} +
Durée de l'amortissement
+
{{$info_immo.duration}} ans
Montant des amortissements
{{$_GET.amort_amount|money_currency_html:false|raw}} (à la date de début de l'exercice)
Valeur nette résiduelle
diff --git a/delete_infos.html b/delete_infos.html new file mode 100644 index 0000000..5e5d2a0 --- /dev/null +++ b/delete_infos.html @@ -0,0 +1,100 @@ +{{* -*- brindille -*- *}} + +{{* + Supprimer les infos d'une immo et les liaisons d'immo associées + @param immo_doc_id +*}} + +{{#load 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 trans_label, + trans.date as date_achat, + line.debit as montant, + line.label as line_label, + acc.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; + :line_id = $info_immo.line + assign="ligne_immo" + }} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/select}} + +{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} +{{:assign immo_label=$info_immo.label|or:$ligne_immo.trans_label}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $immo_label}} + {{:assign immo_label=$immo_label|cat::" — "|cat:$ligne_immo.line_label}} +{{/if}} + +{{#form on="delete"}} + {{#select + trans.id + FROM acc_transactions_lines AS line + INNER JOIN !table ON $$.credit_line_id = line.id + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + WHERE $$.type = + "credit_link" AND $$.immo_doc_id = :immo_doc_id + ; + !table = $module.table + :immo_doc_id = $_GET.immo_doc_id|intval + }} + {{:assign var="linked_trans." value=$id}} + {{/select}} + + {{:debug linked_trans=$linked_trans}} + {{if $linked_trans != null}} + {{* chercher et supprimer les écritures liées *}} + {{#select + CASE links.id_related = trans.id + WHEN true THEN links.id_transaction + WHEN false THEN links.id_related + END as linked_id + FROM acc_transactions AS trans + INNER JOIN acc_transactions_links as links + ON (links.id_transaction = trans.id OR links.id_related = trans.id) + WHERE trans.id = :immo_trans_id + ; + :immo_trans_id=$ligne_immo.immo_trans_id + }} + {{if ! $linked_trans|has:$linked_id}} + {{:assign var="linked_transactions." value=$linked_id}} + {{/if}} + {{/select}} + + {{* enregistrer les liaisons restantes *}} + {{:api + method="POST" + path="accounting/transaction/%s/transactions"|args:$ligne_immo.immo_trans_id + assign="result" + assign_code="result_code" + transactions=$linked_transactions + }} + + {{* supprimer les docs de liaison *}} + {{:delete type="immo_link" where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $_GET.immo_doc_id|intval}} + + {{/if}} + + {{* supprimer les infos de l'immobilisation *}} + {{:delete id=$_GET.immo_doc_id|intval}} + {{:redirect force="index.html?ok=1&msg=suppr_infos&type_immo=other"}} +{{/form}} + + +{{:admin_header title="Supprimer" current="module_amortization"}} +{{:form_errors}} +{{:delete_form + legend="Immobilisation « #%s %s »"|args:$ligne_immo.immo_trans_id:$immo_label + warning="Supprimer les paramètres de l'immobilisation « #%s %s » ?"|args:$ligne_immo.immo_trans_id:$immo_label + info="L'écriture d'immobilisation ne sera pas supprimée ; les nouveaux paramètres pourront être saisis depuis l'onglet « À classer »" +}} + +{{:admin_footer}} diff --git a/detach_amort.html b/detach_amort.html index c078c3f..e2b7b85 100644 --- a/detach_amort.html +++ b/detach_amort.html @@ -3,21 +3,29 @@ {{* Supprimer l'association entre une écriture d'amortissement et une écriture d'immobilisation + @param immo_doc_id : id du doc associé à l'immo + @param amort_line_id : id de la ligne d'amortissement *}} -{{* chercher l'écriture d'immobilisation *}} +{{* données de l'immobilisation *}} +{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + +{{* écriture d'immobilisation *}} {{#select id_transaction FROM acc_transactions_lines WHERE id = :line_id; - :line_id = $_GET.immo_line_id|intval + :line_id = $info_immo.line }} {{:assign immo_trans_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/select}} -{{* chercher l'écriture d'amortissement *}} +{{* écriture d'amortissement *}} {{#select id_transaction FROM acc_transactions_lines @@ -26,7 +34,7 @@ }} {{:assign amort_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_line_id}} + {{:error message="Amortissement non trouvé"}} {{/select}} {{* @@ -57,15 +65,18 @@ }} {{* supprimer le doc de liaison entre les lignes *}} -{{#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 +{{#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 }} {{:delete id=$id}} {{/load}} -{{:redirect to="amortization.html?immo_line_id=%s&ok=1&msg=detach&trans_id=%s"|args:$_GET.immo_line_id:$amort_id}} +{{* marquer immo non soldée *}} +{{:save + key=$info_immo.key + status="managed" +}} + +{{:redirect to="amortization.html?immo_doc_id=%s&ok=1&msg=detach"|args:$_GET.immo_doc_id:}} diff --git a/detach_immo.html b/detach_immo.html new file mode 100644 index 0000000..7a67513 --- /dev/null +++ b/detach_immo.html @@ -0,0 +1,75 @@ +{{* -*- brindille -*- *}} + +{{* + Supprimer l'association entre une écriture d'immobilisation et + une écriture au crédit du compte d'immobilisation + @param immo_doc_id : id du doc associé à l'immo + @param credit_line_id : id de la ligne de crédit +*}} + +{{* 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 + id_transaction + FROM acc_transactions_lines + WHERE id = :line_id; + :line_id = $info_immo.line +}} + {{:assign immo_trans_id=$id_transaction}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/select}} + +{{* chercher l'écriture au crédit *}} +{{#select + id_transaction + FROM acc_transactions_lines + WHERE id = :line_id; + :line_id = $_GET.credit_line_id|intval +}} + {{:assign credit_id=$id_transaction}} +{{else}} + {{:error message="Écriture au crédit non trouvée"}} +{{/select}} + +{{* + chercher les liaisons de l'écriture d'immobilisation + et supprimer la liaison avec l'écriture au crédit +*}} +{{#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 + }} + {{if $linked_id != $credit_id}} + {{:assign var="linked_transactions." value=$linked_id}} + {{/if}} +{{/select}} + +{{* Enregistrer les liaisons *}} +{{:api + method="POST" + path="accounting/transaction/%s/transactions"|args:$immo_trans_id + assign="result" + assign_code="result_code" + transactions=$linked_transactions +}} + +{{* supprimer le doc de liaison entre les lignes *}} +{{#load type="credit_link" + where="$$.immo_doc_id = :immo_doc_id AND $$.credit_line_id = :credit_line_id" + :immo_doc_id=$_GET.immo_doc_id|intval + :credit_line_id = $_GET.credit_line_id|intval +}} + {{:delete id=$id}} +{{/load}} + +{{:redirect to="details_immo.html?immo_doc_id=%s&ok=1&msg=detach&"|args:$_GET.immo_doc_id}} diff --git a/details_immo.html b/details_immo.html new file mode 100644 index 0000000..f84f08b --- /dev/null +++ b/details_immo.html @@ -0,0 +1,206 @@ +{{* -*- brindille -*- *}} + + +{{* + 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 immo_doc_id : numéro du doc 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:$info_immo.date_achat|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="credit_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} + {{#select + line.credit, + line.id as line_id, + trans.id as trans_id, + trans.label, + trans.date + 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 var="linked_immos." trans_id=$trans_id credit_line_id=$line_id label=$label amount=$credit date=$date}} + {{/select}} + {{if $amount == null}} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{else}} + {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} + {{/if}} +{{/load}} +{{: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}} + +{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} + +{{* +{{if ! $dialog}} + {{:assign subsubcurrent=null}} + {{if $total_credits == 0 && $total_amort == 0}} + {{:assign subsubcurrent="credit"}} + {{/if}} + {{if $total_amort == 0}} + {{:assign subsubcurrent=$subsubcurrent|cat:"-modif"}} + {{/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="Écriture d'amortissement attachée"}} + {{elseif $_GET.msg|match:"attach_immo"}} + {{:assign msg="Écriture au crédit attachée"}} + {{elseif $_GET.msg|match:"info"}} + {{:assign msg="Données de l'immobilisation enregistrées"}} + {{elseif $_GET.msg|match:"detach"}} + {{:assign msg="Écriture au crédit détachée"}} + {{else}} + {{:assign msg="Opération effectuée avec succès"}} + {{/if}} +

{{$msg}}

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

{{$msg}}

+{{/if}} + +

+ Immobilisation + #{{$ligne_immo.immo_trans_id}} + {{$info_immo.label}} +

+{{if $linked_immos != null}} + +{{/if}} +
+
+{{* +
Immobilisation
+
#{{$ligne_immo.immo_trans_id}} {{$info_immo.label}}
+*}} +
Compte d'immobilisation
+
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
+
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 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="line"}} + {{:assign url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.id}} + #{{$line.id}} + {{/foreach}} +
+*}} +
Montant à amortir
+
{{"%f"|math:$solde|money_currency_html:false|raw}}
+ {{/if}} + {{if $total_amort > 0}} +
Montant des amortissements
+
{{$total_amort|money_currency_html:false|raw}}
+
Valeur nette résiduelle
+
{{"%d-%d-%d"|math:$info_immo.amount:$total_credits:$total_amort|money_currency_html:false|raw}}
+ {{/if}} +
+
diff --git a/ignore.html b/ignore.html index e396a77..96254fd 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/index.html b/index.html index ed61086..356f42c 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ {{elseif $type_immo == "other"}} {{:admin_header title="Autres immobilisations" custom_css="./style.css" current="module_amortization"}} {{elseif $type_immo == "unfinished"}} - {{:admin_header title="Immobilisations en cours de constitution" custom_css="./style.css" current="module_amortization"}} + {{:admin_header title="Immobilisations en cours de constitution" custom_css="./style.css" current="module_amortization" subcurrent="unfinished"}} {{/if}} {{:include file="_nav.html" current="index" subcurrent="%s"|args:$type_immo}} @@ -24,6 +24,8 @@ {{if $_GET.ok}} {{if $_GET.msg|match:"immobilisation"}} {{:assign msg="Immobilisation enregistrée"}} + {{elseif $_GET.msg|match:"suppr_infos"}} + {{:assign msg="Informations supprimées"}} {{elseif $_GET.msg|match:"infos"}} {{:assign msg="Informations enregistrées"}} {{/if}} @@ -45,6 +47,9 @@ {{/select}} {{/load}} +{{* chercher des immos antérieures à la date de début du 1er exercice *}} +{{*:include file="_old_assets.html"*}} + {{if $type_immo == "other"}} {{:include file="_immobilisations_autres.html"}} {{elseif $type_immo == "archived"}} diff --git a/link.schema.json b/link.schema.json new file mode 100644 index 0000000..88968ed --- /dev/null +++ b/link.schema.json @@ -0,0 +1,44 @@ +{ + "$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", "credit_link", "exit_link"] + }, + "immo_doc_id" : { + "description": "identifiant du document d'immobilisation associé", + "type" : "integer", + "exclusiveMinimum": 0 + }, + "amort_line_id" : { + "description": "ligne d'amortissement associée à l'immobilisation", + "type": "integer", + "exclusiveMinimum": 0 + }, + "credit_line_id": { + "description": "ligne au crédit du compte de l'immobilisation", + "type": "integer", + "exclusiveMinimum": 0 + }, + "exit_line_id": { + "description": "ligne d'amortissement de sortie du bilan 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": "credit_link"}}, "required": ["type"]}, + "then": {"required": ["credit_line_id"]}, + "else": + "if": {"properties": {"type": {"const": "exit_link"}}, "required": ["type"]}, + "then": {"required": ["exit_line_id"]}, +} diff --git a/link_immo.html b/link_immo.html new file mode 100644 index 0000000..ef12192 --- /dev/null +++ b/link_immo.html @@ -0,0 +1,139 @@ +{{* -*- 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 +*}} +{{#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_line_id NOT IN ( + SELECT json_extract(link.document, '$.credit_line_id') AS credit_line_id FROM !table as link + WHERE json_extract(link.document, '$.type') == "credit_link") + ORDER BY trans.date, trans.label; + :account_code = $ligne_immo.account_code + !table =$module.table + 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}} + +
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/modify_infos.html b/modify_infos.html new file mode 100644 index 0000000..7ee2501 --- /dev/null +++ b/modify_infos.html @@ -0,0 +1,299 @@ +{{* -*- brindille -*- *}} + +{{* + @param immo_doc_id + + TODO ? : + - séparer les cas des immo simples et complexes (BOI) + par exemple pour la durée d'amort par défaut {{:input ...}} + - prise en charge immo => param = immo_line_id + - modif param immo => param = immo_doc_id + - DONE possibilité supprimer liaison écriture avoir +*}} + +{{* données de l'immobilisation *}} +{{#load 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 trans_label, + trans.date as date_achat, + line.debit as montant, + line.label as line_label, + acc.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; + :line_id = $info_immo.line + assign="ligne_immo" + }} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/select}} +{{:assign montant_immo=$info_immo.amount|or:$ligne_immo.montant}} + +{{:assign immo_label=$info_immo.label|or:$ligne_immo.trans_label}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $immo_label}} + {{:assign immo_label=$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="credit_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." doc=$id trans=$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:$montant_immo:$total_credits}} + +{{:assign autres_amount=0}} +{{#load + type="immo" + where="$$.line = :line_id AND id != :doc_id" + :line_id = $info_immo.line + :doc_id = $info_immo.id + }} + {{:assign autres_amount="%d+%d"|math:$autres_amount:$amount}} +{{/load}} +{{:assign max_disponible="%d-%d"|math:$ligne_immo.montant:$autres_amount}} + +{{* traiter la saisie *}} +{{#form on="save"}} + {{if ! $_POST.amortir}} + {{* ne pas amortir *}} + {{:assign duration=0}} + {{:assign libelle=null}} + {{:assign montant=null}} + {{:assign date_achat=null}} + {{:assign date_mes=null}} + {{:assign status="ignored"}} + {{else}} + {{if $_POST.date_achat|parse_date > $ligne_immo.date_achat}} + {{:assign da=$ligne_immo.date_achat|date_short}} + {{:error message="Erreur : la date d'achat (%s) ne peut être postérieure à la date de l'écriture d'immobilisation (%s)"|args:$_POST.date_achat:$da}} + {{/if}} + + {{if $_POST.date_achat == null || $_POST.date_achat|parse_date == $info_immo.date_achat}} + {{:assign date_achat=$info_immo.date_achat}} + {{elseif $_POST.date_achat|parse_date == $ligne_immo.date_achat}} + {{:assign date_achat=null}} + {{else}} + {{:assign date_achat=$_POST.date_achat|parse_date}} + {{/if}} + + {{* TODO : simplifier ? *}} + {{if $_POST.date_mes == null || $_POST.date_mes|parse_date == $info_immo.date_mes}} + {{:assign date_mes=$info_immo.date_mes}} + {{elseif $_POST.date_mes|parse_date == $info_immo.date_achat}} + {{:assign date_mes=null}} + {{elseif $_POST.date_mes|parse_date == $ligne_immo.date_achat}} + {{if $info_immo.date_achat == null}} + {{:assign date_mes=null}} + {{else}} + {{:assign date_mes=$ligne_immo.date_achat}} + {{/if}} + {{else}} + {{:assign date_mes=$_POST.date_mes|parse_date}} + {{:assign date_achat_comp=$ligne_immo.date_achat}} + {{if $date_achat != null}} + {{:assign date_achat_comp=$date_achat}} + {{/if}} + {{if $date_mes < $date_achat_comp}} + {{:assign da=$date_achat_comp|date_short}} + {{:error message="Erreur : la date de mise en service (%s) ne peut être antérieure à la date d'acquisition (%s)"|args:$_POST.date_mes:$da}} + {{/if}} + {{/if}} + + {{:assign duration=$_POST.duree|intval}} + {{if $duration <= 0}} + {{:error message="Erreur : la durée d'amortissement doit être strictement positive"}} + {{/if}} + + {{if $_POST.libelle != $ligne_immo.line_label && $_POST.libelle != $ligne_immo.trans_label}} + {{:assign libelle=$_POST.libelle}} + {{else}} + {{:assign libelle=null}} + {{/if}} + + {{:assign montant=null}} + {{if $_POST.montant == null || $_POST.montant|money_int == 0 || $_POST.montant|money_int == $info_immo.amount}} + {{:assign montant=$info_immo.amount}} + {{else}} + {{:assign montant=$_POST.montant|money_int}} + {{if $montant < 0 || $montant > $max_disponible}} + {{:assign montant_aff="%f"|math:$montant|money_currency:false}} + {{:assign max_aff="%f"|math:$max_disponible|money_currency:false}} + {{:error message="Le montant (%s) doit être positif et ne peut être supérieur à %s"|args:$montant_aff:$max_aff}} + {{/if}} + {{/if}} + + {{:assign status="managed"}} + {{/if}} + + {{* écritures de crédit *}} + {{#foreach from=$linked_immos item="elem"}} + {{if ! $_POST.credit_id|has:$elem.trans}} + {{:assign var="docs_to_remove." value=$elem.doc}} + {{:assign var="links_to_remove." value=$elem.trans}} + {{/if}} + {{/foreach}} + + {{if $docs_to_remove != null}} + {{:assign remove_set=$docs_to_remove|implode:","}} + {{:assign remove_set="("|cat:$remove_set|cat:")"}} + {{:delete where="id IN %s"|args:$remove_set}} + + {{* idem avec acc_transactions_links *}} + {{#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 + }} + {{if ! $linked_id|in:$links_to_remove}} + {{:assign var="linked_transactions." value=$linked_id}} + {{/if}} + {{/select}} + + {{* 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 + }} + {{/if}} + + {{* enregistrer les infos de l'immobilisation *}} + {{:save + key=$info_immo.key + validate_schema="schema.json" + type="immo" + line=$info_immo.line + duration=$duration + label=$libelle + amount=$montant + date_achat=$date_achat + date_mes=$date_mes + status=$status + assign_new_id="new_id" + }} + + {{if $_POST.amortir}} + {{:assign type_immo="managed"}} + {{else}} + {{:assign type_immo="other"}} + {{/if}} + {{:redirect force="index.html?ok=1&msg=infos&type_immo=%s"|args:$type_immo}} + +{{/form}} + +{{:admin_header title="Modifier l'immobilisation" custom_css="./style.css" current="module_amortization"}} +{{if ! $dialog}} + {{:include file="_nav.html" current="index" subcurrent="%s"|args:$_GET.type_immo subsubcurrent="parameter"}} +{{/if}} +{{:form_errors}} + +{{:assign choix_defaut=$_GET.type_immo}} + +{{* + modifier la date de mise en service, les écritures associées ou la durée d'amortissement +*}} + +{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} +

Paramètres de l'immobilisation

+
+
+
Immobilisation
+
#{{$ligne_immo.immo_trans_id}} {{$immo_label}}
+
Compte d'immobilisation
+
{{$ligne_immo.code}} — {{$ligne_immo.account_label}} +
Montant
+
{{"%f"|math:$montant_immo|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}} +
Date de l'écriture d'immobilisation
+
{{$ligne_immo.date_achat|date_short}}
+
+
+ +
+
+ Paramètres de l'amortissement +
+ {{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur une ou plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"}} +
+ {{:input type="number" name="duree" label="Durée d'amortissement" min=1 default=$info_immo.duration}} + {{:input type="text" name="libelle" label="Libellé" default=$info_immo.label}} + {{if $info_immo.amount != null}} + {{:assign max_aff="%f"|math:$max_disponible|money_currency:false}} + {{:input type="money" name="montant" label="Montant de l'immobilisation" default=$montant_immo help="Montant maximum : %s"|args:$max_aff}} + {{/if}} + {{:input type="date" name="date_achat" label="Date d'acquisition" default=$info_immo.date_achat}} + {{:input type="date" name="date_mes" label="Date de mise en service" default=$info_immo.date_mes}} + {{if $linked_immos != null}} +
+
+ + + {{#foreach from=$linked_immos item="elem"}} + + {{$elem.trans}} + + + {{/foreach}} + +
+ {{/if}} +
+
+
+

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

+
+ +{{:admin_footer}} + + + diff --git a/other_amortizations.html b/other_amortizations.html index 91b379a..e185d27 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -3,25 +3,34 @@ {{* 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 *}} +{{* données de l'immobilisation *}} +{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} + {{:assign label_immo=$label|or:$ligne_immo.label}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + {{#select trans.label as 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.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}} -{{:include file="_get_config.html" keep="module.config"}} +{{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"}} @@ -54,46 +63,26 @@ !filter_condition=$filter_condition assign="amort" }} - - {{* 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 + {{* 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 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}} + {{if $amort_link.amount == null || $amort_link.amount == 0}} + {{:assign amort_amount=$amort.amort_amount}} + {{:assign keep_amort=false}} {{else}} - {{:assign keep=false}} - {{/load}} - {{if $keep}} - {{:assign var="autres_amortissements." value=$amort}} + {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}} {{/if}} {{else}} - {{:assign var="autres_amortissements." value=$amort}} - {{/select}} + {{* 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}} {{/select}} {{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}} @@ -106,7 +95,7 @@ subcurrent="other" subsubcurrent="amortization" type_immo="other" - autres_amort=$autres_amortissements + autres_amort=$free_amort_lines }} {{/if}} @@ -116,13 +105,13 @@
- {{: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 $autres_amortissements != null}} +{{if $free_amort_lines != null}}
-

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

+

Immobilisation « {{$label_immo}} »

@@ -136,26 +125,28 @@ - {{#foreach from=$autres_amortissements item="line"}} + {{#foreach from=$free_amort_lines 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}}
#{{$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"}} + {{:linkbutton label="Attacher" href="attach_amort.html?immo_doc_id=%s&amort_line_id=%s"|args:$_GET.immo_doc_id:$line.amort_line_id shape="plus"}}
+{{else}} +

Aucun amortissement à rattacher

{{/if}} {{:form_errors}} {{:admin_footer}} diff --git a/save_amort.html b/save_amort.html index 4aa8e64..95ee7dc 100644 --- a/save_amort.html +++ b/save_amort.html @@ -2,16 +2,21 @@ {{* 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 *}} +{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + {{#select line.id_account as account_id, line.debit as montant, line.id_project as project_id, line.label as line_label, - trans.id as trans_id, + trans.id as immo_trans_id, trans.label, trans.date, account.code as account_code @@ -20,106 +25,83 @@ INNER JOIN acc_accounts AS account ON line.id_account = account.id 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 + :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 var="amort_label" value="Amortissement %s"|args:$ligne_immo.label}} -{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} +{{if $info_immo.amount != null}} + {{:assign var="ligne_immo.montant" value=$info_immo.amount}} +{{/if}} +{{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date}} +{{:assign amort_label=$info_immo.label|or:$ligne_immo.label}} + +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $amort_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"}} +{{if $info_immo.status == "amortized" || $info_immo.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}} -{{#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 +{{#load + type="credit_link" + where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $_GET.immo_doc_id|intval }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} -{{/select}} + {{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}} -{{* 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 +{{* 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 }} - {{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}} - + {{#select + line.credit, + trans.date as amort_date, + COALESCE(trans.label, line.label) as amort_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 = :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}} {{:assign total_amort=0}} {{:assign valeur_residuelle=$ligne_immo.montant}} -{{#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}} +{{#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}} {{:assign amort_label=$amort_label}} {{/foreach}} @@ -221,7 +203,7 @@ }} {{if $account_ok == null}} {{:assign compte=$credit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s&immo_line_id=%s"|args:$compte:$selected_chart:$_GET.immo_line_id}} + {{:redirect url="add_account.html?account=%s&chart=%s"|args:$compte:$selected_chart}} {{/if}} {{* vérifier que le montant ne dépasse pas le solde restant *}} @@ -237,15 +219,14 @@ debit=$_POST.montant account=$debit_account|keys|value:0 id_project=$ligne_immo.project_id - label=$_POST.designation }} {{:assign var="lines." credit=$_POST.montant account=$credit_account|keys|value:0 id_project=$ligne_immo.project_id - label=$_POST.designation }} + {{:api method="POST" path="accounting/transaction" @@ -256,33 +237,32 @@ date=$_POST.date_amort label=$_POST.designation lines=$lines - linked_transactions=$ligne_immo.trans_id|intval + linked_transactions=$ligne_immo.immo_trans_id|intval }} {{* enregistrer la liaison des lignes *}} - {{#select - trans.id AS trans_id, - line.id AS line_id - FROM acc_transactions AS trans - INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id - WHERE trans.id = :trans_id - ; - :trans_id = $result.id - }} - {{:assign amort_trans_id=$trans_id}} - {{:assign amort_line_id=$line_id}} - {{/select}} - {{if $amort_trans_id != null}} + {{#foreach from=$result.lines item="line"}} + {{if $line.account_code == $credit_account|keys|value:0}} + {{:save + key=""|uuid + type="amort_link" + immo_doc_id=$_GET.immo_doc_id|intval + amort_line_id=$line.id + }} + {{:break}} + {{/if}} + {{/foreach}} + + {{* immo soldée ? *}} + {{if $_POST.montant|trim|money_int == $solde}} + {{:assign var="info_immo.status" value="amortized"}} {{:save - key=""|uuid - type="link" - immo_line_id=$_GET.immo_line_id|intval - amort_line_id=$amort_line_id|intval - amort_trans_id=$result.id + key=$info_immo.key + status=$info_immo.status }} {{/if}} - {{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_line_id}} + {{:redirect force="amortization.html?immo_doc_id=%s&type_immo=%s&ok=1&msg=amortissement"|args:$_GET.immo_doc_id:$info_immo.status}} {{/form}} {{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}} @@ -299,7 +279,7 @@ {{:include file="_calcul_dates.html" date_debut=$date_debut date_fin=$date_amort keep="nbjours"}} {{* montant de l'amortissement *}} -{{:assign montant_amort="%f/%f/365*%d"|math:$ligne_immo.montant:$duree:$nbjours|intval}} +{{:assign montant_amort="%f/%f/365*%d"|math:$ligne_immo.montant:$info_immo.duration:$nbjours|intval}} {{:assign montant_amort="min(%f, %d-%d)"|math:$montant_amort:$ligne_immo.montant:$total_amort}} {{:assign var="debit_account.6811" value="6811 — Dot. aux amortissements des immobilisations"}} {{:assign var="credit_account.%s"|args:$code_amort value="%s — "|args:$code_amort|cat:$amort_account_label}} @@ -336,7 +316,7 @@ }} diff --git a/schema.json b/schema.json index 2acebc3..23a924b 100644 --- a/schema.json +++ b/schema.json @@ -14,11 +14,20 @@ "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" : { + "date_achat" : { + "description" : "date d'achat de l'immobilisation si besoin", + "type" : ["string", "null"], + "format" : "date" + }, + "date_mes" : { "description" : "date de mise en service de l'immobilisation", "type" : ["string", "null"], "format" : "date" @@ -28,5 +37,5 @@ "enum" : ["managed", "amortized", "archived", "ignored"] } }, - "required": ["type", "line", "duration", "date"] + "required": ["type", "line", "duration", "status"] } diff --git a/scripts.js b/scripts.js index 7496328..e6298ca 100644 --- a/scripts.js +++ b/scripts.js @@ -14,14 +14,13 @@ function toggleInputs(idcb, idfields) { function toggleVisibility(idcheck, fields) { const elem = document.getElementById(idcheck); - for (let id of fields) { - const field = document.getElementById(id); + fields.forEach(function (field) { if (elem.checked) { - field.setAttribute('class', ''); + field.classList.remove('hidden'); } else { - field.setAttribute('class', 'hidden'); + field.classList.add('hidden'); } - } + }); } // fixer l'exercice des sélecteurs de compte @@ -80,7 +79,7 @@ function setDateEnd(id_exercices, id_date, id_years) { // renvoyer la valeur numérique d'un montant formaté en € function getNumber(text) { - return Number(text.replace(/[^0-9,]/g, '').replace(/,/, '.')); + return Number(text.replace(/[^0-9,]/g, '').replace(/,/, '.')); } // calculer le montant d'un amortissement diff --git a/style.css b/style.css index 6836da9..9811b17 100644 --- a/style.css +++ b/style.css @@ -35,17 +35,15 @@ h2[class="aide"], h3[class="aide"] { } .informations dl.describe { - grid-template-columns : 20rem 1fr; + grid-template-columns : 25rem 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; } @@ -76,7 +74,31 @@ 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); +} + +span.input-list.avoirs label { + padding : 0.4rem 0.6rem; +} + +aside.right { + float: right; +} diff --git a/transfer.html b/transfer.html index 6f5bbcb..fdcbe3e 100644 --- a/transfer.html +++ b/transfer.html @@ -75,12 +75,12 @@ {{/if}} {{* vérifier que la date de mise en service est située dans l'exercice sélectionné *}} - {{:assign ts_date = $_POST.date_mes|parse_date|strtotime}} + {{:assign ts_date = $_POST.date_mes|parse_date}} {{:assign ok=false}} {{#foreach from=$years}} {{if $id == $_POST.id_year}} {{:assign selected_chart=$id_chart}} - {{if $start_date|strtotime <= $ts_date && $ts_date <= $end_date|strtotime}} + {{if $start_date <= $ts_date && $ts_date <= $end_date}} {{:assign ok=true}} {{:break}} {{/if}} @@ -93,11 +93,8 @@ {{if ! $_POST.amortir}} {{* ne pas amortir *}} {{:assign duration=0}} - {{:assign date_debut=$_POST.date_achat|parse_date}} {{:assign status="ignored"}} {{else}} - {{* vérifier que la date d'acquisition est antérieure à la date de mise en service *}} - {{:assign date_debut=$_POST.date_mes|parse_date}} {{:assign duration=$_POST.duree|intval}} {{:assign status="managed"}} {{/if}} @@ -182,7 +179,7 @@ type="immo" line=$immo_line_id duration=$duration - date=$date_debut + date_mes=null status=$status }} {{if $_POST.amortir}} diff --git a/write_exit.html b/write_exit.html index a4de1cd..44cfbda 100644 --- a/write_exit.html +++ b/write_exit.html @@ -3,16 +3,19 @@ {{* Enregistrer les écritures de sortie du bilan paramètres : - - immo_line_id : numéro de ligne de l'écriture d'immobilisation + - immo_doc_id : id du doc associé à l'immobilisation - amort_amount : montant des amortissements - year : exercice de la date de sortie de l'immobilisation - - date_mes : date de mise en service de l'immobilisation - date_debut : date de début de la période d'amortissement complémentaire - exit_date : date de sortie de l'immobilisation - - duree_amort : durée de l'amortiseement (optionnel) - cession : montant de la cession (optionnel) *}} +{{#load id=$_GET.immo_doc_id|intval assign="info_immo"}} +{{else}} + {{:error message="Immobilisation non trouvée"}} +{{/load}} + {{#select line.debit as montant, line.id_transaction, @@ -25,40 +28,63 @@ 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 = :immo_line_id; - :immo_line_id = $_GET.immo_line_id|intval + :immo_line_id = $info_immo.line assign="ligne_immo" }} +{{else}} + {{:error message="Immobilisation non trouvée"}} {{/select}} {{* 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.trans_id - :account=$ligne_immo.account_code - }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} -{{/select}} +{{#load + type="credit_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id = $info_immo.id + assign="credit_link" +}} + {{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}} +{{else}} + {{* + TODO : à garder ? + pas de doc => voir liaison écritures + *}} + {{#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 + }} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{/select}} +{{/load}} {{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} - {{:assign valeur_nette="%f-%f"|math:$ligne_immo.montant:$_GET.amort_amount}} + {{:assign amort_comp=0}} {{* amortissement complémentaire jqà date sortie *}} {{:assign amort_except=0}} {{* amortissement exceptionnel jqà date fin amortissement *}} {{if $valeur_nette > 0}} {{:assign nbjours="1+(%d-%d)/(60*60*24)"|math:$_GET.exit_date:$_GET.date_debut}} - {{:assign annuite="%f/%f"|math:$ligne_immo.montant:$_GET.duree_amort}} + {{:assign annuite="%f/%f"|math:$ligne_immo.montant:$info_immo.duration}} {{:assign amort_comp="round(%f/365*%f, 0)"|math:$annuite:$nbjours}} {{:assign amort_comp="min(%f, %f)"|math:$valeur_nette:$amort_comp}} @@ -161,6 +187,18 @@ lines=$lines linked_transactions=$ligne_immo.id_transaction }} + + {{* liaisons lignes d'amortissement *}} + {{#foreach from=$result.lines item="line"}} + {{if $line.account_code == $amort_account_code}} + {{:save + key=""|uuid + type="amort_link" + immo_doc_id=$info_immo.id + amort_line_id=$line.id + }} + {{/if}} + {{/foreach}} {{/if}} {{* écriture de sortie du bilan *}} @@ -215,6 +253,19 @@ linked_transactions=$ligne_immo.id_transaction }} + {{* liaison écriture de sortie *}} + {{#foreach from=$result.lines item="line"}} + {{if $line.account_code == $immo_account_code}} + {{:save + key=""|uuid + type="exit_link" + immo_doc_id=$info_immo.id + exit_line_id=$line.id + }} + {{:break}} + {{/if}} + {{/foreach}} + {{if $montant_cession > 0}} {{* Cession de l'immobilisation *}} {{:assign libelle="Produit cession "|cat:$ligne_immo.label}} @@ -247,30 +298,16 @@ }} {{/if}} - {{if $info_immo != null}} - {{* mettre à jour l'état de l'immobilisation *}} - {{:save - key=$info_immo.key - status="archived" - }} - {{else}} - {{:save - key=""|uuid - validate_schema="schema.json" - type="immo" - line=$_GET.immo_line_id|intval - duration=$_GET.duree_amort|intval - date=$_GET.date_mes|date:"Y-m-d" - status="archived" - }} - {{/if}} + {{* mettre à jour l'état de l'immobilisation *}} + {{:save + key=$info_immo.key + status="archived" + }} {{:redirect to="index.html?type_immo=archived"}} {{/form}} {{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortization"}} - -{{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index" subcurrent="balance_exit"}} {{/if}} @@ -344,14 +381,12 @@
{{$ligne_immo.montant|money_currency_html:false|raw}}
Date d'acquisition
{{$ligne_immo.date_achat|date_short}}
- {{if $_GET.date_mes != $ligne_immo.date_achat|strtotime}} + {{if $info_immo.date_mes != null && $info_immo.date_mes != $ligne_immo.date_achat}}
Date de mise en service
-
{{$_GET.date_mes|date:"d/m/Y"}}
- {{/if}} - {{if $_GET.duree_amort != null}} -
Durée de l'amortissement
-
{{$_GET.duree_amort}} ans
+
{{$info_immo.date_mes|date_short}}
{{/if}} +
Durée de l'amortissement
+
{{$info_immo.duration}} ans
Montant des amortissements
{{$_GET.amort_amount|money_currency_html:false|raw}} (à la date de début de l'exercice)
Valeur nette résiduelle