diff --git a/_immobilisations.html b/_immobilisations.html index 2d8281d..6e93d2d 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -5,7 +5,7 @@
{{if $type_immo == "encours"}}

Immobilisations en cours

- {{elseif $type_immo == "fini"}} + {{elseif $type_immo == "amortie"}}

Immobilisations amorties

{{/if}} {{:assign nb_immo=0}} @@ -134,7 +134,7 @@ {{* classement par onglet *}} {{if $type_immo == "encours" && $amort_amount >= $debit || - $type_immo == "fini" && $amort_amount < $debit || + $type_immo == "amortie" && $amort_amount < $debit || $amortissable == "nsp" && ! $exist_amort }} {{:continue}} diff --git a/_nav.html b/_nav.html index 913e5bc..4ce4216 100644 --- a/_nav.html +++ b/_nav.html @@ -5,19 +5,21 @@ - {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours"}} + {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "encours" || $type_immo == "autres"}} {{/if}} - {{if $current == 'index' && $subsubcurrent != 'balance_exit'}} + {{if $current == 'index'}} {{* && $subsubcurrent != 'balance_exit' *}} {{/if}} @@ -27,5 +29,8 @@
  • Amortissements
    • {{elseif $subsubcurrent == 'balance_exit'}} + {{/if}} diff --git a/add_infos.html b/add_infos.html index a823e2e..4a5ae85 100644 --- a/add_infos.html +++ b/add_infos.html @@ -4,7 +4,7 @@ @param immo_id @param amort = 1 si immo amortissable, 0 si non @param op = new ou modif - @param type_immo : encours, archive, fini, autre + @param type_immo : encours, sortie, amortie, autre *}} {{if $_GET.op == "modif"}} diff --git a/amortization.html b/amortization.html index cd9255a..29fdad6 100644 --- a/amortization.html +++ b/amortization.html @@ -1,5 +1,11 @@ {{* -*- brindille -*- *}} +{{* + Lister les écritures d'amortissement associées à une immobilisation + @param immo_id : id de la ligne d'immo + @param type_immo : encours, amortie, sortie, autres +*}} + {{* récupérer les infos de l'immobilisation *}} {{#select line.id as immo_id, @@ -65,19 +71,60 @@ {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} {{/foreach}} +{{* Autres amortissements non rattachés *}} +{{#select + line.id as l_id, + line.id_transaction as t_id, + line.credit as amort_amount, + line.label as l_label, + trans.date as t_date, + trans.label as t_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 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=autre_amort +}} + {{#select + id_transaction, + id_related + FROM acc_transactions_links + WHERE id_transaction = :id_amort OR id_related = :id_amort; + :id_amort=$t_id + }} + {{else}} + {{:assign var="autres_amortissements." value=$autre_amort}} + {{/select}} +{{/select}} + + {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}} {{* barre de navigation *}} -{{if $_GET.type_immo == "fini" || $valeur_residuelle== 0 }} - {{:assign subcurrent="fini"}} -{{elseif $_GET.type_immo == "archive"}} - {{:assign subcurrent="archive"}} +{{if $_GET.type_immo == "amortie" || $valeur_residuelle== 0 }} + {{:assign subcurrent="amortie"}} +{{elseif $_GET.type_immo == "sortie"}} + {{:assign subcurrent="sortie"}} {{elseif $_GET.type_immo == null || $_GET.type_immo == "encours"}} {{:assign subcurrent="encours"}} {{else}} {{:assign subcurrent="autres"}} {{/if}} -{{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization" type_immo=$_GET.type_immo}} + +{{:include + file="_nav.html" + current="index" + subcurrent="%s"|args:$subcurrent + subsubcurrent="amortization" + type_immo=$_GET.type_immo + autres_amort=$autres_amortissements +}} {{if $_GET.ok}} {{if $_GET.msg|match:"attach"}} @@ -97,23 +144,13 @@

    {{$msg}}

    {{/if}} -{{* -{{if $valeur_residuelle > 0}} - -{{/if}} -*}} -
    Sortir l'immobilisation du bilan ?

    {{:linkbutton label="Sortir du bilan" - href="balance_sheet_exit.html?immo_id=%s"|args:$_GET.immo_id + href="balance_sheet_exit.html?immo_id=%s&type_immo=%s"|args:$_GET.immo_id:$_GET.type_immo shape="export" class="main" }} @@ -197,85 +234,15 @@

    Aucun amortissement enregistré pour cette immobilisation

    {{/if}} -{{if $_GET.type_immo == null || $_GET.type_immo != "fini"}} +{{if $_GET.type_immo == null || $_GET.type_immo != "amortie"}} {{* Autres amortissements non rattachés *}} - {{#select - line.id as l_id, - line.id_transaction as t_id, - line.credit as amort_amount, - line.label as l_label, - trans.date as t_date, - trans.label as t_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 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=autre_amort - }} - {{#select - id_transaction, - id_related - FROM acc_transactions_links - WHERE id_transaction = :id_amort OR id_related = :id_amort; - :id_amort=$t_id - }} - {{else}} - {{:assign var="autres_amortissements." value=$autre_amort}} - {{/select}} - {{/select}} {{if $autres_amortissements != null}}

    Il existe des écritures d'amortissement qui ne sont pas rattachés à une immobilisation !
    Utilisez le bouton « Attacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.

    -{{* -
    -

    Amortissements non rattachés

    - - - - - - - - - - - - - - {{#foreach from=$autres_amortissements item="line"}} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.t_id}} - {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} - - - - - - - - - - {{/foreach}} - -
    N°DateMontantLibelléN° compteCompte
    #{{$line.t_id}}{{$line.t_date|date_short}}{{"%f"|math:$line.amort_amount|money}}{{if $line.l_label == null}} - {{$line.t_label}} - {{else}} - {{$line.l_label}} - {{/if}} - {{$line.account_code}}{{$line.account_label}} - {{:linkbutton label="Attacher" href="attach_amort.html?amort_id=%d&immo_id=%d"|args:$line.l_id:$ligne_immo.immo_id shape="plus"}} -
    -
    - *}} {{/if}} {{/if}} {{:form_errors}} diff --git a/attach_amort.html b/attach_amort.html index d2863df..8680894 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -53,4 +53,4 @@ assign_code="result_code" transactions=$linked_transactions }} -{{:redirect to="amortization.html?immo_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_id:$amort_id}} +{{:redirect force="amortization.html?immo_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_id:$amort_id}} diff --git a/balance_sheet_exit.html b/balance_sheet_exit.html index e4aadca..ad1a00a 100644 --- a/balance_sheet_exit.html +++ b/balance_sheet_exit.html @@ -158,9 +158,10 @@ {{/form}} {{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortissement"}} + {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="index" subcurrent="balance_exit"}} + {{:include file="_nav.html" current="index" subcurrent="%s"|args:$_GET.type_immo subsubcurrent="balance_exit"}} {{/if}} {{:form_errors}} diff --git a/index.html b/index.html index 9af0454..f949c49 100644 --- a/index.html +++ b/index.html @@ -36,9 +36,9 @@ {{if $type_immo == "autres"}} {{:include file="_immobilisations_autres.html"}} -{{elseif $type_immo == "archive"}} +{{elseif $type_immo == "sortie"}} {{:include file="_archives.html"}} -{{elseif $type_immo == "encours" || $type_immo == "fini"}} +{{elseif $type_immo == "encours" || $type_immo == "amortie"}} {{:include file="_immobilisations.html"}} {{/if}} diff --git a/other_amortizations.html b/other_amortizations.html index e817e5f..bc7d4c3 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -55,9 +55,17 @@ {{/select}} {{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortissement"}} + {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="index" subcurrent="autres" subsubcurrent="amortization"}} + {{:include + file="_nav.html" + current="index" + subcurrent="autres" + subsubcurrent="amortization" + type_immo="autres" + autres_amort=$autres_amortissements +}} {{/if}} {{if $autres_amortissements != null}} diff --git a/write_exit.html b/write_exit.html index 77acbb8..b3772df 100644 --- a/write_exit.html +++ b/write_exit.html @@ -260,7 +260,7 @@ }} {{/if}} - {{:redirect to="index.html?amort=archive"}} + {{:redirect to="index.html?amort=sortie"}} {{/form}} {{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}}