diff --git a/_nav.html b/_nav.html index 362f31a..d98dee8 100644 --- a/_nav.html +++ b/_nav.html @@ -14,9 +14,10 @@ {{if $current == 'index'}} {{if $subsubcurrent == 'amortization'}} diff --git a/add_asset.html b/add_asset.html index 8cd1403..e990d31 100644 --- a/add_asset.html +++ b/add_asset.html @@ -106,9 +106,9 @@ noamort=$noamort }} {{if $_POST.no_amort}} - {{:assign amort=0}} + {{:assign amort="autres"}} {{else}} - {{:assign amort=1}} + {{:assign amort="encours"}} {{/if}} {{:redirect force="index.html?ok=1&msg=immobilisation&amort=%s"|args:$amort}} {{/form}} diff --git a/add_infos.html b/add_infos.html index f34794c..1ce0399 100644 --- a/add_infos.html +++ b/add_infos.html @@ -55,9 +55,9 @@ }} {{if $_POST.no_amort}} - {{:assign amort=0}} + {{:assign amort="autres"}} {{else}} - {{:assign amort=1}} + {{:assign amort="encours"}} {{/if}} {{:redirect force="index.html?ok=1&msg=infos&amort=%s"|args:$amort}} {{else}} diff --git a/amortization.html b/amortization.html index 2d18a00..14b241e 100644 --- a/amortization.html +++ b/amortization.html @@ -3,12 +3,14 @@ {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}} {{* barre de navigation *}} -{{if $_GET.amort == null || $_GET.amort == "amort"}} - {{:assign subcurrent="amort"}} +{{if $_GET.amort == null || $_GET.amort == "encours"}} + {{:assign subcurrent="encours"}} {{elseif $_GET.amort == "fini"}} {{:assign subcurrent="fini"}} +{{elseif $_GET.amort == "archive"}} + {{:assign subcurrent="archive"}} {{else}} - {{:assign subcurrent="no_amort"}} + {{:assign subcurrent="autres"}} {{/if}} {{:include file="_nav.html" current="index" subcurrent="%s"|args:$subcurrent subsubcurrent="amortization"}} @@ -16,7 +18,7 @@ {{if $_GET.msg|match:"attach"}} {{:assign msg="Attachement effectué (écriture %s)"|args:$_GET.trans_id}} {{elseif $_GET.msg|match:"detach"}} - {{:assign msg="Attachement supprimé (écriture %s)"|args:$_GET.trans_id}} + {{:assign msg="Attachement détaché (écriture %s)"|args:$_GET.trans_id}} {{elseif $_GET.msg|match:"amortissement"}} {{:assign msg="Amortissement enregistré"}} {{/if}} @@ -72,9 +74,8 @@ trans.id_year as amort_year, account.id as account_id, account.code as account_code, - account.label as account_name - FROM - acc_transactions_lines as l_immo + 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 ( @@ -165,7 +166,7 @@ {{/if}} {{$line.account_code}} - {{$line.account_name}} + {{$line.account_label}} {{:linkbutton label="Détacher" href="detach_amort.html?amort_id=%d&immo_id=%d"|args:$line.amort_line:$ligne_immo.immo_id shape="plus"}} @@ -242,19 +243,19 @@ {{* Autres amortissements non rattachés *}} {{#select - li.id as l_id, - li.id_transaction as t_id, - li.credit as montant, - li.reference, - li.label as l_label, + 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, - account.code as a_code, - account.label as a_label, - y.label as y_label - FROM acc_transactions_lines AS li - INNER JOIN acc_accounts AS account ON account.id = li.id_account - INNER JOIN acc_transactions AS trans ON trans.id = li.id_transaction + 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; @@ -288,21 +289,21 @@ - {{#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}} #{{$line.t_id}} {{$line.t_date|date_short}} - {{"%f"|math:$line.montant|money}} + {{"%f"|math:$line.amort_amount|money}} {{if $line.l_label == null}} {{$line.t_label}} {{else}} {{$line.l_label}} {{/if}} - {{$line.a_code}} - {{$line.a_label}} + {{$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"}} diff --git a/immobilisations.html b/immobilisations.html index 77436e1..c31eeb1 100644 --- a/immobilisations.html +++ b/immobilisations.html @@ -3,9 +3,9 @@ {{* Liste des immobilisations amortissable ou à définir *}}
- {{if $amort == "amort"}} + {{if $amort == "encours"}}

Immobilisations en cours

- {{else}} + {{elseif $amort == "fini"}}

Immobilisations amorties

{{/if}} @@ -19,7 +19,6 @@ Durée N° compte Compte - Projet @@ -46,13 +45,11 @@ account.code as account_code, account.label as account_label, line.debit AS debit, - project.label as project_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 - LEFT JOIN acc_projects AS project ON line.id_project = project.id WHERE !condition ORDER BY trans.date DESC; !condition=$condition @@ -98,7 +95,7 @@ AND account.code LIKE '28%'; :line_id = $immo_id|intval - }} + }} {{if $amort_amount == null}} {{:assign exist_amort=false}} {{:assign amort_amount=0}} @@ -108,8 +105,9 @@ {{/if}} {{/select}} {{* immo amortie ? *}} - {{if $amort == "amort" && $amort_amount >= $debit || - $amort == "fini" && $amort_amount < $debit + {{if $amort == "encours" && $amort_amount >= $debit || + $amort == "fini" && $amort_amount < $debit || + $amortissable == "nsp" && ! $exist_amort }} {{:continue}} {{/if}} @@ -121,30 +119,40 @@ {{if $duration != null}}{{$duration}}{{/if}} {{$account_code}} {{$account_label}} - {{$project_label}} - {{if ! $exist_amort && $duration == null}} + {{if ! $exist_amort}} {{:linkbutton - label="Ajouter infos" - href="add_infos.html?immo_id=%s&amort=1"|args:$immo_id - shape="help" - target="_dialog" - }} - {{else}} - {{if ! $exist_amort}} - {{:linkbutton label="Modifier infos" href="modif_infos.html?immo_id=%s&amort=1"|args:$immo_id - shape="help" + shape="settings" target="_dialog" - }} - {{/if}} + }} + {{elseif $amortissable == "nsp"}} {{:linkbutton - label="Amortissements" - href="amortization.html?immo_id=%s&amort=%s"|args:$immo_id:$amort - shape="table" + label="Ajouter infos" + href="add_infos.html?immo_id=%s&amort=1"|args:$immo_id + shape="settings" + target="_dialog" }} {{/if}} + {{if $amort == "encours"}} + {{:linkbutton + label="Cession" + href="" + shape="money" + }} + {{elseif $amort == "fini"}} + {{:linkbutton + label="Rebut" + href="" + shape="export" + }} + {{/if}} + {{:linkbutton + label="Amortissements" + href="amortization.html?immo_id=%s&amort=%s"|args:$immo_id:$amort + shape="table" + }} {{/select}} diff --git a/immobilisations_autres.html b/immobilisations_autres.html new file mode 100644 index 0000000..08af93e --- /dev/null +++ b/immobilisations_autres.html @@ -0,0 +1,133 @@ +{{* -*- brindille -*- *}} + +{{* Liste des immobilisations non amortissables ou non (encore) gérées *}} + +
+

