diff --git a/README.md b/README.md index 578af08..e771e69 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,15 @@ Ce module permet de gérer les écritures d'amortissements pour les immobilisati - lister les immobilisations - ajouter une nouvelle immobilisation -- lister les amortissements d'une immobilisation +- lister les amortissements d'une immobilisation : + - amortissements déjà enregistrés + - amortissements à venir +- associer une écriture d'amortissement à une immobilisation - enregistrer un nouvel amortissement -- incorporer d'anciennes immobilisations et leurs amortisements ## Installation - télécharger [l'archive zip](https://link.infini.fr/amortissement) - cliquer « Configuration » puis « Extensions » - en bas de la page, cliquer « Importer un module » - sélectionner l'archive téléchargée ci-dessus -- activer le module - +- activer le module qui est maintenant présent dans la liste des extensions inactives diff --git a/_archives.html b/_archives.html index a4356d6..fafad3b 100644 --- a/_archives.html +++ b/_archives.html @@ -5,6 +5,7 @@ Cette page liste les immobilisations sorties du bilan

+{{* Immobilisation avec une écriture de sortie de bilan *}} {{:include file="_get_config.html" keep="module.config"}} {{* lister les immobilisations *}} @@ -34,6 +35,7 @@ Montant N° compte Compte + Projet @@ -48,70 +50,57 @@ trans.label as trans_label, trans.date as trans_date, trans.id_year as trans_id_year, - line.id as immo_line_id, - line.label as line_label, + line.id as immo_id, line.debit AS debit, account.id as account_id, account.code as account_code, - account.label as account_label + account.label as account_label, + project.label as project_label FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id INNER JOIN acc_accounts AS account ON line.id_account = account.id INNER JOIN acc_years AS years ON trans.id_year = years.id + LEFT JOIN acc_projects AS project ON line.id_project = project.id WHERE !condition ORDER BY trans.date DESC; !condition=$condition }} - + {{:assign montant_immo=$debit}} {{* voir si l'immo est prise en charge *}} - {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id assign="info_immo"}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} {{:assign status=$status}} + {{if $amount != null}} + {{:assign montant_immo=$amount}} + {{/if}} {{else}} - {{:assign status=null}} + {{:assign amortissable="nsp"}} + {{:assign status="unknown"}} {{/load}} - {{if $status != "archived"}} + {{if $status == "ignored"}} {{: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}} - - {{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}} - {{:assign credit_immo=null}} - {{:assign total_credits=0}} - {{#load - type="credit_link" - where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $info_immo.id + {{* voir s'il existe une écriture liée qui solde l'immobilisation *}} + {{#select + trans.date as exit_date + FROM acc_transactions_links AS link + INNER JOIN acc_transactions AS trans ON + (CASE + WHEN link.id_transaction = :trans_id THEN link.id_related + WHEN link.id_related = :trans_id THEN link.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 line.credit = :montant_immo + AND acc.code = :account_code + ; + :trans_id = $trans_id + :montant_immo = $montant_immo + :account_code = $account_code }} - {{if $amount == null}} - {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; - :credit_line_id=$credit_line_id - }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} - {{/select}} - {{else}} - {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} - {{/if}} - {{/load}} - {{:assign solde_immo="%d-%d"|math:$montant_immo:$total_credits}} - - {{if $solde_immo == 0}} {{:assign status="archived"}} - {{/if}} + {{:assign exit_date=$exit_date}} + {{/select}} {{if $status != "archived"}} {{:continue}} @@ -127,7 +116,12 @@ {{* voir s'il y a une écriture de cession associée à cette immo *}} {{#select trans.id, - line.debit + trans.label, + trans.date, + line.id, + line.debit, + acc.code, + acc.label FROM acc_transactions_links AS link INNER JOIN acc_transactions AS trans ON (CASE WHEN link.id_transaction = :trans_id THEN link.id_related @@ -145,24 +139,21 @@ {{/select}} - #{{$trans_id}} - {{$date_mes|date_short}} + #{{$trans_id}} + {{$trans_date|date_short}} {{$exit_date|date_short}} - {{$trans_label}}{{if $line_label != null && $line_label != $trans_label}} — {{$line_label}}{{/if}} + {{$trans_label}} {{"%f"|math:$montant_immo|money_html:false|raw}} - {{$account_code}} + {{$account_code}} {{$account_label}} + {{$project_label}} - {{:linkbutton label="Modifier" href="exit_step1.html?immo_doc_id=%s"|args:$info_immo.id shape="edit"}} {{/select}} {{if $total_immo != 0}} - - - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} @@ -172,6 +163,7 @@ {{$value|money_html:false|raw}} + {{/foreach}} @@ -183,6 +175,7 @@ {{$total_immo|money_html:false|raw}} + {{/if}} @@ -199,6 +192,7 @@ {{$value|money_html:false|raw}} + {{/foreach}} @@ -210,6 +204,7 @@ {{$total_cessions|money_html:false|raw}} + {{/if}} diff --git a/_check_account.html b/_check_account.html index ce6816e..06e1108 100644 --- a/_check_account.html +++ b/_check_account.html @@ -19,7 +19,7 @@ {{/foreach}} {{:assign condition=$condition|cat:"0)"}} -{{:assign account_code=$account|keys|value:0}} +{{:assign account_code=$account|keys|key:0}} {{#sql select="code" tables="acc_accounts" diff --git a/_common_attach.html b/_common_attach.html deleted file mode 100644 index 728ee1f..0000000 --- a/_common_attach.html +++ /dev/null @@ -1,37 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Enregistrer l'association entre une ligne d'immo et une autre ligne (amort, credit, cession, sortie) - @param immo_doc_id : id du doc associé à la ligne d'immobilisation - @param trans_id : id de l'écriture à attacher -*}} -{{* données de l'immobilisation *}} -{{:include file="_get_immo_data.html" immo_doc_id=$immo_doc_id|intval keep="ligne_immo, message"}} -{{if $message != null}} - {{:error message=$message}} -{{/if}} - -{{* chercher les liaisons de l'écriture d'immobilisation *}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as linked_id - FROM acc_transactions_links as links - WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id; - :immo_trans_id = $ligne_immo.trans_id -}} - {{:assign var="linked_transactions." value=$linked_id}} -{{/select}} - -{{* ajouter la nouvelle liaison *}} -{{:assign var="linked_transactions." value=$trans_id}} -{{* Enregistrer les liaisons *}} -{{:api - method="POST" - path="accounting/transaction/%s/transactions"|args:$ligne_immo.trans_id - assign="result" - assign_code="result_code" - transactions=$linked_transactions -}} - diff --git a/_common_detach.html b/_common_detach.html deleted file mode 100644 index 2c730c8..0000000 --- a/_common_detach.html +++ /dev/null @@ -1,52 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Supprimer l'association entre une ligne d'immo et une autre ligne (amort, credit, cession, sortie) - @param immo_doc_id : id du doc associé à la ligne d'immobilisation - @param line_id : id de la ligne à détacher -*}} - -{{* données de l'immobilisation *}} -{{:include file="_get_immo_data.html" immo_doc_id=$immo_doc_id|intval keep="ligne_immo, message"}} -{{if $message != null}} - {{:error message=$message}} -{{/if}} - -{{* chercher la deuxième écriture *}} -{{#select - id_transaction - FROM acc_transactions_lines - WHERE id = :line_id; - :line_id = $line_id|intval -}} - {{:assign trans_id=$id_transaction}} -{{else}} - {{:error message="Écriture non trouvée"}} -{{/select}} - -{{* - chercher les liaisons de l'écriture d'immobilisation - et supprimer la liaison avec la deuxième écriture -*}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - END as linked_id - FROM acc_transactions_links as links - WHERE id_transaction = :immo_trans_id or id_related = :immo_trans_id; - :immo_trans_id = $ligne_immo.trans_id - }} - {{if $linked_id != $trans_id}} - {{:assign var="linked_transactions." value=$linked_id}} - {{/if}} -{{/select}} - -{{* Enregistrer les liaisons *}} -{{:api - method="POST" - path="accounting/transaction/%s/transactions"|args:$ligne_immo.trans_id - assign="result" - assign_code="result_code" - transactions=$linked_transactions -}} diff --git a/_get_amort_lines.html b/_get_amort_lines.html deleted file mode 100644 index dd115e8..0000000 --- a/_get_amort_lines.html +++ /dev/null @@ -1,44 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - lister les lignes d'amortissement liées à la ligne d'immobilisation - @param immo_doc_id : id du doc associé à l'immobilisation - @result linked_amort : lignes d'amortissement liées à la ligne d'immobilisation - @result total_amort : montant total des amortissements de l'immobilisation - @result created_amort : vrai s'il y a au moins un amortissement créé par le module dans la liste -*}} - -{{:assign total_amort=0}} -{{#load type="amort_link" - where="$$.immo_doc_id = :immo_doc_id" - :immo_doc_id = $immo_doc_id|intval - assign="amort_info" -}} - {{#select - line.id as line_id, - line.credit as amount, - line.label as line_label, - trans.id as trans_id, - trans.label as trans_label, - trans.date as date, - trans.id_year as year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - INNER join acc_accounts AS account on line.id_account = account.id - WHERE line.id = :amort_line_id - ; - :amort_line_id = $amort_line_id - assign="amort_line" - }} - {{:assign var="amort_line.amount" value=$amort_info.amount|or:$amort_line.amount}} - {{if $amort_info.created}} - {{:assign var="amort_line.created" value=true}} - {{:assign var="created_amort" value=true}} - {{/if}} - {{:assign var="linked_amort.%s_%d"|args:$amort_line.date:$amort_info.id value=$amort_line}} - {{:assign total_amort="%d+%d"|math:$total_amort:$amort_line.amount}} - {{/select}} -{{/load}} diff --git a/_get_codes.html b/_get_codes.html index 0373085..e6d85c1 100644 --- a/_get_codes.html +++ b/_get_codes.html @@ -7,8 +7,7 @@ la forme : code — libellé *}} -{{:assign values=$account|values}} -{{:assign label=$values.0}} +{{:assign label=$account|values|key:0}} {{:assign pos=$label|strpos:" "}} {{:assign account_code=$label|substr:0:$pos}} {{:assign var="account_code.%s"|args:$account_code value=$label}} diff --git a/_get_credit_lines.html b/_get_credit_lines.html deleted file mode 100644 index c06adc5..0000000 --- a/_get_credit_lines.html +++ /dev/null @@ -1,36 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - chercher des écritures liées à l'immo paramètre au crédit du même compte - @param immo_doc_id : id du doc associé à l'immobilisation - @result linked_immos : liste des écritures liées - @result total_credits : montant total des écritures -*}} -{{:assign linked_immos=null}} -{{:assign total_credits=0}} -{{#load type="credit_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$immo_doc_id|intval}} - {{#select - line.credit, - line.id as line_id, - trans.id as trans_id, - trans.label, - trans.date, - trans.id_year as year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - INNER join acc_accounts AS account on line.id_account = account.id - WHERE line.id = :credit_line_id; - :credit_line_id=$credit_line_id - }} - {{:assign credit=$credit}} - {{:assign var="linked_immos." doc=$id trans_id=$trans_id credit_line_id=$line_id label=$label amount=$credit date=$date account_id=$account_id account_code=$account_code account_label=$account_label year=$year}} - {{/select}} - {{if $amount == null}} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} - {{else}} - {{:assign total_credits="%d+%d"|math:$total_credits:$amount}} - {{/if}} -{{/load}} diff --git a/_get_free_amort.html b/_get_free_amort.html deleted file mode 100644 index 8a2649b..0000000 --- a/_get_free_amort.html +++ /dev/null @@ -1,47 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - lister les amortissement non rattachés à une immo - @param filter_condition -*}} -{{#select - line.id as line_id, - line.id_transaction as trans_id, - line.credit as amount, - line.label as line_label, - trans.date as trans_date, - trans.label as trans_label, - trans.id_year as year, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_accounts AS account ON account.id = line.id_account - INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction - WHERE credit > 0 AND (NOT trans.status & 16) AND !filter_condition - ORDER BY trans.date, trans.label; - !filter_condition=$filter_condition - assign="amort_line" -}} - {{* voir s'il existe des lignes d'immo liées à cette ligne d'amortissement *}} - {{:assign amort_amount=0}} - {{:assign keep_amort=true}} - {{#load type="amort_link" - where="$$.amort_line_id = :amort_line_id" - :amort_line_id=$amort_line.line_id|intval - assign="amort_link" - }} - {{if $amort_link.amount == null || $amort_link.amount == 0}} - {{:assign amort_amount=$amort_line.amount}} - {{:assign keep_amort=false}} - {{else}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}} - {{/if}} - {{else}} - {{* pas de ligne d'immo liée à cette ligne d'amort => garder cette ligne d'amortissement *}} - {{/load}} - {{if $keep_amort && $amort_amount < $amort_line.amount}} - {{:assign var="amort_line.amount" value="%d-%d"|math:$amort_line.amount:$amort_amount}} - {{:assign var="free_amort_lines." value=$amort_line}} - {{/if}} -{{/select}} diff --git a/_get_immo_data.html b/_get_immo_data.html deleted file mode 100644 index 513ec0b..0000000 --- a/_get_immo_data.html +++ /dev/null @@ -1,39 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Récupérer les infos d'une immobilisation - @param immo_doc_id : id du document associé à l'immobilisation - @result info_immo : infos du document associé - @result ligne_immo : données de la base - @result message non null si une erreur s'est produite -*}} - -{{#load id=$immo_doc_id|intval assign="info_immo"}} -{{else}} - {{:assign error=true}} - {{:assign message="Immobilisation non trouvée"}} -{{/load}} - -{{if ! $error}} - {{#select - line.id as line_id, - line.debit as amount, - line.label as line_label, - line.id_project as id_project, - trans.id as trans_id, - trans.label as trans_label, - trans.date as date_achat, - account.id as account_id, - account.code as account_code, - account.label as account_label - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - INNER JOIN acc_accounts AS account ON line.id_account = account.id - WHERE line.id = :line_id; - :line_id = $info_immo.line - assign="ligne_immo" - }} - {{else}} - {{:assign message="Immobilisation non trouvée"}} - {{/select}} -{{/if}} diff --git a/_immobilisations.html b/_immobilisations.html index ab4d4d6..aacdc34 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -1,18 +1,17 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations en cours d'amortissement ou amorties *}} +{{* Liste des immobilisations en cours 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}} @@ -30,102 +29,145 @@ {{* lister les immobilisations *}} + {{:include file="_get_config.html" keep="module.config"}} + {{: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)"}} - {{:assign status_condition="($$.status = 'managed' OR $$.status = 'amortized')"}} - {{:assign condition=$account_condition|cat:" AND line.debit > 0 AND "|cat:$status_condition}} + {{:assign filter_condition=" AND 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 condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"|cat:$filter_condition}} {{:assign nb_immo=0}} {{:assign total_immo = 0}} {{#select - trans.id as immo_trans_id, + trans.id as trans_id, trans.label as trans_label, trans.date as trans_date, - line.id as immo_line_id, + line.id as immo_id, line.debit AS debit, - line.label AS line_label, 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 + account.label as account_label, + trans.id_year as trans_id_year FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id INNER JOIN acc_accounts AS account ON line.id_account = account.id INNER JOIN acc_years AS years ON trans.id_year = years.id - INNER JOIN !table AS info ON $$.line = line.id WHERE !condition - ORDER BY COALESCE(doc_date_achat, trans_date) DESC; - !table=$module.table + ORDER BY trans.date DESC; !condition=$condition }} - {{if $status != "managed" && $status != "amortized"}} - {{:continue}} - {{/if}} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$immo_trans_id}} + {{:assign 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 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}} + {{:assign duration=null}} + {{:assign montant_immo=$debit}} - {{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}} - {{#load - type="credit_link" - where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $immo_doc_id - }} - {{if $amount == null}} - {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; - :credit_line_id=$credit_line_id - }} - {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}} - {{/select}} - {{else}} - {{:assign montant_immo="%d-%d"|math:$montant_immo:$amount}} + {{* voir si l'immo est prise en charge *}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} + {{:assign duration=$duration}} + {{:assign status=$status}} + {{if $amount != null}} + {{:assign montant_immo=$amount}} {{/if}} + {{else}} + {{:assign amortissable="nsp"}} + {{:assign status="unknown"}} {{/load}} - - {{if $montant_immo == 0}} - {{* Immobilisation soldée *}} + {{if $status == "ignored"}} {{:continue}} {{/if}} - {{* montant des amortissements liés à l'immobilisation *}} - {{:include file="./_get_amort_lines.html" immo_doc_id=$immo_doc_id keep="total_amort"}} - {{:assign amort_amount=$total_amort}} + {{* voir s'il existe une écriture qui solde l'immobilisation *}} + {{#select + line.id AS line + FROM acc_transactions_lines AS line + INNER JOIN acc_accounts AS acc ON acc.id = line.id_account + INNER JOIN acc_transactions_lines AS line2 ON line2.id_account = acc.id + WHERE + line.id = :line_id + AND line2.credit = :montant_immo; + :line_id = $immo_id|intval + :montant_immo = $montant_immo + }} + {{:assign status="archived"}} + {{/select}} + {{if $status == "archived"}} + {{:continue}} + {{/if}} + + {{* voir s'il existe des écritures d'amortissement associées *}} + {{#select + sum(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 + 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_id|intval + }} + {{if $amort_amount == null}} + {{:assign exist_amort=false}} + {{:assign amort_amount=0}} + {{else}} + {{:assign exist_amort=true}} + {{:assign amort_amount=$amort_amount}} + {{/if}} + {{/select}} {{* classement par onglet *}} {{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}} - {{if $type_immo == "amortized" && $amort_amount < $montant_immo}}{{:continue}}{{/if}} + {{if $type_immo == "managed" && $status == "amortized"}}{{:continue}}{{/if}} + {{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}} + {{if $type_immo == "amortized" && $amort_amount < $montant_immo && $status != "amortized"}}{{: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}} - - - + + + - + @@ -133,9 +175,6 @@ {{if $total_immo != 0}} - - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} @@ -163,7 +202,7 @@ {{/if}}
#{{$immo_trans_id}}{{$immo_date|date_short}}{{$label_immo}}#{{$trans_id}}{{$trans_date|date_short}}{{$trans_label}} {{$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}} {{:linkbutton - label="Détails" - href="amortization.html?immo_doc_id=%s&type_immo=%s"|args:$immo_doc_id:$type_immo shape="eye" + label="Paramètres" + href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo + shape="settings" + target="_dialog" + }} + {{:linkbutton + label="Amortissements" + href="amortization.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo + shape="table" }}
-
-{{/if}} -{{if $nb_immo == 0 || $module.table == null}} -

Aucune immobilisation

-{{/if}} + {{if $nb_immo == 0}} +

Aucune immobilisation

+ {{/if}} +
diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 0401feb..51aaa0d 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -1,186 +1,179 @@ {{* -*- brindille -*- *}} -{{* Liste des immobilisations non gérées ou non entièrement affectées *}} +{{* Liste des immobilisations non amortissables ou non (encore) gérées *}} -{{:include file="_get_config.html" keep="module.config"}} -

- Cette page liste les immobilisations pas encore prises en charge - par le module ou les écritures de la balance d'ouverture initiale - dont le montant n'est pas encore totalement affecté -

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

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

-{{if $_POST|count == 0}} - {{:assign unhide=$user_hides.unhide_other}} -{{else}} - {{if $_POST.unhide == null}} - {{:assign unhide=0}} + {{:include file="_get_config.html" keep="module.config"}} + {{if $_POST|count == 0}} + {{:assign unhide=$module.config.unhide_other}} {{else}} - {{:assign unhide=1}} - {{/if}} - {{:assign var="user_hides.unhide_other" value=$unhide"}} - {{:assign var="saved_hides.%s"|args:$logged_user.id value=$user_hides}} - {{:save key="config" hides=$saved_hides}} -{{/if}} -{{if $unhide}} - {{:assign checked="checked"}} -{{/if}} - -{{* vérifier l'existence de la table du module *}} -{{if $module.table != null}} - {{:assign columns="$$.status as status, SUM($$.amount) as amount,"}} - {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} - {{:assign doc_condition="($$.status IS NULL OR $$.status == 'managed' OR $$.status == 'ignored')"}} -{{else}} - {{:assign columns=""}} - {{:assign table_join=""}} - {{:assign doc_condition="1"}} -{{/if}} - -{{* - lister les immobilisations non prises en charge par le module - ou dont le montant n'a pas été totalement affecté -*}} -{{:assign account_condition="("}} -{{#foreach from=$module.config.prefixes item="code"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} -{{/foreach}} -{{:assign account_condition=$account_condition|cat:"0)"}} - -{{if $unhide == null}} - {{:assign filter_condition="NOT ("}} - {{#foreach from=$module.config.filters item="filter"}} - {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} - {{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}} - {{/foreach}} - {{:assign filter_condition=$filter_condition|cat:"0)"}} -{{else}} - {{:assign filter_condition="1"}} -{{/if}} - -{{:assign condition=$account_condition|cat:" AND debit > 0 AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:" AND "|cat:$doc_condition}} - -{{:assign nb_managed=0}} -{{:assign nb_ignored=0}} -{{:assign nb_null=0}} -{{:assign nb_other=0}} -{{#select - trans.id as immo_trans_id, - trans.label as trans_label, - trans.date as trans_date, - line.id as immo_line_id, - line.debit AS debit, - line.label AS line_label, - account.id as account_id, - account.code as account_code, - account.label as account_label, - !columns - trans.id_year as trans_id_year - FROM acc_transactions AS trans - INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id - INNER JOIN acc_accounts AS account ON line.id_account = account.id - INNER JOIN acc_years AS years ON trans.id_year = years.id - !table_join - WHERE !condition - GROUP BY immo_line_id - ORDER BY trans.date DESC; - !columns=$columns - !table_join=$table_join - !table=$module.table - !condition=$condition - assign="immo_line" - }} - {{* - parmi les immos gérées, ne conserver que celles dont le montant dans le doc est non nul - et inférieur au montant de l'écriture d'immo - *}} - {{if $immo_line.status == 'managed'}} - {{if $immo_line.amount == null || $immo_line.amount == 0 || $immo_line.amount == $immo_line.debit}} - {{:continue}} - {{/if}} - {{/if}} - {{if $status == null}} - {{:assign nb_null="%d+1"|math:$nb_null}} - {{elseif $status == 'managed'}} - {{:assign nb_managed="%d+1"|math:$nb_managed}} - {{elseif $status == 'ignored'}} - {{:assign nb_ignored="%d+1"|math:$nb_ignored}} - {{else}} - {{:assign nb_other="%d+1"|math:$nb_other}} - {{/if}} - - {{:assign var="immo_lines." value=$immo_line}} -{{/select}} - -
-
- {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées" }} -
-
- -{{if $immo_lines|count > 0}} - - - - - - - - - - - - - - - - - {{#foreach from=$immo_lines item="line"}} - - {{if $unhide == null}} - {{if $status == "ignored"}} - {{:continue}} - {{/if}} + {{if $_POST.unhide == null}} + {{:assign unhide=0}} {{else}} - {{* vérifier si le libellé aurait pu être filtré *}} - {{#foreach from=$module.config.filters item="filter"}} - {{if $trans_label|strpos:$filter !== false}} - {{:assign status="ignored"}} - {{/if}} - {{/foreach}} + {{:assign unhide=1}} {{/if}} + {{:save key="config" unhide_other=$unhide}} + {{/if}} + {{if $unhide}} + {{:assign checked="checked"}} + {{/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}} - - - - - - - - - - - + + + + + + + + + {{/select}} + +
N°LigneDateLibelléMontantAffectéResteN° compteCompte
#{{$line.immo_trans_id}}{{$line.immo_line_id}}{{$trans_date|date_short}}{{$line.trans_label}}{{if $line.line_label != null && $line.line_label != $line.trans_label}} — {{$line.line_label}}{{/if}}{{"%f"|math:$line.debit|money_html:false|raw}}{{"%f"|math:$line.amount|money_html:false|raw}}{{"%f"|math:$reste|money_html:false|raw}}{{$line.account_code}}{{$line.account_label}} - {{:linkbutton - label="Paramètres" - href="add_infos.html?immo_line_id=%s"|args:$immo_line_id - shape="settings" - target="_dialog" +
+
+ {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures marquées ignorées" }} +
+
+ + + + + + + + + + + + + + + + {{* lister les immobilisations *}} + {{:assign condition="("}} + {{#foreach from=$module.config.prefixes item="code"}} + {{:assign code=$code|cat:"%"|quote_sql}} + {{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} + {{/foreach}} + {{:assign condition=$condition|cat:"0)"}} + {{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}} + + {{if $unhide == null}} + {{*:assign condition=$condition|cat:" AND NOT (trans.status & 16)"*}} + + {{: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 condition=$condition|cat:" AND "|cat:$filter_condition}} + {{/if}} + + {{:assign nb_immo=0}} + {{#select + trans.id as trans_id, + trans.label as trans_label, + trans.date as trans_date, + line.id as immo_id, + account.id as account_id, + account.code as account_code, + account.label as account_label, + line.debit AS debit, + 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 + WHERE !condition + ORDER BY trans.date DESC; + !condition=$condition + }} + {{: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}} + + {{* voir si l'immo est prise en charge *}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} + {{:assign status=$status}} + {{else}} + {{:assign status="unknown"}} + {{/load}} + + {{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}} + + {{* voir s'il existe des écritures d'amortissement associées *}} + {{#select + sum(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 + 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_id|intval }} - - - {{/foreach}} - -
N°DateLibelléMontantN° compteCompte
-{{else}} -

Aucune immobilisation

-{{/if}} + {{if $amort_amount != null}} + {{:assign ignore=true}} + {{else}} + {{:assign ignore=false}} + {{/if}} + {{/select}} + + {{if $ignore}} + {{:continue}} + {{/if}} + {{:assign nb_immo="%d+1"|math:$nb_immo}} + +
#{{$trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{"%f"|math:$debit|money_html:false|raw}}{{$account_code}}{{$account_label}} + {{:linkbutton + label="Paramètres" + href="add_infos.html?immo_id=%s&type_immo=other"|args:$immo_id + shape="settings" + target="_dialog" + }} + {{:linkbutton + label="Amortissements" + href="amortization.html?immo_id=%s&type_immo=other"|args:$immo_id + shape="table" + }} +
+ {{if $nb_immo == 0}} +

Aucune immobilisation

+ {{/if}} +
diff --git a/add_infos.html b/add_infos.html index 8b16f09..9573196 100644 --- a/add_infos.html +++ b/add_infos.html @@ -1,205 +1,141 @@ {{* -*- brindille -*- *}} {{* - Classer une immobilisation non prise en charge - @param immo_line_id + @param immo_id + @param type_immo : managed, amortized, archived, other *}} -{{* données de l'immobilisation *}} -{{:assign montant_affecte=0}} -{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval assign="info_immo"}} - {{:assign montant_affecte="%d+%d"|math:$montant_affecte:$amount}} +{{* données de l'immobilisaion *}} +{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} {{/load}} -{{if $info_immo != null}} - {{:assign date_defaut=$info_immo.date}} - {{:assign duree_defaut=$info_immo.duration}} - {{:assign choix_defaut=$info_immo.status}} -{{else}} - {{:assign duree_defaut=null}} -{{/if}} - {{#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 + line.debit as montant 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.immo_line_id|intval - assign="ligne_immo" + :line_id = $_GET.immo_id + assign=ligne_immo }} -{{else}} - {{:error message="Immobilisation non trouvée"}} {{/select}} -{{:assign reste="%d-%d"|math:$ligne_immo.montant:$montant_affecte}} - +{{* Traiter l'envoi du formulaire *}} {{#form on="save"}} + {{if $_POST.classify == null}} - {{:error message="Vous devez faire un choix de classement"}} + {{:error message="Vous devez choisir une action"}} {{/if}} {{if $_POST.classify == "ignored"}} {{* ne pas amortir *}} {{:assign duration=0}} - {{:assign libelle=null}} - {{:assign montant=null}} - {{:assign date_achat=null}} - {{:assign date_mes=null}} + {{:assign montant=0}} + {{:assign date_debut=$ligne_immo.date_achat|parse_date}} {{:assign status="ignored"}} - {{elseif $_POST.classify == "archived"}} - {{* immobilisation sortie du bilan *}} - {{:save - key=""|uuid - validate_schema="asset.schema.json" - type="immo" - line=$_GET.immo_line_id|intval - duration=0 - status="managed" - assign_new_id="immo_doc_id" - }} - {{:redirect force="exit_step1.html?immo_doc_id=%s"|args:$immo_doc_id}} {{else}} - {{* immobilisation amortissable *}} - {{if $_POST.date_achat|parse_date > $ligne_immo.date_achat}} + {{* vérifier que la date d'acquisition est antérieure à la date de mise en service *}} + {{:assign date_debut=$_POST.date_mes|or:$ligne_immo.date_achat|parse_date}} + {{if $date_debut|strtotime < $ligne_immo.date_achat|strtotime}} + {{:assign dd=$date_debut|date_short}} {{: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}} + {{:error message="Erreur : la date de mise en service (%s) ne peut être antérieure à la date d'acquisition (%s)"|args:$dd:$da}} {{/if}} - {{* vérifier que la date de mise en service est postérieure à la date d'acquisition *}} - {{:assign d1=$_POST.date_achat|or:$ligne_immo.date_achat|parse_date}} - {{:assign d2=$_POST.date_mes|or:$d1|parse_date}} - {{if $d2 < $d1}} - {{:assign da=$d1|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 $_POST.date_achat == null || $_POST.date_achat|parse_date == $ligne_immo.date_achat}} - {{:assign date_achat=null}} - {{else}} - {{:assign date_achat=$_POST.date_achat|parse_date}} - {{/if}} - - {{if $_POST.date_mes == null || $_POST.date_mes == $_POST.date_achat}} - {{:assign date_mes=null}} - {{else}} - {{:assign date_mes=$_POST.date_mes|parse_date}} - {{/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}} - {{/if}} - - {{if $_POST.montant == null || $_POST.montant|money_int == 0 }} - {{if $montant_affecte > 0}} - {{:assign montant=$reste}} + {{if $_POST.classify == "amortized"}} + {{if $info_immo.duration == null}} + {{:assign duration=0}} {{else}} - {{:assign montant=null}} + {{:assign duration=$info_immo.duration}} {{/if}} + {{:assign status="amortized"}} + {{elseif $_POST.classify == "archived"}} + {{if $info_immo.duration == null}} + {{:assign duration=0}} + {{else}} + {{:assign duration=$info_immo.duration}} + {{/if}} + {{:assign status="archived"}} {{else}} - {{:assign montant=$_POST.montant|money_int}} - {{if $montant == $ligne_immo.montant}} - {{:assign montant=null}} + {{:assign duration=$_POST.duree|intval}} + {{if $duration <= 0}} + {{:error message="Erreur : la durée d'amortissement doit être strictement positive"}} {{/if}} + {{:assign status="managed"}} {{/if}} - {{if $montant > $reste}} - {{:assign reste_nb="%f"|math:$reste|money_currency:false}} - {{:assign montant_nb="%f"|math:$montant|money_currency:false}} - {{:error message="Le montant (%s) ne peut être supérieur au reste (%s)"|args:$montant_nb:$reste_nb}} - {{/if}} - - {{:assign status="managed"}} + {{:assign montant="%d*100"|math:$_POST.montant}} {{/if}} {{* enregistrer les infos de l'immobilisation *}} - {{if $info_immo == null || $montant_affecte > 0}} + {{if $info_immo == null}} {{:assign key=""|uuid}} {{else}} {{:assign key=$info_immo.key}} {{/if}} + {{:save key=$key - validate_schema="asset.schema.json" + validate_schema="schema.json" type="immo" - line=$_GET.immo_line_id|intval + line=$_GET.immo_id|intval duration=$duration - label=$libelle - amount=$montant - date_achat=$date_achat - date_mes=$date_mes + amount=$montant|intval + date=$date_debut status=$status }} - {{if $_POST.classify == "managed"}} - {{:assign type_immo="managed"}} - {{else}} + {{if $_POST.classify == "managed" || $_POST.classify == "amortized"}} + {{:assign type_immo=$_POST.classify}} + {{elseif $_POST.classify == "ignored"}} {{:assign type_immo="other"}} + {{else}} + {{:assign type_immo=$_GET.type_immo}} {{/if}} {{:redirect force="index.html?ok=1&msg=infos&type_immo=%s"|args:$type_immo}} +{{else}} + {{:form_errors}} {{/form}} -{{:admin_header title="Classer l'immobilisation" custom_css="./style.css" current="module_amortization"}} +{{:admin_header title="Classer l'immobilisation" custom_css=$custom_css current="module_amortization"}} + {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="other" subcurrent="parameter"}} + {{:include file="_nav.html" current="index"}} +{{/if}} + +{{:assign choix_defaut=$_GET.type_immo}} + +{{if $info_immo != null}} + {{:assign date_defaut=$info_immo.date}} + {{:assign duree_defaut=$info_immo.duration}} + {{:assign montant_defaut=$info_immo.amount}} +{{else}} + {{:assign duree_defaut=null}} + {{:assign montant_defaut=null}} {{/if}} -{{:form_errors}} {{* - classer l'immobilisation - - renseigner ou modifier la date de mise en service, les écritures associées ou la durée d'amortissement + - renseigner ou modifier la date de mise en service, le montant de + l'immobilisation et 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}} {{$ligne_immo.trans_label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.trans_label}} — {{$ligne_immo.line_label}}{{/if}}
-
Montant
-
{{"%f"|math:$ligne_immo.montant|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}} -
Date de l'écriture d'immobilisation
-
{{$ligne_immo.date_achat|date_short}}
-
Compte d'immobilisation
-
{{$ligne_immo.code}} — {{$ligne_immo.account_label}} -
-
-
Classement
(obligatoire)
{{:input type="radio-btn" name="classify" value="managed" label="Immobilisation à amortir" help="Cette immobilisation sera classée parmi les immobilisations amortissables" default=$choix_defaut}} + {{:input type="radio-btn" name="classify" value="amortized" label="Amortissement terminé" help="Cette immobilisation sera classée parmi les immobilisations amorties" default=$choix_defaut}} {{:input type="radio-btn" name="classify" value="archived" label="Immobilisation sortie du bilan" help="Cette immobilisation sera classée parmi les immobilisations sorties du bilan" default=$choix_defaut}} {{:input type="radio-btn" name="classify" value="ignored" label="Immobilisation à ignorer" help="Cette écriture n'apparaitra plus dans la liste des immobilisations" default=$choix_defaut}}
-
+
Informations
- {{:input type="number" name="duree" label="Durée d'amortissement" required=true min=1 suffix="année(s)"}} - {{:input type="money" name="montant" label="Montant de l'immobilisation" required=true default=$reste help="à modifier si différent du montant de l'écriture d'immobilisation"}} - {{:input type="date" name="date_achat" label="Date d'acquisition" help="à renseigner uniquement si différente de la date de l'écriture d'immobilisation"}} - {{:input type="date" name="date_mes" label="Date de mise en service" help="à renseigner uniquement si différente de la date d'acquisition"}} - {{:input type="text" name="libelle" label="Libellé" help="à renseigner uniquement si différent du libellé de l'écriture d'immobilisation"}} + {{:input type="number" name="duree" label="Durée d'amortissement" default=$duree_defaut required=true min=1}} + {{:input type="money" name="montant" label="Montant" default=$montant_defaut help="à renseigner uniquement si différent du montant de l'acquisition"}} + {{:input type="date" name="date_mes" label="Date de mise en service" default=$date_defaut help="à renseigner uniquement si différente de la date d'acquisition"}}
@@ -211,18 +147,20 @@ {{:admin_footer}} - diff --git a/save_amort.html b/save_amort.html index 224d52e..e623587 100644 --- a/save_amort.html +++ b/save_amort.html @@ -2,46 +2,78 @@ {{* Créer une écriture d'amortissement - @param immo_doc_id : id du doc associé à l'immo + @param immo_id : id de la ligne d'immobilisation *}} -{{* données de l'immobilisation *}} -{{:include file="_get_immo_data.html" immo_doc_id=$_GET.immo_doc_id|intval keep="info_immo, ligne_immo, message"}} -{{if $message != null}} - {{:error message=$message}} -{{/if}} +{{* Infos de l'immobilisation *}} +{{#select + line.id as immo_id, + line.id_account as account_id, + line.debit as montant, + line.id_project as project_id, + trans.id as trans_id, + trans.label, + trans.date, + y.id as year_id, + y.start_date, + y.end_date, + project.label as project_label + FROM acc_transactions_lines AS line + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id + INNER JOIN acc_years AS y ON trans.id_year = y.id + LEFT JOIN acc_projects AS project ON line.id_project = project.id + WHERE line.id = :line_id; + :line_id = $_GET.immo_id|intval + assign=ligne_immo + }} +{{else}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} +{{/select}} +{{:assign date_debut=$ligne_immo.date}} -{{if $info_immo.amount != null}} - {{:assign var="ligne_immo.amount" value=$info_immo.amount}} -{{/if}} -{{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}} -{{:assign amort_label=$info_immo.label|or:$ligne_immo.trans_label}} +{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} + {{:assign duree=$duration}} + {{:assign date_debut=$date}} + {{if $amount != null}} + {{:assign var="ligne_immo.montant" value=$amount}} + {{/if}} +{{else}} + {{:error message="Vous devez renseigner la date de mise en service et la durée d'immobilisation"}} +{{/load}} -{{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}} +{{* chercher des écritures d'amortissement liées à l'immobilisation *}} +{{#select + SUM(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, + MAX(trans.date) as amort_date, + COUNT(trans.id) as amort_number, + 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 DESC LIMIT 1; + :line_id = $_GET.immo_id|intval + assign=amort_line +}} +{{/select}} -{{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}} -{{:include file="_get_credit_lines.html" immo_doc_id=$_GET.immo_doc_id keep="total_credits"}} -{{:assign var="ligne_immo.amount" value="%d-%d"|math:$ligne_immo.amount:$total_credits}} - -{{* lister les amortissements liés à l'immobilisation *}} -{{:include file="./_get_amort_lines.html" immo_doc_id=$_GET.immo_doc_id keep="linked_amort, total_amort"}} - -{{:assign valeur_residuelle="%d-%d"|math:$ligne_immo.amount:$total_amort}} -{{if $valeur_residuelle == 0}} - {{:error message="Cette immobilisation est complètement amortie ; il est impossible d'ajouter une écriture d'amortissement"}} -{{/if}} - -{{#foreach from=$linked_amort|ksort item="line"}} - {{:assign date_debut=$line.date}} - {{:assign code_amort=$line.account_code}} - {{:assign amort_account_label=$line.account_label}} - {{:assign amort_label=$line_label|or:$trans_label}} -{{/foreach}} - -{{if $total_amort == 0}} +{{if $amort_line.amort_number == 0}} {{* 1er amortissement *}} {{* déterminer le compte d'amortissement en fonction du compte d'immobilisation *}} {{#select code, label from acc_accounts where id = :id; :id=$ligne_immo.account_id assign=amort_account}} @@ -51,12 +83,15 @@ code_immo=$amort_account.code keep="code_amort" }} - {{:assign var="amort_account_label" value="Amortissement %s"|args:$amort_account.label}} - {{:assign var=libelle value="Amortissement %s"|args:$ligne_immo.trans_label}} + {{:assign var=amort_label value="Amortissement %s"|args:$amort_account.label}} + {{:assign var=libelle value="Amortissement %s"|args:$ligne_immo.label}} {{else}} {{* amortissements suivants *}} - {{:assign date_debut=$date_debut|strtotime}} + {{:assign date_debut=$amort_line.amort_date|strtotime}} {{:assign date_debut="%d+(60*60*24)"|math:$date_debut|date:"Y-m-d"}} + {{:assign var=code_amort value=$amort_line.account_code}} + {{:assign var=amort_label value=$amort_line.account_label}} + {{:assign var=libelle value=$amort_line.amort_label}} {{/if}} {{* @@ -65,8 +100,8 @@ *}} {{:assign msg_years=""}} {{#years closed=false order="start_date" where="start_date <= :debut AND :debut <= end_date" - :debut=$date_debut assign="years."}} - {{if $total_amort == 0}} + :debut=$date_debut assign=years.}} + {{if $amort_line.amort_number == 0}} {{:assign ts_debut=$date_debut|strtotime}} {{else}} {{:assign ts_debut=$start_date|strtotime}} @@ -78,9 +113,7 @@ {{:assign var="years_data.%d"|args:$id value=$ts_debut|cat:" "|cat:$ts_fin}} {{:assign msg_years=$msg_years|cat:"\n"|cat:" - "|cat:$label|cat:" : "|cat:$debut|cat:" à "|cat:$fin}} {{else}} - {{:assign date_debut=$date_debut|date_short}} - {{:assign msg="Pas d'exercice ouvert pour enregistrer un amortissement à partir du %s"|args:$date_debut}} - {{:error message=$msg}} + {{:error message="Aucun exercice ouvert pour enregistrer un amortissement"}} {{/years}} {{* Traiter l'envoi du formulaire *}} @@ -137,31 +170,31 @@ }} {{if $account_ok == null}} {{:assign compte=$credit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s"|args:$compte:$selected_chart}} + {{:redirect url="add_account.html?account=%s&chart=%s&immo_id=%s"|args:$compte:$selected_chart:$_GET.immo_id}} {{/if}} {{* vérifier que le montant ne dépasse pas le solde restant *}} - {{:assign solde="%d-%d"|math:$ligne_immo.amount:$total_amort}} + {{:assign solde="%d-%d"|math:$ligne_immo.montant:$amort_line.amort_amount}} {{if $_POST.montant|trim|money_int > $solde|intval}} - {{:assign montant=$_POST.montant|trim|money_int|money_raw}} {{:assign solde=$solde|money_raw}} - {{:error message="Le montant indiqué « %s » dépasse le solde à amortir « %s »"|args:$montant:$solde}} + {{:error message="Le montant indiqué « %s » dépasse le solde à amortir « %s »"|args:$_POST.montant:$solde}} {{/if}} {{* enregistrer l'écriture *}} {{:assign var="lines." debit=$_POST.montant - account=$debit_account|keys|value:0 - id_project=$ligne_immo.id_project + account=$debit_account|keys|key:0 + id_project=$_GET.project_id + label=$_POST.designation }} {{:assign var="lines." credit=$_POST.montant - account=$credit_account|keys|value:0 - id_project=$ligne_immo.id_project + account=$credit_account|keys|key:0 + id_project=$_GET.project_id + label=$_POST.designation }} - {{:api method="POST" path="accounting/transaction" @@ -175,66 +208,27 @@ linked_transactions=$ligne_immo.trans_id|intval }} - {{* enregistrer la liaison des lignes *}} - {{#foreach from=$result.lines item="line"}} - {{if $line.account_code == $credit_account|keys|value:0}} - {{* TODO VOIR SI CORRECT ET UTILE *}} - {{* - vérifier la présence d'un doc avec cette ligne d'amortissement - (cas de la suppression manuelle d'un amortissement) - *}} - - {{#load type="amort_link" where="$$.amort_line_id = :amort_line_id" :amort_line_id=$line.id debug=true assign="info_amort"}} - {{:debug info_amort=$info_amort}} - {{:assign uuid=$key}} - {{:break}} - {{else}} - {{:assign uuid=""|uuid}} - {{/load}} -{{:debug uuid=$uuid}} - {{:save - key=""|uuid - type="amort_link" - immo_doc_id=$_GET.immo_doc_id|intval - amort_line_id=$line.id - created=true - }} - {{:break}} - {{/if}} - {{/foreach}} - - {{* immo soldée ? *}} - {{if $_POST.montant|trim|money_int == $solde}} - {{:assign var="info_immo.status" value="amortized"}} - {{:save - key=$info_immo.key - status=$info_immo.status - }} - {{/if}} - - {{:redirect force="amortization.html?immo_doc_id=%s&type_immo=%s&ok=1&msg=amortissement"|args:$_GET.immo_doc_id:$info_immo.status}} + {{:redirect force="amortization.html?immo_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_id}} {{/form}} -{{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}} +{{:admin_header title="Ajout amortissement" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="managed" subcurrent="amortization"}} + {{:include file="_nav.html" current="index" subcurrent="managed" subsubcurrent="amortization"}} {{/if}} {{:form_errors}} -{{if $years|count == 1}} - {{:assign var=selected_year value=$years.0.id}} -{{/if}} +{{:assign var=selected_year value=$years.0.id}} {{:assign var=date_amort value=$years.0.end_date}} {{: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.amount:$info_immo.duration:$nbjours|intval}} -{{:assign montant_amort="min(%f, %d-%d)"|math:$montant_amort:$ligne_immo.amount:$total_amort}} +{{:assign montant_amort="%f/%f/365*%d"|math:$ligne_immo.montant:$duree:$nbjours|intval}} +{{:assign montant_amort="min(%f, %d-%d)"|math:$montant_amort:$ligne_immo.montant:$amort_line.amort_amount}} {{: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}} +{{:assign var="credit_account.%s"|args:$code_amort value="%s — "|args:$code_amort|cat:$amort_label}} {{* -------------------------------------------------------------------------------- *}} @@ -248,14 +242,13 @@
{{:input type="select" default=$selected_year name="id_year" label="Exercice" required=true default_empty="— Faire un choix —" options=$open_years}} {{:input type="date" name="date_amort" label="Date" required=true default=$date_amort|date_short}} - {{:input type="text" name="designation" label="Libellé" required=true default=$amort_label size="50"}} + {{:input type="text" name="designation" label="Libellé" required=true default=$libelle}} {{:input type="money" name="montant" label="Montant" required=true default=$montant_amort}} {{:input type="list" name="debit_account" label="Compte de débit" required=true - readonly=true target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:"68*":$selected_year default=$debit_account }} @@ -264,14 +257,13 @@ name="credit_account" label="Compte d'amortissement (28xx)" required=true - readonly=true target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:"28*":$selected_year default=$credit_account }}
@@ -303,8 +295,8 @@ function redisplayData(evt, ) { setDateEnd(f_years_select, f_date, f_years_data); - displayAmort(f_immo, f_duree, f_amort, f_years_data, f_years_select, f_montant, f_erreur); setSelectorYear(['credit_account', 'debit_account'], f_years_select); + displayAmort(f_immo, f_duree, f_amort, f_years_data, f_years_select, f_montant, f_erreur); } function redisplayAmort(evt, diff --git a/asset.schema.json b/schema.json similarity index 59% rename from asset.schema.json rename to schema.json index 4391dd5..2acebc3 100644 --- a/asset.schema.json +++ b/schema.json @@ -1,6 +1,5 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "description": "Donnée d'une immobilisation", "type": "object", "properties": { "type": { @@ -15,20 +14,11 @@ "description": "durée de l'amortissement en années", "type": "integer" }, - "label" : { - "description" : "libellé de l'immobilisation si besoin", - "type" : ["string", "null"] - }, "amount" : { "description": "montant de l'immobilisation si besoin", "type": ["integer", "null"] }, - "date_achat" : { - "description" : "date d'achat de l'immobilisation si besoin", - "type" : ["string", "null"], - "format" : "date" - }, - "date_mes" : { + "date" : { "description" : "date de mise en service de l'immobilisation", "type" : ["string", "null"], "format" : "date" @@ -36,11 +26,7 @@ "status" : { "type" : ["string", "null"], "enum" : ["managed", "amortized", "archived", "ignored"] - }, - "created" : { - "description" : "vrai si immobilisation créée dans le module", - "type" : ["boolean", "null"] } }, - "required": ["type", "line", "duration", "status"] + "required": ["type", "line", "duration", "date"] } diff --git a/scripts.js b/scripts.js index c59df55..7496328 100644 --- a/scripts.js +++ b/scripts.js @@ -14,24 +14,23 @@ function toggleInputs(idcb, idfields) { function toggleVisibility(idcheck, fields) { const elem = document.getElementById(idcheck); - fields.forEach(function (field) { + for (let id of fields) { + const field = document.getElementById(id); if (elem.checked) { - field.classList.remove('hidden'); + field.setAttribute('class', ''); } else { - field.classList.add('hidden'); + field.setAttribute('class', 'hidden'); } - }); + } } // fixer l'exercice des sélecteurs de compte function setAccountYear(button_names, id_year) { for (const name of button_names) { const button = document.querySelector("button[data-name=" + name + "]"); - if (button != null) { - const b_value = button.value; - const new_value = b_value.replace(/id_year=\d+/, 'id_year=' + id_year); - button.setAttribute('value', new_value); - } + const b_value = button.value; + const new_value = b_value.replace(/id_year=\d+/, 'id_year=' + id_year); + button.setAttribute('value', new_value); } } @@ -81,7 +80,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 @@ -133,9 +132,7 @@ function displayAmort(id_immo, id_duree, id_amort, id_years, id_exercices, id_mo case_montant.innerText = montant_amort; } -function setSelectorYear(button_names, f_years_selector) -{ - const selector = document.getElementById(f_years_selector); +function setSelectorYear(button_names, f_years_selector) { const selected_year = document.getElementById(f_years_selector).value; setAccountYear(button_names, selected_year); } diff --git a/style.css b/style.css index 9811b17..fd5887b 100644 --- a/style.css +++ b/style.css @@ -35,15 +35,17 @@ h2[class="aide"], h3[class="aide"] { } .informations dl.describe { - grid-template-columns : 25rem 1fr; + grid-template-columns : 20rem 1fr; } .informations dl.describe > dt { + flex: 0 0 15rem; margin-right: 0; white-space: nowrap; } .informations dl.describe > dd { + flex: 0 0 calc(100% - 20rem); margin-right: 0; } @@ -74,31 +76,3 @@ 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 17d3b31..5759119 100644 --- a/transfer.html +++ b/transfer.html @@ -1,5 +1,6 @@ {{* -*- brindille -*- *}} +{{:admin_header title="Transfert d'immobilisation en cours" custom_css="./style.css" current="module_amortization"}} {{:include file="_get_config.html" keep="module.config.prefixes"}} {{#years closed=false order="start_date" assign=years.}} @@ -75,12 +76,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}} + {{:assign ts_date = $_POST.date_mes|parse_date|strtotime}} {{:assign ok=false}} {{#foreach from=$years}} {{if $id == $_POST.id_year}} {{:assign selected_chart=$id_chart}} - {{if $start_date <= $ts_date && $ts_date <= $end_date}} + {{if $start_date|strtotime <= $ts_date && $ts_date <= $end_date|strtotime}} {{:assign ok=true}} {{:break}} {{/if}} @@ -93,8 +94,11 @@ {{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}} @@ -106,7 +110,7 @@ account=$elem keep="account_code" }} - {{:assign debit_account=$account_code|keys|value:0}} + {{:assign debit_account=$account_code|keys|key:0}} {{:assign var="amount" from="_POST.credit_lines.%s"|args:$rang}} {{:assign var="label" from="_POST.line_labels.%s"|args:$rang}} {{:assign @@ -123,7 +127,7 @@ account=$_POST.debit_account keep="account_code" }} - {{:assign credit_account=$account_code|keys|value:0}} + {{:assign credit_account=$account_code|keys|key:0}} {{:assign var="amount" from="_POST.debit_lines.%s"|args:0}} {{:assign count=$_POST.line_labels|count}} {{:assign count="%d-1"|math:$count}} @@ -154,7 +158,7 @@ {{/if}} {{* écritures liées *}} - {{:assign var="linked_transactions" value=$transactions|keys}} + {{:assign var="linked_transactions" value=$_GET.trans|explode:","}} {{* enregistrer l'écriture *}} {{:api @@ -171,15 +175,15 @@ {{:assign lines_count=$lines|count}} {{:assign lines_count="%d-1"|math:$lines_count}} - {{:assign var="immo_line_id" from="result.lines.%s.id"|args:$lines_count}} + {{:assign var="immo_id" from="result.lines.%s.id"|args:$lines_count}} {{* enregistrer les infos de l'immobilisation *}} {{:save key=""|uuid - validate_schema="asset.schema.json" + validate_schema="schema.json" type="immo" - line=$immo_line_id + line=$immo_id duration=$duration - date_mes=null + date=$date_debut status=$status }} {{if $_POST.amortir}} @@ -190,9 +194,9 @@ {{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}} {{/form}} -{{:admin_header title="Transfert d'immobilisation en cours" custom_css="./style.css" current="module_amortization"}} +{{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="unfinished" subcurrent="transfer"}} + {{:include file="_nav.html" current="index" subcurrent="unfinished" subsubcurrent="transfer"}} {{/if}} {{:form_errors}} @@ -257,7 +261,6 @@ type="list" name="credit_accounts[]" required=true - readonly=true target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code:$selected_year default=$current_account }} @@ -272,7 +275,6 @@ {{/foreach}} - diff --git a/write_exit.html b/write_exit.html index beb6e68..f5cc912 100644 --- a/write_exit.html +++ b/write_exit.html @@ -3,35 +3,50 @@ {{* Enregistrer les écritures de sortie du bilan paramètres : - - immo_doc_id : id du doc associé à l'immobilisation + - immo_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 : 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) *}} -{{* données de l'immobilisation *}} -{{:include file="_get_immo_data.html" immo_doc_id=$_GET.immo_doc_id|intval keep="info_immo, ligne_immo, message"}} -{{if $message != null}} - {{:error message=$message}} -{{/if}} +{{#select + line.debit as montant, + line.id_transaction, + line.id_account, + trans.date as date_achat, + trans.label, + acc.code, + id_project + 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 = :immo_id; + :immo_id = $_GET.immo_id|intval + assign="ligne_immo" +}} +{{/select}} -{{* déduire le montant des écritures liées à l'immo courante au crédit du même compte *}} -{{:include file="_get_credit_lines.html" immo_doc_id=$_GET.immo_doc_id keep="total_credits"}} -{{:assign var="ligne_immo.amount" value="%d-%d"|math:$ligne_immo.amount:$total_credits}} -{{:assign valeur_nette="%f-%f"|math:$ligne_immo.amount:$_GET.amort_amount}} +{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} + {{if $amount != null}} + {{:assign var="ligne_immo.montant" value=$amount}} + {{/if}} +{{/load}} +{{: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.amount:$info_immo.duration}} + {{:assign annuite="%f/%f"|math:$ligne_immo.montant:$_GET.duree_amort}} {{:assign amort_comp="round(%f/365*%f, 0)"|math:$annuite:$nbjours}} {{:assign amort_comp="min(%f, %f)"|math:$valeur_nette:$amort_comp}} {{if $_GET.cession == null}} - {{:assign amort_except="%f-%f-%f"|math:$ligne_immo.amount:$_GET.amort_amount:$amort_comp}} + {{:assign amort_except="%f-%f-%f"|math:$ligne_immo.montant:$_GET.amort_amount:$amort_comp}} {{/if}} {{/if}} @@ -41,10 +56,6 @@ {{:assign montant_cession="%f*100"|math:$_GET.cession}} {{/if}} -{{* numéros de comptes ; voir info.org *}} -{{:assign vnc_code="652"}} -{{:assign cession_code="757"}} - {{* TODO : faut-il forcer les 3 sélecteurs de compte d'amortissement à avoir toujours la même valeur ? *}} {{* Traiter l'envoi du formulaire *}} @@ -65,7 +76,7 @@ account=$account keep="account_code" }} - {{:assign amort_account_code=$account_code|keys|value:0}} + {{:assign amort_account_code=$account_code|keys|key:0}} {{if $valeur_nette > 0}} {{* immo non totalement amortie *}} @@ -76,9 +87,9 @@ account=$_POST.comp_account keep="account_code" }} - {{:assign comp_account_code=$account_code|keys|value:0}} + {{:assign comp_account_code=$account_code|keys|key:0}} - {{:assign libelle="Amortissement complémentaire "|cat:$ligne_immo.trans_label}} + {{:assign libelle="Amortissement complémentaire "|cat:$ligne_immo.label}} {{:assign var="lines." debit="%f/100"|math:$amort_comp @@ -102,8 +113,8 @@ account=$_POST.except_account keep="account_code" }} - {{:assign except_account_code=$account_code|keys|value:0}} - {{:assign libelle="Amortissement exceptionnel "|cat:$ligne_immo.trans_label}} + {{:assign except_account_code=$account_code|keys|key:0}} + {{:assign libelle="Amortissement exceptionnel "|cat:$ligne_immo.label}} {{:assign var="lines." debit="%f/100"|math:$amort_except @@ -129,22 +140,10 @@ id_year=$_GET.year type="advanced" date=$_GET.exit_date - label="Amortissement final "|cat:$ligne_immo.trans_label + label="Amortissement final "|cat:$ligne_immo.label lines=$lines - linked_transactions=$ligne_immo.trans_id + 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 *}} @@ -154,19 +153,19 @@ account=$_POST.immo_account keep="account_code" }} - {{:assign immo_account_code=$account_code|keys|value:0}} - {{:assign libelle="Sortie du bilan de "|cat:$ligne_immo.trans_label}} + {{:assign immo_account_code=$account_code|keys|key:0}} + {{:assign libelle="Sortie du bilan de "|cat:$ligne_immo.label}} {{:assign var="lines." account=$immo_account_code - credit="%f/100"|math:$ligne_immo.amount + credit="%f/100"|math:$ligne_immo.montant id_project=$ligne_immo.id_project label=$libelle }} {{:assign var="lines." account=$amort_account_code - debit="(%f-%f)/100"|math:$ligne_immo.amount:$valeur_nette + debit="(%f-%f)/100"|math:$ligne_immo.montant:$valeur_nette id_project=$ligne_immo.id_project label=$libelle }} @@ -176,7 +175,7 @@ account=$_POST.vnc_account keep="account_code" }} - {{:assign vnc_account_code=$account_code|keys|value:0}} + {{:assign vnc_account_code=$account_code|keys|key:0}} {{:assign var="lines." account=$vnc_account_code @@ -196,37 +195,24 @@ date=$_GET.exit_date label=$libelle lines=$lines - linked_transactions=$ligne_immo.trans_id + 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.trans_label}} + {{:assign libelle="Produit cession "|cat:$ligne_immo.label}} {{:include file="_get_codes.html" account=$_POST.creance_account keep="account_code" }} - {{:assign creance_account=$account_code|keys|value:0}} + {{:assign creance_account=$account_code|keys|key:0}} {{:include file="_get_codes.html" account=$_POST.cession_account keep="account_code" }} - {{:assign cession_account=$account_code|keys|value:0}} + {{:assign cession_account=$account_code|keys|key:0}} {{:api method="POST" path="accounting/transaction" @@ -240,39 +226,36 @@ debit=$creance_account credit=$cession_account id_project=$ligne_immo.id_project - linked_transactions=$ligne_immo.trans_id + linked_transactions=$ligne_immo.id_transaction }} {{/if}} - {{* liaison écriture de cession *}} - {{#foreach from=$result.lines item="line"}} - {{if $line.account_code == $cession_code}} - {{:save - key=""|uuid - type="cession_link" - immo_doc_id=$info_immo.id - cession_line_id=$line.id - }} - {{:break}} - {{/if}} - {{/foreach}} + {{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_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}} - {{if $valeur_nette > 0}} - {{:assign type_immo="managed"}} - {{else}} - {{:assign type_immo="amortized"}} - {{/if}} - {{:include file="_nav.html" current="%s"|args:$type_immo subcurrent="balance_exit"}} + {{:include file="_nav.html" current="index" subcurrent="balance_exit"}} {{/if}} {{* @@ -282,15 +265,22 @@ {{:include file="./_get_amort_code.html" - code_immo=$ligne_immo.account_code + code_immo=$ligne_immo.code keep="code_amort" }} +{{* + Utilisation des « anciens » numéros de comptes because conflit + avec les nouveaux numéros ; voir info.org +*}} +{{:assign vnc_code="652"}} +{{:assign cession_code="757"}} + {{:assign var="liste_codes.6811" name="comp_account"}} {{:assign var="liste_codes.687" name="except_account"}} {{:assign var="liste_codes.462" name="creance_account"}} {{:assign var="liste_codes.%s"|args:$code_amort name="amort_account"}} -{{:assign var="liste_codes.%s"|args:$ligne_immo.account_code name="immo_account"}} +{{:assign var="liste_codes.%s"|args:$ligne_immo.code name="immo_account"}} {{:assign var="liste_codes.%s"|args:$vnc_code name="vnc_account"}} {{:assign var="liste_codes.%s"|args:$cession_code name="cession_account"}} {{:assign condition=$liste_codes|keys|implode:","}} @@ -330,22 +320,24 @@ {{/foreach}} {{:assign patterns=$pattern_array|implode:"|"}} -

Sortir l'immobilisation « {{$ligne_immo.trans_label}} » du bilan

+

Sortir l'immobilisation « {{$ligne_immo.label}} » du bilan

Données de l'imobilisation
Montant
-
{{$ligne_immo.amount|money_currency_html:false|raw}}
+
{{$ligne_immo.montant|money_currency_html:false|raw}}
Date d'acquisition
{{$ligne_immo.date_achat|date_short}}
- {{if $info_immo.date_mes != null && $info_immo.date_mes != $ligne_immo.date_achat}} + {{if $_GET.date_mes != $ligne_immo.date_achat|strtotime}}
Date de mise en service
-
{{$info_immo.date_mes|date_short}}
+
{{$_GET.date_mes|date:"d/m/Y"}}
+ {{/if}} + {{if $_GET.duree_amort != null}} +
Durée de l'amortissement
+
{{$_GET.duree_amort}} ans
{{/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
@@ -397,7 +389,6 @@ type="list" name="comp_account" target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"68*":$chart_id - readonly=true default=$comp_account }} @@ -410,7 +401,6 @@ type="list" name="amort_comp_account" target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id - readonly=true default=$amort_account }} @@ -443,7 +433,6 @@ type="list" name="except_account" target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"687*":$chart_id - readonly=true default=$except_account }} @@ -456,7 +445,6 @@ type="list" name="amort_except_account" target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id - readonly=true default=$amort_account }} @@ -483,12 +471,11 @@ type="list" name="amort_sortie_account" target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id - readonly=true default=$amort_account }} {{if $montant_cession == 0}} - {{:assign montant=$ligne_immo.amount}} + {{:assign montant=$ligne_immo.montant}} {{else}} {{:assign montant="%f+%f"|math:$_GET.amort_amount:$amort_comp}} {{/if}} @@ -502,7 +489,6 @@ type="list" name="vnc_account" target="!acc/charts/accounts/selector.php?codes=%s*&id_chart=%s"|args:$vnc_code:$chart_id - readonly=true default=$vnc_account }} @@ -516,12 +502,11 @@ type="list" name="immo_account" target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:$patterns:$chart_id - readonly=true default=$immo_account }} - {{$ligne_immo.amount|money_currency_html:false|raw}} + {{$ligne_immo.montant|money_currency_html:false|raw}} @@ -543,7 +528,6 @@ type="list" name="creance_account" target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"462*":$chart_id - readonly=true default=$creance_account }} @@ -556,7 +540,6 @@ type="list" name="cession_account" target="!acc/charts/accounts/selector.php?codes=%s*&id_chart=%s"|args:$cession_code:$chart_id - readonly=true default=$cession_account }}