diff --git a/_archives.html b/_archives.html index 791db91..e774b6d 100644 --- a/_archives.html +++ b/_archives.html @@ -1,28 +1,14 @@ {{* -*- brindille -*- *}} {{* Liste des immobilisations archivées *}} -

- Cette page liste les immobilisations sorties du bilan -

-{{* Immobilisation avec une écriture de sortie de bilan *}} -{{:include file="_get_config.html" keep="module.config"}} - -{{:assign accounts_condition="("}} -{{#foreach from=$module.config.prefixes item="code"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign accounts_condition=$accounts_condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}} -{{/foreach}} -{{:assign accounts_condition=$accounts_condition|cat:"0)"}} -{{:assign condition=$accounts_condition|cat:" AND acc2.code = account.code AND line.debit > 0 AND line.debit = line2.credit 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}} +{{* 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, @@ -34,11 +20,50 @@ 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 var="prefix_array" value=$config_defaut.prefixes|keys}} + +{{:assign condition="("}} +{{#foreach from=$prefix_array 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 + INNER JOIN acc_years AS years ON trans.id_year = years.id INNER JOIN acc_transactions_lines AS line2 ON line.debit = line2.credit INNER JOIN acc_transactions AS trans2 ON trans2.id = line2.id_transaction INNER JOIN acc_accounts AS acc2 ON acc2.id = line2.id_account @@ -48,16 +73,20 @@ !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}}
+

Immobilisations archivées

+ + {{:assign nb_immo=0}} - - + @@ -67,112 +96,23 @@ - {{:assign nb_immo=0}} - {{:assign total_immo = 0}} - {{:assign total_cessions = 0}} {{#foreach from=$immo_archivees}} {{: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 nb_immo="%d+1"|math:$nb_immo}} - {{:assign total_immo="%d+%d"|math:$total_immo:$debit}} - {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} - {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}} - - + - {{* voir s'il y a une écriture de cession associée à cette immo *}} - {{#select - trans.id, - 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 - 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}} - {{/select}} {{/foreach}} - - - {{if $total_immo != 0}} - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} - - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - - {{/if}} - {{if $total_cessions != 0}} - - - {{#foreach from=$montant_cessions|ksort key="code" item="value"}} - - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - - {{/if}} -
N°Mise en serviceDate sortieDate Libellé Montant N° compte
#{{$trans_id}} {{$trans_date|date_short}}{{$exit_date|date_short}} {{$trans_label}}{{"%f"|math:$debit|money_html:false|raw}}{{"%f"|math:$debit|money:false}} {{$account_code}} {{$account_label}} {{$project_label}}
Total du compte {{$code}}{{$value|money_html:false|raw}}
Total des immobilisations{{$total_immo|money_html:false|raw}}
-
Cessions du compte {{$code}}{{$value|money_html:false|raw}}
Total des cessions{{$total_cessions|money_html:false|raw}}
{{if $nb_immo == 0}}

Aucune immobilisation

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/_get_codes.html b/_get_codes.html index 0373085..a780b40 100644 --- a/_get_codes.html +++ b/_get_codes.html @@ -2,13 +2,9 @@ {{* déterminer le numéro du compte passé en paramètre dans un tableau - la clé est parfois l'identifiant du compte, parfois son code... - d'où l'obligation d'extraire le code de la valeur qui a toujours - 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_config.html b/_get_config.html deleted file mode 100644 index b1a9231..0000000 --- a/_get_config.html +++ /dev/null @@ -1,23 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Récupérer la config -*}} - -{{* config par défaut *}} -{{:read file="./defaut.json" assign="config_defaut"}} -{{:assign config_defaut=$config_defaut|json_decode}} - -{{if $module.config.prefixes == null}} - {{:assign var="module.config.prefixes" value=$config_defaut.prefixes}} -{{/if}} - -{{if $module.config.unfinished == null}} - {{:assign var="module.config.unfinished" value=$config_defaut.unfinished}} -{{/if}} - -{{* -{{if $module.config.tva == null}} - {{:assign var="module.config.tva" value=$config_defaut.tva}} -{{/if}} -*}} diff --git a/_immobilisations.html b/_immobilisations.html index 16500eb..2f28b30 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -3,52 +3,40 @@ {{* Liste des immobilisations en cours ou amorties *}}
- -

- {{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 == "encours"}} +

Immobilisations en cours

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

Immobilisations amorties

+ {{/if}} + {{:assign nb_immo=0}} - + - - + {{* lister les immobilisations *}} - {{:include file="_get_config.html" keep="module.config"}} - + {{:read file="./defaut.json" assign="config_json"}} + {{:assign config_defaut=$config_json|json_decode}} + {{:assign var="prefix_array" value=$config_defaut.prefixes|keys}} {{:assign condition="("}} - {{#foreach from=$module.config.prefixes item="code"}} + {{#foreach from=$prefix_array 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)"}} - {{: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}} - - {{:assign nb_immo=0}} - {{:assign total_immo = 0}} {{#select trans.id as trans_id, trans.label as trans_label, @@ -143,37 +131,33 @@ {{/if}} {{/select}} - {{* classement par onglet *}} - {{if $type_immo == "managed" && $amort_amount >= $debit}}{{:continue}}{{/if}} - {{if $type_immo == "managed" && $status == "amortized"}}{{:continue}}{{/if}} - {{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}} - {{if $type_immo == "amortized" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}} + {{* classement par onglet *}} + {{if $type_immo == "encours" && $amort_amount >= $debit}}{{:continue}}{{/if}} + {{if $type_immo == "encours" && $status == "amortized"}}{{:continue}}{{/if}} + {{if $status == "unknown" && ! $exist_amort}}{{:continue}}{{/if}} + {{if $type_immo == "amortie" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}} {{:assign nb_immo="%d+1"|math:$nb_immo}} - {{:assign total_immo="%d+%d"|math:$total_immo:$debit}} - {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} - {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}} - + - - + {{/select}} - - {{if $total_immo != 0}} - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} - - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - - {{/if}} -
N°N° Date Libellé Montant DuréeAmortissementsValeur nette N° compteCompte
#{{$trans_id}} {{$trans_date|date_short}} {{$trans_label}}{{$debit|money_html:false|raw}}{{"%f"|math:$debit|money}} {{if $duration != null}}{{$duration}}{{/if}}{{$amort_amount|money_html:false|raw}}{{"%d-%d"|math:$debit:$amort_amount|money_html:false|raw}} {{$account_code}}{{$account_label}} {{if ! $exist_amort}} {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo + href="add_infos.html?immo_id=%s&amort=1&op=modif&type_immo=%s"|args:$immo_id:$type_immo shape="settings" target="_dialog" }} {{elseif $status == "unknown"}} {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo + href="add_infos.html?immo_id=%s&amort=1&op=new&type_immo=%s"|args:$immo_id:$type_immo shape="settings" target="_dialog" }} @@ -187,34 +171,6 @@
Total du compte {{$code}}{{$value|money_html:false|raw}}
Total des immobilisations{{$total_immo|money_html|raw}}
{{if $nb_immo == 0}}

Aucune immobilisation

diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 694379e..4444ac8 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -3,20 +3,17 @@ {{* Liste des immobilisations non amortissables ou non (encore) gérées *}}
+

Autres immobilisations

+ {{:assign nb_immo=0}} -

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

- -
-
- {{:input type="checkbox" value=1 name="unhide" label="Afficher les écritures marquées ignorées" }} -
-
- +
+ @@ -29,25 +26,17 @@ {{* lister les immobilisations *}} - {{:include file="_get_config.html" keep="module.config"}} - + {{:read file="./defaut.json" assign="config_json"}} + {{:assign config_defaut=$config_json|json_decode}} + {{:assign var="prefix_array" value=$config_defaut.prefixes|keys}} {{:assign condition="("}} - {{#foreach from=$module.config.prefixes item="code"}} + {{#foreach from=$prefix_array 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)"}} - {{: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}} - - {{:assign nb_immo=0}} {{#select trans.id as trans_id, trans.label as trans_label, @@ -75,14 +64,8 @@ {{else}} {{:assign status="unknown"}} {{/load}} - {{if $_POST.unhide == null}} - {{if $status != "unknown"}} - {{:continue}} - {{/if}} - {{else}} - {{if $status != "ignored" && $status != "unknown"}} - {{:continue}} - {{/if}} + {{if $status != "unknown"}} + {{:continue}} {{/if}} {{* voir s'il existe des écritures d'amortissement associées *}} @@ -110,7 +93,7 @@ account.code LIKE '28%'; :line_id = $immo_id|intval }} - {{if $amort_amount != null}} + {{if $status == "unknown" && $amort_amount != null}} {{:assign ignore=true}} {{else}} {{:assign ignore=false}} @@ -122,52 +105,68 @@ {{/if}} {{:assign nb_immo="%d+1"|math:$nb_immo}} - + + - + {{/select}} + + {{:assign var="actions.amortize" value="Marquer l'immobilisation amortie"}} + {{:assign var="actions.ignore" value="Ignorer l'écriture"}} + + + + + + + +
+ + + N° Date Libellé
+ {{:input type="checkbox" name="check[%s]"|args:$immo_id value=$immo_id default=0}} + + + #{{$trans_id}} {{$trans_date|date_short}} {{$trans_label}}{{"%f"|math:$debit|money_html:false|raw}}{{"%f"|math:$debit|money:false}} {{$account_code}} {{$account_label}} {{if $status == "unknown"}} {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&type_immo=other"|args:$immo_id + href="add_infos.html?immo_id=%s&amort=0&op=new&type_immo=autre"|args:$immo_id shape="settings" target="_dialog" }} {{else}} {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&type_immo=other"|args:$immo_id + href="add_infos.html?immo_id=%s&amort=0&op=modif&type_immo=autre"|args:$immo_id shape="settings" target="_dialog" }} {{/if}} {{:linkbutton label="Amortissements" - href="amortization.html?immo_id=%s&type_immo=other"|args:$immo_id + href="amortization.html?immo_id=%s&type_immo=autre"|args:$immo_id shape="table" }}
+ + + Pour les écritures cochées : +{{* + + + {csrf_field key="projects_action"} +*}} + + {{:input type="select" name="actions" options=$actions default_empty="— Choisir une action à effectuer —"}} +
+
{{if $nb_immo == 0}}

Aucune immobilisation

{{/if}}
- - diff --git a/_nav.html b/_nav.html index 57a6f51..f5c6b94 100644 --- a/_nav.html +++ b/_nav.html @@ -1,45 +1,36 @@ {{* -*- brindille -*- *}} diff --git a/_unfinished.html b/_unfinished.html deleted file mode 100644 index c8a2e5a..0000000 --- a/_unfinished.html +++ /dev/null @@ -1,208 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* Liste des immobilisations en cours de constitution *}} - -
- -

- Cette page liste les immobilisations en cours de constitution, donc non amortissables -

- -
-
- Transférer une ou plusieurs lignes vers une immobilisation amortissable -

- Cocher les lignes concernées ; les montants seront additionnés par numéro de compte -

-
- Montants sélectionnés - - - - - -
-
-
-

- {{:linkbutton - label="Transférer" - href="transfer.html?trans=" - shape="right" - id="transfer" - }} -

-
-
-
- {{:input type="checkbox" value=1 name="unhide" label="Afficher les écritures marquées ignorées" }} -
-
- - - - - - - - - - - - - - - - - {{* lister les immobilisations en cours de constitution *}} - {{:include file="_get_config.html" keep="module.config"}} - - {{:assign accounts_condition="("}} - {{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} - {{:assign code=$elem.code|cat:"%"|quote_sql}} - {{:assign accounts_condition=$accounts_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} - {{/foreach}} - {{:assign accounts_condition=$accounts_condition|cat:"0)"}} - {{:assign condition=$accounts_condition|cat:" AND debit > 0 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}} - - {{:assign nb_immo=0}} - {{:assign total_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, - sum(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 - GROUP BY trans.id - ORDER BY trans.date DESC; - !condition=$condition - }} - {{* voir si l'écriture a été marquée ignorée *}} - {{:assign ignore=false}} - {{#load type="immo" assign="info_immo" where="$$.line = :line_id AND $$.status = 'ignored'" :line_id=$immo_id|intval}} - {{:assign ignore=true}} - {{/load}} - {{if $ignore && $_POST.unhide == null}} - {{:continue}} - {{/if}} - - {{* voir s'il existe une écriture qui solde l'immobilisation *}} - {{#select - count(*) AS count - 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 - WHERE line.credit = :amount AND code = :account_code - ; - :amount = $debit - :account_code = $account_code - }} - {{:assign count=$count}} - {{/select}} - - {{* S'il y a plus d'une écriture de même montant on ne peut pas décider *}} - {{if $count == 1}} - {{:continue}} - {{/if}} - - {{: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 nb_immo="%d+1"|math:$nb_immo}} - {{:assign total_immo="%d+%d"|math:$total_immo:$debit}} - {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} - {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}} - - - - - - - - - - - - {{/select}} - - - {{if $total_immo != 0}} - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} - - - - - - - - - - - {{/foreach}} - - - - - - - - - - - {{/if}} - -
N°DateLibelléMontantN° compteCompte
{{:input type="checkbox" name="selected[]" value=$trans_id}}#{{$trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{"%f"|math:$debit|money_html:false|raw}}{{$account_label}} - {{:linkbutton - label="Modifier" - href="ignore.html?immo_id=%s"|args:$immo_id - shape="edit" - target="_dialog" - }} -
Total du compte {{$code}}{{$value|money_html|raw}}
Total des immobilisations{{$total_immo|money_html|raw}}
- {{if $nb_immo == 0}} -

Aucune immobilisation

- {{/if}} -
- - - diff --git a/add_account.html b/add_account.html index 76aded1..c5b471a 100644 --- a/add_account.html +++ b/add_account.html @@ -1,5 +1,5 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Ajout immobilisation" current="module_amortization"}} +{{:admin_header title="Ajout immobilisation" current="module_amortissement"}} {{* barre de navigation *}} {{if ! $dialog}} diff --git a/add_asset.html b/add_asset.html index 9648331..666df24 100644 --- a/add_asset.html +++ b/add_asset.html @@ -1,6 +1,8 @@ {{* -*- brindille -*- *}} -{{:include file="_get_config.html" keep="module.config"}} +{{:read file="./defaut.json" assign="config_json"}} +{{:assign config_defaut=$config_json|json_decode}} +{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}} {{#years closed=false order="start_date" assign=years.}} {{:assign ts_debut=$start_date|strtotime}} @@ -12,8 +14,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 *}} @@ -34,6 +34,23 @@ {{:error message="La date saisie n'est pas dans l'exercice choisi !"}} {{/if}} + {{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|or:$_POST.date_achat|parse_date}} + {{if $date_debut|strtotime < $_POST.date_achat|parse_date|strtotime}} + {{:assign dd=$date_debut|date_short}} + {{:assign da=$_POST.date_achat|date_short}} + {{:error message="Erreur : la date de mise en service (%s) ne peut être antérieure à la date d'acquisition (%s)"|args:$dd:$da}} + {{/if}} + {{:assign duration=$_POST.duree|intval}} + {{:assign status="managed"}} + {{/if}} + {{* déterminer le numéro des comptes au cas où la clé serait un identifiant *}} {{:include file="_get_codes.html" @@ -53,18 +70,6 @@ - est présent dans le PC de l'exercice correspondant à la date *}} - {{#foreach from=$module.config.prefixes item="code"}} - {{:assign var="prefix_array." value=$code}} - {{/foreach}} - {{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} - {{:assign var="prefix_array." value=$code}} - {{/foreach}} - {{:include file="_check_account.html" account=$debit_account @@ -75,39 +80,7 @@ {{if $account_ok == null}} {{:assign compte=$debit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s&immo_id=%s"|args:$compte:$selected_chart:$_GET.immo_id}} - {{/if}} - - {{:assign debit_account=$debit_account|keys|value:0}} - {{:assign credit_account=$credit_account|keys|value:0}} - - {{* déterminer si le compte d'immo est un compte d'immo en cours *}} - {{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} - {{if $debit_account|strpos:$code === 0}} - {{:assign status="unfinished"}} - {{/if}} - {{/foreach}} - - {{if $status != "unfinished" && ! $_POST.amortir}} - {{* ne pas amortir *}} - {{:assign duration=0}} - {{:assign date_debut=$_POST.date_achat|parse_date}} - {{:assign status="ignored"}} - {{elseif $status != "unfinished"}} - {{* vérifier que la date d'acquisition est antérieure à la date de mise en service *}} - {{:assign date_debut=$_POST.date_mes|or:$_POST.date_achat|parse_date}} - {{if $date_debut|strtotime < $_POST.date_achat|parse_date|strtotime}} - {{:assign dd=$date_debut|date_short}} - {{:assign da=$_POST.date_achat|date_short}} - {{:error message="Erreur : la date de mise en service (%s) ne peut être antérieure à la date d'acquisition (%s)"|args:$dd:$da}} - {{/if}} - {{:assign duration=$_POST.duree|intval}} - {{:assign status="managed"}} + {{:error message="Le compte « %s » n'est pas un compte d'immobilisation ou n'est pas dans le plan comptable de l'exercice choisi"|args:$compte}} {{/if}} {{* enregistrer l'écriture *}} @@ -120,44 +93,38 @@ date=$_POST.date_achat label=$_POST.designation amount=$_POST.montant - debit=$debit_account - credit=$credit_account + debit=$debit_account|keys|key:0 + credit=$credit_account|keys|key:0 id_project=$_POST.id_project }} - {{if $status != "unfinished"}} - {{* vérifier s'il y a déjà un document avec le même numéro de ligne *}} - {{:assign var="immo_id" value=$result.lines.1.id}} - {{#load where="$$.line = :line_id" :line_id=$immo_id}} - {{:assign key=$key}} - {{else}} - {{:assign key=""|uuid}} - {{/load}} - - {{* enregistrer les infos de l'immobilisation *}} - {{:save - key=$key - validate_schema="schema.json" - type="immo" - line=$immo_id - duration=$duration - date=$date_debut - status=$status - }} - {{/if}} - - {{if $status == "unfinished"}} - {{:assign type_immo="unfinished"}} - {{elseif $_POST.amortir}} - {{:assign type_immo="managed"}} + {{* vérifier s'il y a déjà un document avec le même numéro de ligne *}} + {{:assign var="immo_id" value=$result.lines.1.id}} + {{#load where="$$.line = :line_id" :line_id=$immo_id}} + {{:assign key=$key}} {{else}} - {{:assign type_immo="other"}} + {{:assign key=""|uuid}} + {{/load}} + + {{* enregistrer les infos de l'immobilisation *}} + {{:save + key=$key + validate_schema="schema.json" + type="immo" + line=$immo_id + duration=$duration + date=$date_debut + status=$status + }} + {{if $_POST.amortir}} + {{:assign type_immo="encours"}} + {{else}} + {{:assign type_immo="autre"}} {{/if}} {{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}} - {{/form}} -{{:admin_header title="Ajout immobilisation" current="module_amortization"}} +{{:admin_header title="Ajout immobilisation" current="module_amortissement"}} {{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index"}} @@ -167,22 +134,16 @@ {{* formulaire d'ajout d'immobilisation *}} +{{:assign var="immo_account.2" value="2 — Classe 2 — Comptes d'immobilisations"}} + {{#select id,label FROM acc_projects WHERE archived = 0;}} {{:assign var="projects.%d"|args:$id value=$label}} {{/select}} -{{#foreach from=$module.config.prefixes item="code"}} +{{#foreach from=$prefix_array item="code"}} {{:assign var="pattern_array." value="%s*"|args:$code}} {{/foreach}} -{{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} -{{:assign var="pattern_array." value="%s*"|args:$code}} -{{/foreach}} -{{:assign var="patterns" value=$pattern_array|implode:"|"}} +{{:assign patterns=$pattern_array|implode:"|"}} diff --git a/config.html b/config.html deleted file mode 100644 index b8affb5..0000000 --- a/config.html +++ /dev/null @@ -1,245 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* lecture config (défaut ou enregistrée) *}} -{{:include file="./_get_config.html" keep="module.config, config_defaut"}} - -{{#form on="save"}} - {{:assign ok=0}} - {{#foreach from=$_POST.immo_accounts item="line"}} - {{:assign elem=$line|values}} - {{:assign elem=$elem.0}} - {{:assign var="fields" value=$elem|explode:" — "}} - {{if $fields.0|strpos:$config_defaut.unfinished.0.code === 0}} - {{:error message="Le compte « %s » n'est pas un compte d'immobilisation amortissable"|args:$fields.0}} - {{/if}} - {{:assign var="account_codes." value=$fields.0}} - {{/foreach}} - - {{#foreach from=$_POST.unfinished_accounts item="line"}} - {{:assign elem=$line|values}} - {{:assign elem=$elem.0}} - {{:assign var="fields" value=$elem|explode:" — "}} - {{:assign var="unfinished_codes." value=$fields.0}} - {{/foreach}} - - {{* vérifier qu'il n'y a pas d'intersection entre les deux listes de codes *}} - {{#foreach from=$account_codes item="i_code"}} - {{#foreach from=$unfinished_codes item="u_code"}} - {{if $i_code|strpos:$u_code === 0}} - {{:error message="Le compte d'immobilisation amortissable « %s » est incompatible avec le compte d'immobilisation en cours « %s »"|args:$i_code:$u_code}} - {{/if}} - {{if $u_code|strpos:$i_code === 0}} - {{:error message="Le compte d'immobilisation amortissable « %s » est incompatible avec le compte d'immobilisation en cours « %s »"|args:$i_code:$u_code}} - {{/if}} - {{/foreach}} - {{/foreach}} - - {{:save - key="config" - prefixes=$account_codes|sort - unfinished=$unfinished_codes|sort - }} - {{:assign ok=1}} - {{:redirect to="./config.html?ok=%d"|args:$ok}} -{{else}} - {{:form_errors}} -{{/form}} - -{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="config"}} -{{if $_GET.ok == 1}} -

Configuration enregistrée.

-{{/if}} - -{{* récupérer l'exercice courant ou sinon le plus récent *}} -{{:assign var="selected_year" from="logged_user.preferences.accounting_year"}} -{{if $selected_year == null}} - {{* sélectionner l'exercice le plus probable *}} - {{#years}} - {{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}} -{{if $selected_year != null}} - - {{* libellés des comptes d'immobilisation amortissables *}} - {{:assign condition="("}} - {{#foreach from=$module.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}} - - {{#select - account.id as account_id, - account.code, - account.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="immo_accounts.%s"|args:$code label=$label}} - {{/select}} - - {{* libellés des comptes d'immobilisation en cours de constitution *}} - {{:assign condition="("}} - {{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} - {{:assign code=$elem.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}} - - {{#select - account.id as account_id, - account.code, - account.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="unfinished_accounts.%s"|args:$code label=$label}} - {{/select}} - {{if $unfinished_accounts|count == 0}} - {{:assign var="unfinished_accounts.%s"|args:$config_defaut.unfinished.0.code label=$config_defaut.unfinished.0.label}} - {{/if}} - -
-

Comptes d'immobilisation amortissables

-

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

- - - - - - - - - - {{#foreach from=$immo_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"}}
- -

Comptes d'immobilisation en cours de constitution

-

- Ces immobilisations ne sont pas amortissables ; elles sont cherchées dans les comptes sélectionnés et leurs sous-comptes. -

- - - - - - - - - - - {{#foreach from=$unfinished_accounts key=code item=elem}} - - - - - {{/foreach}} - - - - - - - -
Compte
- {{:assign var="unfinished_account.%s.%s"|args:$code:$code value="%s — "|args:$code|cat:$elem.label}} - {{:assign var="current_account" from="unfinished_account.%s"|args:$code}} - {{:input - type="list" - name="unfinished_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"}} -

-
-{{/if}} - - - diff --git a/confirm_action.html b/confirm_action.html new file mode 100644 index 0000000..ee82683 --- /dev/null +++ b/confirm_action.html @@ -0,0 +1,50 @@ +{{* -*- brindille -*- *}} + +{{#form on="validate"}} + {{:debug get=$_GET post=$_POST}} +{{/form}} + +{{:admin_header title="Confirmer"}} +{{:assign .="infos"}} +{{*:debug post=$_POST*}} +{{if $_POST.actions == "amortize"}} + {{:assign action="Marquer l'immobilisation amortie"}} +{{elseif $_POST.actions == "ignore"}} + {{:assign action="Ignorer l'écriture"}} +{{/if}} +{{:assign msg_titre="Appliquer l'opération « %s » sur les écritures : "|args:$action}} + +{{:assign msg_lines=""}} + +{{:admin_header title="Confirmer l'opération" custom_css="./style.css" current="module_amortissement"*}} + +
+
+

Appliquer l'opération « {{$action}} » sur les écritures :

+
+ + + + + + + + + {{#foreach from=$_POST.check item="line"}} + + {{:assign var="label" from="_POST.label.%s"|args:$line}} + {{:assign var="trans_id" from="_POST.trans.%s"|args:$line}} + {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}} + + + + + {{/foreach}} + +
N°Libellé
#{{$trans_id}}{{$label}}
+

+ {{:button type="submit" name="validate" label="Confirmer" shape="right" class="main"}} +

+
+ +{{:admin_footer}} diff --git a/defaut.json b/defaut.json index df93eec..5c00d9b 100644 --- a/defaut.json +++ b/defaut.json @@ -1,14 +1,8 @@ { "tva": false, - "prefixes": [ - "20", - "21", - "27" - ], - "unfinished": [ - { - "code" : "23", - "label" : "Immobilisations en cours" - } - ] + "prefixes": { + "20": "Immobilisations incorporelles", + "21": "Immobilisations corporelles", + "27": "Immobilisations financières" + } } diff --git a/filters.html b/filters.html deleted file mode 100644 index 7590c9e..0000000 --- a/filters.html +++ /dev/null @@ -1,94 +0,0 @@ -{{* -*- brindille -*- *}} - -{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortization"}} -{{:include file="_nav.html" current="config" subcurrent="filters"}} - -{{if $_GET.ok == 1}} -

Configuration enregistrée.

-{{/if}} - -{{* lecture config *}} -{{:include file="./_get_config.html" keep="module.config"}} - -{{#form on="save"}} - {{* enregistrer les filtres dans la config *}} - {{#foreach from=$_POST.filters item="filter"}} - {{if $filter != ""}} - {{:assign var="filters." value=$filter}} - {{/if}} - {{/foreach}} - {{:save key="config" filters=$filters}} - {{:redirect to="./filters.html"}} -{{/form}} - -
-

Liste de libellés à ignorer

-

- Les écritures dont le libellé contient un des textes ci-dessous seront ignorées -

- - - - - - - - - - {{if $module.config.filters == null}} - - - - - {{else}} - {{#foreach from=$module.config.filters item="filter"}} - - - - - {{/foreach}} - {{/if}} - - - - - - - -
Libellé
- {{:input type="text" name="filters[]" required=false}} - - {{:button - label="Enlever" - title="Enlever une ligne" - shape="minus" - name="remove_line" - }} -
- {{:input type="text" name="filters[]" default=$filter required=false}} - - {{:button - label="Enlever" - title="Enlever une ligne" - shape="minus" - name="remove_line" - }} -
{{:button shape="plus" label="Ajouter" title="Ajouter un libellé"}}
-

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

-
- - - diff --git a/ignore.html b/ignore.html deleted file mode 100644 index 7cd4cb1..0000000 --- a/ignore.html +++ /dev/null @@ -1,85 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - Marquer la ligne d'écriture « à ignorer » - @param immo_id : numéro de ligne -*}} - -{{#select - trans.id AS trans_id, - trans.date AS date, - trans.label AS label, - line.debit AS amount - FROM acc_transactions_lines AS line - INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id - WHERE line.id = :line_id - ; - :line_id = $_GET.immo_id - assign=ligne_immo -}} -{{else}} - {{:error message="Il n'y a aucune écriture avec le numéro de ligne %s !"|args:$_GET.immo_id}} -{{/select}} -{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}}{{/load}} - -{{* Traiter l'envoi du formulaire *}} -{{#form on="proceed"}} - {{if $_POST.ignore != null && $info_immo == null}} - {{* ignorer l'écriture *}} - {{:assign duration=0}} - {{:assign status="ignored"}} - {{:save - key=""|uuid - validate_schema="schema.json" - type="immo" - line=$_GET.immo_id|intval - duration=$duration - date=$ligne_immo.date - status=$status - }} - {{:redirect force="index.html?ok=1&msg=infos&type_immo=unfinished"}} - {{elseif $_POST.ignore == null && $info_immo != null}} - {{* dés-ignorer l'écriture *}} - {{:delete id=$info_immo.id}} - {{:redirect force="index.html?ok=1&msg=infos&type_immo=unfinished"}} - {{else}} - {{:redirect force="index.html?type_immo=unfinished"}} - {{/if}} -{{else}} - {{:form_errors}} -{{/form}} - -{{:admin_header title="Ignorer l'écriture" custom_css="./style.css" current="module_amortization"}} - -{{* barre de navigation *}} -{{if ! $dialog}} - {{:include file="_nav.html" current="index"}} -{{/if}} - -
-
- Ignorer -
-
-
Écriture
-
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}
-
Montant
-
{{"%f"|math:$ligne_immo.amount|money_currency_html:false|raw}}
-
-
-
- {{if $info_immo != null && $info_immo.status == "ignored"}} - {{:input type="checkbox" name="ignore" checked="checked" value="1" label="Ignoré" help="Décocher pour ne plus ignorer l'écriture"}} - {{else}} - {{:input type="checkbox" name="ignore" value="1" label="Ignoré" help="Cocher pour ignorer l'écriture ; elle n'apparaitra plus dans la liste des immobilisations"}} - {{/if}} -
-
- -

- {{:button type="submit" name="proceed" label="Confirmer" shape="right" class="main"}} -

- -
- -{{:admin_footer}} diff --git a/index.html b/index.html index ed61086..ac5c003 100644 --- a/index.html +++ b/index.html @@ -1,24 +1,13 @@ {{* -*- brindille -*- *}} +{{:admin_header title="Immobilisations et amortissements" custom_css="./style.css" current="module_amortization"}} {{* barre de navigation *}} {{if $_GET.type_immo == null}} - {{:assign type_immo="managed"}} + {{:assign type_immo="encours"}} {{else}} {{:assign type_immo=$_GET.type_immo}} {{/if}} - {{if $type_immo == "managed"}} - {{:admin_header title="Immobilisations en cours d'amortissement" custom_css="./style.css" current="module_amortization"}} - {{elseif $type_immo == "amortized"}} - {{:admin_header title="Immobilisations amorties" custom_css="./style.css" current="module_amortization"}} - {{elseif $type_immo == "archived"}} - {{:admin_header title="Immobilisations archivées" custom_css="./style.css" current="module_amortization"}} - {{elseif $type_immo == "other"}} - {{:admin_header title="Autres immobilisations" custom_css="./style.css" current="module_amortization"}} - {{elseif $type_immo == "unfinished"}} - {{:admin_header title="Immobilisations en cours de constitution" custom_css="./style.css" current="module_amortization"}} - {{/if}} - {{:include file="_nav.html" current="index" subcurrent="%s"|args:$type_immo}} {{if $_GET.ok}} @@ -45,13 +34,11 @@ {{/select}} {{/load}} -{{if $type_immo == "other"}} +{{if $type_immo == "autre"}} {{:include file="_immobilisations_autres.html"}} -{{elseif $type_immo == "archived"}} +{{elseif $type_immo == "sortie"}} {{:include file="_archives.html"}} -{{elseif $type_immo == "unfinished"}} - {{:include file="_unfinished.html"}} -{{elseif $type_immo == "managed" || $type_immo == "amortized"}} +{{elseif $type_immo == "encours" || $type_immo == "amortie"}} {{:include file="_immobilisations.html"}} {{/if}} diff --git a/module.ini b/module.ini index e3ce95c..a583efe 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ name="Amortissements" -description="Immobilisations et amortissements\nversion 0.27" +description="Gestion des amortissements pour le logiciel de comptabilité Paheko" author="Jean-Christophe Engel" author_url="https://gitea.zaclys.com/lesanges" home_button=false diff --git a/other_amortizations.html b/other_amortizations.html index 4669742..6e32724 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -23,14 +23,6 @@ {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} {{/select}} -{{:include file="_get_config.html" keep="module.config"}} -{{: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)"}} - {{#select line.id as l_id, line.id_transaction as t_id, @@ -46,9 +38,8 @@ 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) AND !filter_condition + WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) ORDER BY trans.date, trans.label; - !filter_condition=$filter_condition assign=autre_amort }} {{#select @@ -63,16 +54,16 @@ {{/select}} {{/select}} -{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}} +{{: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="other" + subcurrent="autre" subsubcurrent="amortization" - type_immo="other" + type_immo="autre" autres_amort=$autres_amortissements }} {{/if}} @@ -99,7 +90,7 @@ #{{$line.t_id}} {{$line.t_date|date_short}} - {{"%f"|math:$line.amort_amount|money_html:false|raw}} + {{"%f"|math:$line.amort_amount|money}} {{if $line.l_label == null}} {{$line.t_label}} {{else}} diff --git a/save_amort.html b/save_amort.html index c2cfa63..1c9df59 100644 --- a/save_amort.html +++ b/save_amort.html @@ -147,8 +147,10 @@ - que le compte d'amortissement débute par un préfixe correct (280, 281, ...) - est présent dans le PC de l'exercice correspondant à la date *}} - {{:include file="_get_config.html" keep="module.config.prefixes"}} - {{#foreach from=$module.config.prefixes item="code"}} + {{:read file="./defaut.json" assign="config_json"}} + {{:assign config_defaut=$config_json|json_decode}} + {{:assign var="prefix_array" value=$config_defaut.prefixes|keys}} + {{#foreach from=$prefix_array item="code"}} {{* déterminer le numéro du compte d'amortissement associé au compte d'immobilisation *}} {{:include file="./_get_amort_code.html" @@ -181,14 +183,14 @@ {{:assign var="lines." debit=$_POST.montant - account=$debit_account|keys|value:0 + 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 + account=$credit_account|keys|key:0 id_project=$_GET.project_id label=$_POST.designation }} @@ -208,11 +210,11 @@ {{:redirect force="amortization.html?immo_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_id}} {{/form}} -{{:admin_header title="Ajout amortissement" current="module_amortization"}} +{{:admin_header title="Ajout amortissement" current="module_amortissement"}} {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="index" subcurrent="managed" subsubcurrent="amortization"}} + {{:include file="_nav.html" current="index" subcurrent="encours" subsubcurrent="amortization"}} {{/if}} {{:form_errors}} @@ -239,7 +241,7 @@
{{: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=$libelle}} + {{:input type="text" name="designation" label="Désignation" required=true default=$libelle}} {{:input type="money" name="montant" label="Montant" required=true default=$montant_amort}} {{:input type="list" @@ -252,7 +254,7 @@ {{:input type="list" name="credit_account" - label="Compte d'amortissement (28xx)" + label="Compte d'amortissement (280xx ou 281xx)" required=true target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:"28*":$selected_year default=$credit_account diff --git a/scripts.js b/scripts.js index 2b1ef51..232df76 100644 --- a/scripts.js +++ b/scripts.js @@ -80,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(/ /g, '').replace(/,/, '.').replace(/€/, '')); } // calculer le montant d'un amortissement @@ -119,6 +119,7 @@ function displayAmort(id_immo, id_duree, id_amort, id_years, id_exercices, id_mo } if (id_date != null) { const date_choisie = str2sec(document.getElementById(id_date).value); + console.log("date_choisie = " + date_choisie + ", date_debut=" + date_debut + ", date_fin = " + date_fin); if (date_debut <= date_choisie && date_choisie <= date_fin) { date_fin = date_choisie; } else { @@ -138,134 +139,3 @@ function setSelectorYear(button_names, f_years_selector) { const selected_year = document.getElementById(f_years_selector).value; setAccountYear(button_names, selected_year); } - -// config : gestion des ajouts/suppression comptes immo - -// Associer au bouton « Enlever » de chaque ligne l'action de suppression de la ligne -function initLine(row) { - var removeBtn = row.querySelector('button[name="remove_line"]'); - removeBtn.onclick = () => { - let count = removeBtn.closest("table").querySelectorAll('tbody tr').length; - var min = removeBtn.getAttribute('min'); - - if (count <= min) { - alert("Il n'est pas possible d'avoir moins de " + min + " ligne(s)."); - return false; - } - - row.parentNode.removeChild(row); - return true; - }; -} - -// Associer au bouton « Ajouter » de chaque table l'action d'ajouter une ligne -function addLine(button, codes) { - button.onclick = () => { - let lines = button.closest("table").querySelectorAll('tbody tr'); - let line = lines[lines.length - 1]; - let newNode = line.cloneNode(true); - - // Réinitialiser le sélecteur de compte - let selectButton = newNode.querySelector('.input-list button'); - let url = selectButton.value; - let new_url = url.replace(/codes=[0-9]+\*?/, "codes=" + codes); - selectButton.value = new_url; - - // gestionnaire d'événement du sélecteur - selectButton.onclick = () => { - g.current_list_input = selectButton.parentNode; - let url = selectButton.value + (selectButton.value.indexOf('?') > 0 ? '&' : '?') + '_dialog'; - g.openFrameDialog(url); - return false; - }; - - // réinitialiser le libellé associé au sélecteur - let lib = newNode.querySelector('.input-list span.label'); - lib.innerText = ''; - - // ajouter la nouvelle ligne - line.parentNode.appendChild(newNode); - initLine(newNode); - }; -} - -// afficher le montant -function addAmountLine(amount, label, parent) { - const node = document.createElement("tr"); - const col_compte = document.createElement("td"); - col_compte.classList.add("label"); - const col_montant = document.createElement("td"); - col_montant.classList.add("money"); - const montant = document.createTextNode(new Intl.NumberFormat("fr-FR", { style: "currency", currency: "EUR" }).format(amount / 100., )); - col_compte.appendChild(document.createTextNode(label)); - col_montant.appendChild(montant); - node.appendChild(col_compte); - node.appendChild(col_montant); - parent.appendChild(node); -} - -// calculer et afficher le total des lignes sélectionnées -function computeTotal(id_total, id_url) { - - // calculer le total par compte et le total général - let total = new Object; - let total_general = 0; - const transactions = []; - let lines = document.querySelectorAll('.list tbody tr'); - for (const line of lines) { - let button = line.querySelector('input[type=checkbox]'); - if (button.checked) { - let money = line.querySelector('.money'); - let code = line.querySelector('.account_code a').innerText; - if (code in total) { - total[code] += getNumber(money.innerText) * 100; - } else { - total[code] = getNumber(money.innerText) * 100; - } - total_general += getNumber(money.innerText) * 100; - const number = line.querySelector('.num a').innerText.slice(1); - transactions.push(number); - } - } - // afficher les totaux - const body = document.getElementById(id_total).querySelector('table tbody'); - const new_body = document.createElement('tbody'); - - for (const code in total) { - addAmountLine(total[code], "Compte " + code + " : ", new_body); - } - body.parentNode.replaceChild(new_body, body); - - // et le total général - const foot = document.getElementById(id_total).querySelector('table tfoot'); - if (Object.keys(total).length > 1) { - const new_foot = document.createElement('tfoot'); - addAmountLine(total_general, "Total : ", new_foot); - foot.parentNode.replaceChild(new_foot, foot); - } else { - // pas besoin de total général si moins de 2 comptes - for (const e of foot.children) { - foot.removeChild(e); - } - } - - // mettre à jour les paramètres de l'url - let url = document.getElementById(id_url); - let new_href = url.href.replace(/trans=.*/, 'trans=' + Object.values(transactions)); - url.href = new_href; -} - -// dupliquer la dernière ligne d'une table -function copyLine(button) { - button.onclick = () => { - let lines = button.closest("table").querySelectorAll('tbody tr'); - let line = lines[lines.length - 1]; - let newNode = line.cloneNode(true); - let libelle = newNode.querySelector('input'); - libelle.value = ''; - - // ajouter la nouvelle ligne - line.parentNode.appendChild(newNode); - initLine(newNode); - }; -} diff --git a/style.css b/style.css index d6ab989..fd1cbfb 100644 --- a/style.css +++ b/style.css @@ -31,16 +31,10 @@ h2[class="aide"], h3[class="aide"] { } .informations dt::after { - content: ' : '; + content: ' :'; } .informations dl.describe > dt { - flex: 0 0 15rem; - margin-right: 0; -} - -.informations dl.describe > dd { - flex: 0 0 calc(100% - 20rem); margin-right: 0; } @@ -48,17 +42,6 @@ nav.amort aside { margin-top : 0; } -fieldset.shortFormLeft div.informations { - border: 1px solid var(--gLightBorderColor); - background: rgba(var(--gSecondColor), 0.2); - border-radius: .5em; -} - -.strong { - font-weight: bold; -} - -table.montant td.label { - text-align : right; - padding-right : 1em; +.describe dt::after { + content: ' :'; } diff --git a/transfer.html b/transfer.html deleted file mode 100644 index c356497..0000000 --- a/transfer.html +++ /dev/null @@ -1,340 +0,0 @@ -{{* -*- 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.}} - {{:assign ts_debut=$start_date|strtotime}} - {{:assign ts_fin=$end_date|strtotime}} - {{:assign debut=$start_date|date_short}} - {{:assign fin=$end_date|date_short}} - {{:assign var="years_data.%d"|args:$id value=$ts_debut|cat:" "|cat:$ts_fin}} - {{:assign var="open_years.%d"|args:$id value=$label|cat:" ("|cat:$debut|cat:" - "|cat:$fin|cat:")"}} - {{if $ts_debut <= $now && $now <= $ts_fin}} - {{:assign selected_year=$id}} - {{/if}} -{{else}} - {{:error message="Aucun exercice ouvert"}} -{{/years}} - -{{* déterminer les comptes d'immo en cours *}} -{{:include file="_get_config.html" keep="module.config.unfinished"}} -{{:assign condition="("}} -{{#foreach from=$module.config.unfinished item="elem"}} - {{if $elem.code != null}} - {{:assign code=$elem.code}} - {{else}} - {{:assign code=$elem}} - {{/if}} - {{:assign code=$elem.code|cat:"%"|quote_sql}} - {{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} -{{/foreach}} -{{:assign condition=$condition|cat:"0)"}} - -{{* détails des écritures paramètres *}} -{{:assign trans=$_GET.trans|explode:","}} -{{:assign var="trans_list" value=$trans|map:quote_sql}} -{{:assign trans_list=$trans_list|implode:","}} -{{:assign trans_list="("|cat:$trans_list|cat:")"}} -{{:assign condition=$condition|cat:" AND trans.id IN "|cat:$trans_list}} -{{:assign condition=$condition|cat:" AND NOT (trans.status & 16)"}} - -{{#select - trans.id as trans_id, - trans.label AS trans_label, - trans.date AS trans_date, - SUM(line.debit) AS line_debit, - account.code AS account_code, - account.label AS account_label, - line.id_project as project_id - 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 - WHERE !condition - GROUP BY trans.id - ; - !condition=$condition -}} - {{:assign var="transactions.%s"|args:$trans_id - amount=$line_debit - date=$trans_date - code=$account_code - label=$account_label - project=$project_id - }} - {{if $max_date == null || $trans_date > $max_date}} - {{:assign max_date=$trans_date}} - {{/if}} -{{/select}} - -{{* Traiter l'envoi du formulaire *}} -{{#form on="transfer"}} - {{* vérifier que la date de mise en service est postérieure aux dates d'acquisition *}} - {{if $_POST.date_mes|parse_date < $max_date}} - {{:assign dacq=$max_date|date_short}} - {{:error message="La date de mise en service (%s) doit être postérieure à la date d'acquisition d'immobilisation la plus récente (%s) !"|args:$_POST.date_mes:$dacq}} - {{/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|strtotime}} - {{:assign ok=false}} - {{#foreach from=$years}} - {{if $id == $_POST.id_year}} - {{:assign selected_chart=$id_chart}} - {{if $start_date|strtotime <= $ts_date && $ts_date <= $end_date|strtotime}} - {{:assign ok=true}} - {{:break}} - {{/if}} - {{/if}} - {{/foreach}} - {{if ! $ok}} - {{:error message="La date saisie n'est pas dans l'exercice choisi !"}} - {{/if}} - - {{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}} - - {{* comptes de débit *}} - {{#foreach from=$_POST.credit_accounts key="rang" item="elem"}} - {{:include - file="_get_codes.html" - account=$elem - keep="account_code" - }} - {{:assign debit_account=$account_code|keys|value:0}} - {{:assign var="amount" from="_POST.credit_lines.%s"|args:$rang}} - {{:assign var="label" from="_POST.line_labels.%s"|args:$rang}} - {{:assign - var="lines." - account=$debit_account - credit=$amount - label=$label - }} - {{/foreach}} - - {{* compte de crédit *}} - {{:include - file="_get_codes.html" - account=$_POST.debit_account - keep="account_code" - }} - {{:assign credit_account=$account_code|keys|value:0}} - {{:assign var="amount" from="_POST.debit_lines.%s"|args:0}} - {{:assign count=$_POST.line_labels|count}} - {{:assign count="%d-1"|math:$count}} - {{:assign var="label" from="_POST.line_labels.%s"|args:$count}} - {{:assign - var="lines." - account=$credit_account - debit=$amount - label=$label - }} - - {{* vérifier : - - que le compte d'immo débute par un préfixe correct (20, 21, ...) - - est présent dans le PC de l'exercice correspondant à la date - *}} - - {{:include - file="_check_account.html" - account=$account_code - chart_id=$selected_chart - prefix_array=$module.config.prefixes - keep="account_ok" - }} - - {{if $account_ok == null}} - {{:assign compte=$credit_account|implode:""}} - {{:error message="Le compte « %s » n'est pas un compte d'immobilisation ou n'est pas dans le plan comptable de l'exercice choisi"|args:$compte}} - {{/if}} - - {{* écritures liées *}} - {{:assign var="linked_transactions" value=$_GET.trans|explode:","}} - - {{* enregistrer l'écriture *}} - {{:api - method="POST" - path="accounting/transaction" - assign="result" - id_year=$_POST.id_year - type="advanced" - date=$_POST.date_mes - label=$_POST.designation|trim - lines=$lines - linked_transactions=$linked_transactions - }} - - {{:assign lines_count=$lines|count}} - {{:assign lines_count="%d-1"|math:$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="schema.json" - type="immo" - line=$immo_id - duration=$duration - date=$date_debut - status=$status - }} - {{if $_POST.amortir}} - {{:assign type_immo="managed"}} - {{else}} - {{:assign type_immo="other"}} - {{/if}} - {{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}} -{{/form}} - -{{* barre de navigation *}} -{{if ! $dialog}} - {{:include file="_nav.html" current="index" subcurrent="unfinished" subsubcurrent="transfer"}} -{{/if}} - -{{:form_errors}} - -{{* formulaire d'ajout d'immobilisation *}} -{{if $_GET.trans == null}} - {{:error message="Vous n'avez sélectionné aucune écriture !"}} -{{/if}} - -{{if $max_date|strtotime > $now}} - {{:assign default_date=$max_date}} -{{else}} - {{:assign default_date=$now|date_short}} -{{/if}} - -{{#select id,label FROM acc_projects WHERE archived = 0;}} - {{:assign var="projects.%d"|args:$id value=$label}} -{{/select}} - -{{#foreach from=$module.config.prefixes item="code"}} - {{:assign var="pattern_array." value="%s*"|args:$code}} -{{/foreach}} -{{:assign var="patterns" value=$pattern_array|implode:"|"}} - - - -
-
- Données de l'immobilisation -
- {{:input type="select" name="id_year" label="Exercice" default=$selected_year required=true - default_empty="— Faire un choix —" options=$open_years}} - {{:input type="date" name="date_mes" label="Date de mise en service" required=true default=$default_date}} - {{:input type="text" name="designation" label="Libellé" required=true}} -
-
- -
- Comptes -
- - - - - - - - - - - - {{:assign total=0}} - {{#foreach from=$transactions key="id"}} - {{:assign total="%f+%f"|math:$total:$amount}} - {{:assign current_account=null}} - {{:assign var="current_account.%s"|args:$code value="%s — %s"|args:$code:$label}} - - - - - - - - {{/foreach}} - - - - - - - - - - -
CompteDébitCréditLibellé ligneProjet
- {{:input - type="list" - name="credit_accounts[]" - required=true - target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code:$selected_year - default=$current_account - }} - {{:input name="credit_lines[]" type="text" class="money" size="8" default=$amount|money}}{{:input name="debit_lines[]" type="text" class="money" size="8" disabled=true}}{{:input type="text" name="line_labels[]" size="40"}} - {{if $projects != null}} - {{:input type="select" name="id_project" options=$projects default_empty="— Aucun —"}} - {{/if}} -
- {{:input - type="list" - name="debit_account" - label="Compte d'immobilisation amortissable" - required=true - target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$patterns:$selected_year - }} - {{:input name="credit_lines[]" type="text" class="money" size="8" disabled=true}}{{:input name="debit_lines[]" type="text" class="money" size="8" default=$total|money}}{{:input type="text" name="line_labels[]" size="40"}} - {{if $projects != null}} - {{:input type="select" name="id_project" options=$projects default_empty="— Aucun —"}} - {{/if}} -
- - -
-
- -
- Amortissement -
- {{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur une ou plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"}} -
- {{:input type="number" name="duree" label="Durée d'amortissement" required=true min=0 default=1 suffix="année(s)"}} -
-
-
- -

- {{:button type="submit" name="transfer" label="Transférer" shape="right" class="main"}} -

- -
-{{:admin_footer}} - - - diff --git a/write_exit.html b/write_exit.html index 616ff6b..591e803 100644 --- a/write_exit.html +++ b/write_exit.html @@ -33,6 +33,21 @@ {{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} {{/load}} +{{* date de début de l'exercice *}} +{{#select start_date FROM acc_years WHERE id = :year_id; :year_id = $_GET.year}} +{{* + {{if $start_date < "2025-01-01" +*}} + {{:assign vnc_code="675"}} + {{:assign cession_code="775"}} +{{* + {{else}} + {{:assign vnc_code="657"}} + {{:assign cession_code="757"}} + {{/if}} +*}} +{{/select}} + {{: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 *}} @@ -73,7 +88,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 *}} @@ -84,7 +99,7 @@ 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.label}} {{:assign @@ -110,7 +125,7 @@ account=$_POST.except_account keep="account_code" }} - {{:assign except_account_code=$account_code|keys|value:0}} + {{:assign except_account_code=$account_code|keys|key:0}} {{:assign libelle="Amortissement exceptionnel "|cat:$ligne_immo.label}} {{:assign var="lines." @@ -150,7 +165,7 @@ account=$_POST.immo_account keep="account_code" }} - {{:assign immo_account_code=$account_code|keys|value:0}} + {{:assign immo_account_code=$account_code|keys|key:0}} {{:assign libelle="Sortie du bilan de "|cat:$ligne_immo.label}} {{:assign var="lines." @@ -172,7 +187,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 @@ -203,13 +218,13 @@ 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" @@ -245,34 +260,25 @@ }} {{/if}} - {{:redirect to="index.html?type_immo=archived"}} + {{:redirect to="index.html?type_immo=sortie"}} {{/form}} -{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortization"}} +{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}} {{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index" subcurrent="balance_exit"}} {{/if}} +{{:form_errors}} -{{* - Préparer les infos pour le formulaire - déterminer les comptes pour les différentes écritures -*}} +{{* Préparer les infos pour le formulaire *}} +{{* déterminer les comptes pour les différentes écritures *}} {{:include file="./_get_amort_code.html" 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"}} @@ -283,36 +289,31 @@ {{:assign condition=$liste_codes|keys|implode:","}} {{:assign condition="acc.code IN ("|cat:$condition|cat:")"}} -{{#select - chart.id - FROM acc_charts AS chart - INNER JOIN acc_years AS year ON chart.id = year.id_chart - WHERE year.id = :year_id; - :year_id = $_GET.year - }} - {{:assign chart_id=$id}} -{{/select}} - {{#select acc.id, acc.code as acc_code, - acc.label as acc_label + acc.label as acc_label, + year.label as year_label FROM acc_accounts as acc INNER JOIN acc_charts as chart ON chart.id = acc.id_chart - WHERE chart.id = :chart_id AND !condition; - :chart_id = $chart_id + INNER JOIN acc_years as year ON chart.id = year.id_chart + WHERE year.id = 1 AND !condition; !condition=$condition }} {{:assign var="liste_codes.%s.id"|args:$acc_code value=$id}} {{:assign var="liste_codes.%s.acc_label"|args:$acc_code value=$acc_label}} + {{:assign var="liste_codes.%s.year_label"|args:$acc_code value=$year_label}} {{/select}} {{#foreach from=$liste_codes key=code}} {{:assign var="%s.%s"|args:$name:$code value="%s — %s"|args:$code:$acc_label}} {{/foreach}} -{{:include file="_get_config.html" keep="module.config.prefixes"}} -{{#foreach from=$module.config.prefixes item="code"}} +{{:read file="./defaut.json" assign="config_json"}} +{{:assign config_defaut=$config_json|json_decode}} +{{:assign var="prefix_array" value=$config_defaut.prefixes|keys}} + +{{#foreach from=$prefix_array item="code"}} {{:assign var="pattern_array." value="%s*"|args:$code}} {{/foreach}} {{:assign patterns=$pattern_array|implode:"|"}} @@ -324,7 +325,7 @@ Données de l'imobilisation
Montant
-
{{$ligne_immo.montant|money_currency_html:false|raw}}
+
{{$ligne_immo.montant|money_currency:false}}
Date d'acquisition
{{$ligne_immo.date_achat|date_short}}
{{if $_GET.date_mes != $ligne_immo.date_achat|strtotime}} @@ -336,28 +337,28 @@
{{$_GET.duree_amort}} ans
{{/if}}
Montant des amortissements
-
{{$_GET.amort_amount|money_currency_html:false|raw}} (à la date de début de l'exercice)
+
{{$_GET.amort_amount|money_currency:false}} (à la date de début de l'exercice)
Valeur nette résiduelle
-
{{$valeur_nette|money_currency_html:false|raw}} (à la date de début de l'exercice)
+
{{$valeur_nette|money_currency:false}} (à la date de début de l'exercice)
Date de sortie
{{$_GET.exit_date|date:"d/m/Y"}}
{{if $amort_comp > 0}} {{:assign valeur_nette="%f-%f"|math:$valeur_nette:$amort_comp}}
Amortissement complémentaire
-
{{$amort_comp|money_currency_html:false|raw}} (jusqu'à la date de sortie)
+
{{$amort_comp|money_currency:false}} (jusqu'à la date de sortie)
Total des amortissements
-
{{"%f+%f"|math:$_GET.amort_amount:$amort_comp|money_currency_html:false|raw}} (à la date de sortie)
+
{{"%f+%f"|math:$_GET.amort_amount:$amort_comp|money_currency:false}} (à la date de sortie)
Valeur nette résiduelle
-
{{$valeur_nette|money_currency_html:false|raw}} (à la date de sortie)
+
{{$valeur_nette|money_currency:false}} (à la date de sortie)
{{/if}} {{if $montant_cession == 0}} {{if $amort_except > 0}}
Amortissement exceptionnel
-
{{$amort_except|money_currency_html:false|raw}}
+
{{$amort_except|money_currency:false}}
{{/if}} {{else}}
Montant de la cession
-
{{$montant_cession|money_currency_html:false|raw}}
+
{{$montant_cession|money_currency:false}}
{{/if}}
@@ -385,11 +386,11 @@ {{:input type="list" name="comp_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"68*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"68*":$_GET.year default=$comp_account }} - {{$amort_comp|money_currency_html:false|raw}} + {{$amort_comp|money_currency:false}} @@ -397,12 +398,12 @@ {{:input type="list" name="amort_comp_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year default=$amort_account }} - {{$amort_comp|money_currency_html:false|raw}} + {{$amort_comp|money_currency:false}} @@ -429,11 +430,11 @@ {{:input type="list" name="except_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"687*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"687*":$_GET.year default=$except_account }} - {{$amort_except|money_currency_html:false|raw}} + {{$amort_except|money_currency:false}} @@ -441,12 +442,12 @@ {{:input type="list" name="amort_except_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year default=$amort_account }} - {{$amort_except|money_currency_html:false|raw}} + {{$amort_except|money_currency:false}} @@ -467,7 +468,7 @@ {{:input type="list" name="amort_sortie_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year default=$amort_account }} @@ -476,7 +477,7 @@ {{else}} {{:assign montant="%f+%f"|math:$_GET.amort_amount:$amort_comp}} {{/if}} - {{$montant|money_currency_html:false|raw}} + {{$montant|money_currency:false}} {{if $montant_cession > 0 && $valeur_nette > 0}} @@ -485,25 +486,25 @@ {{:input type="list" name="vnc_account" - target="!acc/charts/accounts/selector.php?codes=%s*&id_chart=%s"|args:$vnc_code:$chart_id + target="!acc/charts/accounts/selector.php?codes=%s*&year=%d"|args:$vnc_code:$_GET.year default=$vnc_account }} - {{$valeur_nette|money_currency_html:false|raw}} + {{$valeur_nette|money_currency:false}} {{/if}} - + {{* style="pointer-events: none; opacity: 0.6;">*}} {{:input type="list" name="immo_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:$patterns:$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:$patterns:$_GET.year default=$immo_account }} - {{$ligne_immo.montant|money_currency_html:false|raw}} + {{$ligne_immo.montant|money_currency:false}} @@ -524,11 +525,11 @@ {{:input type="list" name="creance_account" - target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"462*":$chart_id + target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"462*":$_GET.year default=$creance_account }} - {{$montant_cession|money_currency_html:false|raw}} + {{$montant_cession|money_currency:false}} @@ -536,12 +537,12 @@ {{:input type="list" name="cession_account" - target="!acc/charts/accounts/selector.php?codes=%s*&id_chart=%s"|args:$cession_code:$chart_id + target="!acc/charts/accounts/selector.php?codes=%s*&year=%d"|args:$cession_code:$_GET.year default=$cession_account }} - {{$montant_cession|money_currency_html:false|raw}} + {{$montant_cession|money_currency:false}} @@ -552,5 +553,4 @@ {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}

-{{:form_errors}} {{:admin_footer}}