Autres immobilisations

+ + + + + + + + + + + + + + + + {{* lister les immobilisations *}} + {{:read file="./defaut.json" assign="config_json"}} + {{:assign config_defaut=$config_json|json_decode}} + {{:assign var="prefix_array" value=$config_defaut.prefixes|keys}} + {{:assign quote="'"}} + {{:assign condition="("}} + {{#foreach from=$prefix_array item="code"}} + {{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}} + {{/foreach}} + {{:assign condition=$condition|cat:"0)"}} + {{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}} + + {{#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}} + {{if $noamort}} + {{:assign amortissable="non"}} + {{else}} + {{:assign amortissable="oui"}} + {{/if}} + {{else}} + {{:assign amortissable="nsp"}} + {{/load}} + + {{if $amortissable == "oui"}} + {{: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 ignore=true}} + {{else}} + {{:assign ignore=false}} + {{/if}} + {{/select}} + + {{if $ignore}} + {{:continue}} + {{/if}} + + + + + + + + + + + {{/select}} + +
N°DateLibelléMontantN° compteCompte
#{{$trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{"%f"|math:$debit|money:false}}{{$account_code}}{{$account_label}} + {{if $amortissable == "nsp"}} + {{:linkbutton + label="Ajouter infos" + href="add_infos.html?immo_id=%s&amort=1"|args:$immo_id + shape="settings" + target="_dialog" + }} + {{else}} + {{:linkbutton + label="Modifier infos" + href="modif_infos.html?immo_id=%s&amort=0"|args:$immo_id + shape="help" + target="_dialog" + }} + {{/if}} +
+
diff --git a/index.html b/index.html index 5057665..40e74c9 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ {{* barre de navigation *}} {{if $_GET.amort == null}} - {{:assign amort="amort"}} + {{:assign amort="encours"}} {{else}} {{:assign amort=$_GET.amort}} {{/if}} @@ -47,9 +47,9 @@ {{/select}} {{/load}} -{{if $amort == "no_amort"}} - {{:include file="./immobilisations_non.html"}} -{{else}} +{{if $amort == "autres"}} + {{:include file="./immobilisations_autres.html"}} +{{elseif $amort == "encours" || $amort == "fini"}} {{:include file="./immobilisations.html"}} {{/if}} diff --git a/modif_infos.html b/modif_infos.html index c5f3599..096fc2c 100644 --- a/modif_infos.html +++ b/modif_infos.html @@ -58,9 +58,9 @@ }} {{if $_POST.no_amort}} - {{:assign amort=0}} + {{:assign amort="autres"}} {{else}} - {{:assign amort=1}} + {{:assign amort="encours"}} {{/if}} {{:redirect force="index.html?ok=1&msg=infos&amort=%s"|args:$amort}} {{else}}