Cet onglet liste les immobilisations sorties du bilan car elles ne sont plus utilisées dans l'association (vétusté, fin de vie, - vente, cession...). + vente...).
{{:include file="_get_config.html" keep="module.config"}} -{{* 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 $module.table != null}} -{{: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}} + {{* 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)"}} + {{:assign status_condition="($$.status = 'archived')"}} -{{:assign nb_immo=0}} -{{:assign total_cessions = 0}} + {{:assign filter_condition=" ("}} + {{#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) AND NOT "|cat:$filter_condition|cat:" AND "|cat:$status_condition}} -{{#select - trans.id as trans_id, - 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.debit AS debit, - account.id as account_id, - account.code as account_code, - account.label as account_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 - WHERE !condition - ORDER BY trans.date DESC; - !condition=$condition - assign="immo_line" -}} + {{:assign total_cessions = 0}} - {{* voir si l'immo est prise en charge *}} - {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id assign="info_immo"}} - {{:assign status=$status}} - {{else}} - {{:assign status=null}} - {{/load}} - {{if $status != "archived"}} - {{:continue}} - {{/if}} - {{:assign var="immo_line.date_mes" value=$info_immo.date_mes|or:$trans_date}} - {{:assign var="immo_line.montant_immo" value=$debit}} + {{#select + trans.id as trans_id, + 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.debit AS debit, + account.id as account_id, + account.code as account_code, + account.label as account_label, + info.id as immo_doc_id, + $$.label as doc_label, + $$.amount as doc_amount, + $$.date_achat as doc_date_achat, + $$.date_mes as doc_date_mes, + $$.status as status + FROM acc_transactions AS trans + INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id + INNER JOIN acc_accounts AS account ON line.id_account = account.id + INNER JOIN acc_years AS years ON trans.id_year = years.id + INNER JOIN !table AS info ON $$.line = line.id + WHERE !condition + ORDER BY trans.date DESC; + !table=$module.table + !condition=$condition + assign="immo_line" + }} - {{* chercher le doc de sortie du bilan *}} - {{:assign var="immo_line.exit_date" value=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}} + {{:assign var="immo_line.date_mes" value=$doc_date_mes|or:$doc_date_achat|or:$trans_date}} + {{:assign var="immo_line.montant_immo" value=$doc_amount|or:$debit}} + + {{* chercher le doc de sortie du bilan *}} + {{:assign var="immo_line.exit_date" value=null}} + {{#load type="exit_link" where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id=$immo_doc_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 var="immo_line.exit_date" value=$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 = $immo_doc_id + }} + {{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:$immo_line.montant_immo:$total_credits}} + {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} + {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$immo_line.montant_immo}} + + {{* voir s'il y a une écriture de cession associée à cette immo *}} {{#select - trans.date + trans.id as cession_id, + trans.label, + line.id as line_id, + line.credit 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 + INNER JOIN !table AS cession_link ON json_extract(cession_link.document, '$.cession_line_id') = line.id + INNER JOIN !table AS immo_doc ON json_extract(cession_link.document, '$.immo_doc_id') = immo_doc.id + WHERE json_extract(immo_doc.document, '$.line') = :immo_line_id + ; + !table=$module.table + :immo_line_id = $immo_line.immo_line_id + assign="cession_line" }} - {{:assign var="immo_line.exit_date" value=$date}} + {{:assign var="montant" from="montant_cessions.%d"|args:$account_code}} + {{:assign var="montant_cessions.%d"|args:$account_code value="%d+%d"|math:$montant:$credit}} + {{:assign total_cessions="%d+%d"|math:$total_cessions:$credit}} {{/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 - }} - {{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:$immo_line.montant_immo:$total_credits}} - - {{if $solde_immo == 0}} - {{:assign status="archived"}} - {{/if}} - - {{if $status != "archived"}} - {{:continue}} - {{/if}} - - {{:assign nb_immo="%d+1"|math:$nb_immo}} - {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} - {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$immo_line.montant_immo}} - - {{* voir s'il y a une écriture de cession associée à cette immo *}} - {{#select - trans.id, - line.debit - 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 (link.id_transaction = :trans_id OR link.id_related = :trans_id) AND acc.code = 462 - ; - :trans_id = $trans_id - }} - {{:assign var="montant" from="montant_cessions.%d"|args:$account_code}} - {{:assign var="montant_cessions.%d"|args:$account_code value="%d+%d"|math:$montant:$debit}} - {{:assign total_cessions="%d+%d"|math:$total_cessions:$debit}} + {{:assign var="immo_lines." value=$immo_line}} {{/select}} - {{:assign var="immo_lines." value=$immo_line}} -{{/select}} - -{{if $immo_lines|count > 0}} -| N° | -Mise en service | -Date sortie | -Libellé | -Montant | -N° compte | -Compte | -- | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| #{{$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_label}} | -- {{:linkbutton label="Modifier" href="exit_step1.html?immo_doc_id=%s&from=exit"|args:$info_immo.id shape="edit"}} - | +N° | +Mise en service | +Date sortie | +Libellé | +Montant | +N° compte | +Compte | +|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - | |||||||||||||||
| #{{$trans_id}} | +{{$date_mes|date_short}} | +{{$exit_date|date_short}} | +{{$label_immo}} | +{{"%f"|math:$montant_immo|money_html:false|raw}} | +{{$account_code}} | +{{$account_label}} | ++ {{:linkbutton label="Modifier" href="exit_step1.html?immo_doc_id=%s&from=exit"|args:$immo_doc_id shape="edit"}} + | +||||||||
| + | |||||||||||||||
| + | + | + | Total du compte {{$code}} | +{{$value|money_html:false|raw}} | ++ | + | + | ||||||||
| - | Total du compte {{$code}} | -{{$value|money_html:false|raw}} | +Total des immobilisations | +{{$total_immo|money_html:false|raw}} | |||||||||||
| - | - | - | Total des immobilisations | -{{$total_immo|money_html:false|raw}} | -- | - | - | ||||||||
| - | |||||||||||||||
| + | |||||||||||||||
| + | + | + | Cessions du compte {{$code}} | +{{$value|money_html:false|raw}} | ++ | + | + | ||||||||
| - | Cessions du compte {{$code}} | -{{$value|money_html:false|raw}} | +Total des cessions | +{{$total_cessions|money_html:false|raw}} | |||||||||||
| - | - | - | Total des cessions | -{{$total_cessions|money_html:false|raw}} | -- | - | - | ||||||||
Aucune immobilisation
{{/if}} diff --git a/_calcul_dates.html b/_calcul_dates.html index e4dd864..ef868de 100644 --- a/_calcul_dates.html +++ b/_calcul_dates.html @@ -9,4 +9,4 @@ {{:assign ts_debut=$date_debut|strtotime}} {{:assign ts_fin=$date_fin|strtotime}} -{{:assign nbjours="1+abs(%d-%d)/(60*60*24)"|math:$ts_fin:$ts_debut}} +{{:assign nbjours="round(1+abs(%d-%d)/(60*60*24), 0)"|math:$ts_fin:$ts_debut}} diff --git a/_common_detach.html b/_common_detach.html index 8c84736..e7b6c7a 100644 --- a/_common_detach.html +++ b/_common_detach.html @@ -17,7 +17,7 @@ id_transaction FROM acc_transactions_lines WHERE id = :line_id; - :line_id = $line_id|intval + :line_id = $line_id }} {{:assign trans_id=$id_transaction}} {{else}} diff --git a/attach_exit.html b/attach_exit.html index 36cf6bf..a58eecc 100644 --- a/attach_exit.html +++ b/attach_exit.html @@ -36,4 +36,4 @@ exit_line_id=$_GET.exit_line_id|intval }} -{{:redirect to="exit_step4.html?immo_doc_id=%s&from=exit&ok=1&msg=attach_exit"|args:$_GET.immo_doc_id}} +{{:redirect force="exit_step4.html?immo_doc_id=%s&from=exit&ok=1&msg=attach_exit"|args:$_GET.immo_doc_id}} diff --git a/index.html b/index.html index f4cdcf9..6011275 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@ {{:include file="_nav.html" current=$type_immo}} {{* Mise à niveau *}} -{{:assign module_version="0.40.3"}} +{{:assign module_version="0.40.4"}} {{:include file="upgrade.html" module_version=$module_version}} {{* supprimer les documents sans écriture associée *}} diff --git a/modify_infos.html b/modify_infos.html index cbd43f3..c65194a 100644 --- a/modify_infos.html +++ b/modify_infos.html @@ -120,8 +120,6 @@ {{/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 *}} diff --git a/module.ini b/module.ini index 5e31f2f..62ee4af 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ name="Amortissements" -description="Immobilisations et amortissements\nversion 0.40.3" +description="Immobilisations et amortissements\nversion 0.40.4" author="Jean-Christophe Engel" author_url="https://gitea.zaclys.com/lesanges" home_button=false diff --git a/save_amort.html b/save_amort.html index 2a991e0..43cc871 100644 --- a/save_amort.html +++ b/save_amort.html @@ -41,6 +41,11 @@ {{:assign amort_label=$line_label|or:$trans_label}} {{/foreach}} +{{* date de début du 1er exercice dans paheko *}} +{{#years order="start_date" limit=1}} + {{:assign first_date=$start_date}} +{{/years}} + {{if $total_amort == 0}} {{* 1er amortissement *}} {{* déterminer le compte d'amortissement en fonction du compte d'immobilisation *}} @@ -55,8 +60,10 @@ {{:assign var=libelle value="Amortissement %s"|args:$ligne_immo.trans_label}} {{else}} {{* amortissements suivants *}} - {{:assign date_debut=$date_debut|strtotime}} - {{:assign date_debut="%d+(60*60*24)"|math:$date_debut|date:"Y-m-d"}} + {{if $date_debut != $first_date}} + {{:assign date_debut=$date_debut|strtotime}} + {{:assign date_debut="%d+(60*60*24)"|math:$date_debut|date:"Y-m-d"}} + {{/if}} {{/if}} {{* @@ -244,9 +251,6 @@ {{:input type="text" name="designation" label="Libellé" required=true default=$amort_label size="50"}} {{if $total_amort == 0 || $nbjours < 365 || $nbjours > 366}} {{:assign msg="Montant calculé au prorata du nombre de jours d'amortissement dans l'exercice"}} - {{if $nbjours != null}} - {{:assign msg=$msg|cat:" (%s)"|args:$nbjours}} - {{/if}} {{/if}} {{:input type="money" name="montant" label="Montant" required=true default=$montant_amort help=$msg}} {{:input