diff --git a/_archives.html b/_archives.html index 60ce915..eea991f 100644 --- a/_archives.html +++ b/_archives.html @@ -2,17 +2,13 @@ {{* Liste des immobilisations archivées *}} -{{* Immobilisation avec une écriture de sortie de bilan *}} -{{:read file="./defaut.json" assign="config_json"}} -{{:assign config_defaut=$config_json|json_decode}} - -{{:assign condition="("}} -{{#foreach from=$config_defaut.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 acc2.code = account.code AND line.debit > 0 AND line.debit = line2.credit AND NOT (trans.status & 16)"}} +{{* Immobilisation archivées prises en charge *}} +{{#load type="immo" where="$$.status = 'archived'"}} + {{:assign var="lines." value="'%s'"|args:$line}} +{{/load}} +{{:assign lines=$lines|implode:","}} +{{:assign lines="("|cat:$lines|cat:")"}} +{{:assign condition="line.id IN %s"|args:$lines}} {{#select trans.id as trans_id, @@ -24,8 +20,45 @@ account.label as account_label, line.debit AS debit, project.label as project_label, - trans.id_year as trans_id_year, - trans2.date as exit_date + 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 + assign="immo_archivee" +}} + {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}} +{{/select}} + +{{* Immobilisation avec une écriture de sortie de bilan *}} +{{:read file="./defaut.json" assign="config_json"}} +{{:assign config_defaut=$config_json|json_decode}} + +{{:assign condition="("}} +{{#foreach from=$config_defaut.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 cond2=$condition|replace:"account.":"acc2."}} +{{:assign condition=$condition|cat:" AND "|cat:$cond2}} +{{:assign condition=$condition|cat:" AND line.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, + 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 @@ -39,7 +72,9 @@ !condition=$condition assign="immo_archivee" }} - {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}} + {{if ! $trans_id|key_in:$immo_archivees}} + {{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}} + {{/if}} {{/select}}
@@ -48,8 +83,7 @@ N° - Date achat - Date sortie + Date Libellé Montant N° compte @@ -66,7 +100,6 @@ #{{$trans_id}} {{$trans_date|date_short}} - {{$exit_date|date_short}} {{$trans_label}} {{"%f"|math:$debit|money:false}} {{$account_code}} diff --git a/add_asset.html b/add_asset.html index 99da03d..31ec3dc 100644 --- a/add_asset.html +++ b/add_asset.html @@ -13,8 +13,6 @@ {{if $ts_debut <= $now && $now <= $ts_fin}} {{:assign selected_year=$id}} {{/if}} -{{else}} - {{:error message="Aucun exercice ouvert"}} {{/years}} {{* Traiter l'envoi du formulaire *}} diff --git a/config.html b/config.html index 8170ac1..6506ce9 100644 --- a/config.html +++ b/config.html @@ -3,7 +3,6 @@ {{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}} {{* barre de navigation *}} {{:include file="_nav.html" current="config"}} - {{if $_GET.ok == 1}}

Configuration enregistrée.

{{/if}} @@ -40,107 +39,97 @@ {{:redirect to="./config.html?ok=%d"|args:$ok}} {{/form}} -{{* récupérer l'exercice courant ou sinon le plus récent *}} +{{* récupérer l'exercice courant *}} {{:assign var="selected_year" from="logged_user.preferences.accounting_year}} {{if $selected_year == null}} {{* sélectionner l'exercice le plus probable *}} - {{#years}} + {{#years closed=false order="start_date"}} + {{:assign var="open_years.%d"|args:$id value=$label}} {{if $start_date|strtotime <= $now && $end_date|strtotime >= $now}} {{:assign selected_year=$id}} {{:break}} {{/if}} - {{:assign last_year=$id}} {{/years}} {{/if}} -{{if $selected_year == null}} - {{if $last_year == null}} -

Aucun exercice

- {{else}} - {{:assign selected_year=$last_year}} - {{/if}} -{{/if}} +{{* libellés des comptes d'immobilisation *}} +{{:assign condition="("}} +{{#foreach from=$config.prefixes item="code"}} + {{:assign code=$code|quote_sql}} + {{:assign condition=$condition|cat:" account.code = "|cat:$code|cat:" OR "}} +{{/foreach}} +{{:assign condition=$condition|cat:"0)"}} +{{:assign condition=$condition|cat:" AND year.id = %s"|args:$selected_year}} -{{if $selected_year != null}} +{{#select + account.id as account_id, + account.code, + account.id_chart, + account.label, + year.label as year_label, + chart.label as chart_label + FROM acc_accounts AS account + INNER JOIN acc_charts AS chart ON chart.id = account.id_chart + INNER JOIN acc_years AS year ON year.id_chart = chart.id + WHERE !condition + ; + !condition=$condition + }} + {{:assign var="accounts.%s"|args:$code label=$label id=$account_id}} +{{/select}} - {{* libellés des comptes d'immobilisation *}} - {{:assign condition="("}} - {{#foreach from=$config.prefixes item="code"}} - {{:assign code=$code|quote_sql}} - {{:assign condition=$condition|cat:" account.code = "|cat:$code|cat:" OR "}} - {{/foreach}} - {{:assign condition=$condition|cat:"0)"}} - {{:assign condition=$condition|cat:" AND year.id = %s"|args:$selected_year}} +

Comptes d'immobilisation

+
- {{#select - account.id as account_id, - account.code, - account.id_chart, - account.label, - year.label as year_label, - chart.label as chart_label - FROM acc_accounts AS account - INNER JOIN acc_charts AS chart ON chart.id = account.id_chart - INNER JOIN acc_years AS year ON year.id_chart = chart.id - WHERE !condition - ; - !condition=$condition - }} - {{:assign var="accounts.%s"|args:$code label=$label id=$account_id}} - {{/select}} - -

Comptes d'immobilisation

- - -

- Les immobilisations sont cherchées dans les comptes sélectionnées et leurs sous-comptes. -

- - - - - - - - - - {{#foreach from=$accounts key=code item=elem}} - - - - - {{/foreach}} - - - - - - - -
Compte
- {{:assign var="immo_account.%s.%s"|args:$code:$code value="%s — "|args:$code|cat:$elem.label}} - {{:assign var="current_account" from="immo_account.%s"|args:$code}} - {{:input - type="list" - name="immo_accounts[]" - target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code::$selected_year - default=$current_account - }} - - {{:button - label="Enlever" - title="Enlever une ligne" - shape="minus" - min="1" - name="remove_line" - }} -
{{:button shape="plus" label="Ajouter" title="Ajouter un compte"}}
- -

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

+ Les immobilisations sont cherchées dans les comptes sélectionnées et leurs sous-comptes.

-
-{{/if}} + + + + + + + + + + {{#foreach from=$accounts key=code item=elem}} + + + + + {{/foreach}} + + + + + + + +
Compte
+ {{:assign var="immo_account.%s.%s"|args:$code:$code value="%s — "|args:$code|cat:$elem.label}} + {{:assign var="current_account" from="immo_account.%s"|args:$code}} + {{*:debug immo_account=$immo_account current_account=$current_account*}} + {{:input + type="list" + name="immo_accounts[]" + target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code::$selected_year + default=$current_account + }} + + {{:button + label="Enlever" + title="Enlever une ligne" + shape="minus" + min="1" + name="remove_line" + }} +
{{:button shape="plus" label="Ajouter" title="Ajouter un compte"}}
+ +

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

+