diff --git a/_archives.html b/_archives.html index a1bc45b..39d87d5 100644 --- a/_archives.html +++ b/_archives.html @@ -1,19 +1,15 @@ {{* -*- 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="config.prefixes"}} +{{:read file="./defaut.json" assign="config_json"}} +{{:assign config_defaut=$config_json|json_decode}} {{:assign condition="("}} -{{#foreach from=$config.prefixes item="code"}} - {{if $code|substr:0:2 != "23"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign condition=$condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}} - {{/if}} +{{#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)"}} @@ -47,6 +43,7 @@ {{/select}}
+ {{:assign nb_immo=0}} @@ -62,7 +59,6 @@ - {{:assign nb_immo=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}} diff --git a/_get_config.html b/_get_config.html index f18dfab..25cd4e7 100644 --- a/_get_config.html +++ b/_get_config.html @@ -4,6 +4,10 @@ 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.tva != null}} {{:assign var="config.tva" value=$module.config.tva}} @@ -15,8 +19,5 @@ {{if $module.config.prefixes != null}} {{:assign var="config.prefixes" value=$module.config.prefixes}} {{else}} - {{* config par défaut *}} - {{:read file="./defaut.json" assign="config_defaut"}} - {{:assign config_defaut=$config_defaut|json_decode}} {{:assign var="config.prefixes" value=$config_defaut.prefixes}} {{/if}} diff --git a/_immobilisations.html b/_immobilisations.html index 8591f23..28041ac 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -3,14 +3,7 @@ {{* 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}} -

+ {{:assign nb_immo=0}}
@@ -28,18 +21,15 @@ {{* lister les immobilisations *}} - {{:include file="_get_config.html" keep="config.prefixes"}} - + {{:read file="./defaut.json" assign="config_json"}} + {{:assign config_defaut=$config_json|json_decode}} {{:assign condition="("}} - {{#foreach from=$config.prefixes item="code"}} - {{if $code|substr:0:2 != "23"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} - {{/if}} + {{#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 debit > 0 AND NOT (trans.status & 16)"}} - {{:assign nb_immo=0}} {{#select trans.id as trans_id, diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 3dbf7b1..c404863 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -3,6 +3,7 @@ {{* Liste des immobilisations non amortissables ou non (encore) gérées *}}
+ {{:assign nb_immo=0}}

Cette page liste les écritures pas (encore) prises en charges par le module ou classées non amortissables @@ -29,17 +30,15 @@

{{* lister les immobilisations *}} - {{:include file="_get_config.html" keep="config.prefixes"}} + {{:read file="./defaut.json" assign="config_json"}} + {{:assign config_defaut=$config_json|json_decode}} {{:assign condition="("}} - {{#foreach from=$config.prefixes item="code"}} - {{if $code|substr:0:2 != "23"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} - {{/if}} + {{#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 debit > 0 AND NOT (trans.status & 16)"}} - {{:assign nb_immo=0}} {{#select trans.id as trans_id, diff --git a/_nav.html b/_nav.html index 1cc3608..517cc4d 100644 --- a/_nav.html +++ b/_nav.html @@ -16,10 +16,9 @@ {{/if}} diff --git a/_unfinished.html b/_unfinished.html deleted file mode 100644 index c281c26..0000000 --- a/_unfinished.html +++ /dev/null @@ -1,101 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* Liste des immobilisations en cours de constitution *}} - -
- -

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

- -
- - - - - - - - - - - - - - {{* lister les immobilisations en cours de constitution *}} - {{:include file="_get_config.html" keep="config.prefixes"}} - {{:assign condition="("}} - {{#foreach from=$config.prefixes item="code"}} - {{if $code|substr:0:2 == "23"}} - {{:assign code=$code|cat:"%"|quote_sql}} - {{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} - {{/if}} - {{/foreach}} - {{:assign condition=$condition|cat:"0)"}} - {{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}} - {{:assign nb_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 s'il existe une écriture qui solde l'immobilisation *}} - {{:assign ignore=false}} - {{#select - line.id AS line, - line.id_transaction AS trans, - line.debit, - line.label, - line2.id AS line2, - line2.id_transaction AS trans2, - line2.credit, - line2.label - FROM acc_transactions_lines AS line - INNER JOIN acc_accounts AS acc ON acc.id = line.id_account - INNER JOIN acc_transactions_lines AS line2 ON line2.id_account = acc.id - WHERE - line.id = :line_id - AND line2.credit = line.debit; - :line_id = $immo_id|intval - }} - {{:assign ignore=true}} - {{/select}} - {{if $ignore}} - {{: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}} - - - - - - - - - - - {{/select}} - -
N°DateLibelléMontantN° compteCompte
#{{$trans_id}}{{$trans_date|date_short}}{{$trans_label}}{{"%f"|math:$debit|money:false}}{{$account_code}}{{$account_label}}
- {{if $nb_immo == 0}} -

Aucune immobilisation

- {{/if}} -
diff --git a/add_asset.html b/add_asset.html index a606f15..99da03d 100644 --- a/add_asset.html +++ b/add_asset.html @@ -1,6 +1,7 @@ {{* -*- brindille -*- *}} -{{:include file="_get_config.html" keep="config.prefixes"}} +{{:read file="./defaut.json" assign="config_json"}} +{{:assign config_defaut=$config_json|json_decode}} {{#years closed=false order="start_date" assign=years.}} {{:assign ts_debut=$start_date|strtotime}} @@ -74,7 +75,7 @@ file="_check_account.html" account=$debit_account chart_id=$selected_chart - prefix_array=$config.prefixes + prefix_array=$config_defaut.prefixes keep="account_ok" }} @@ -138,7 +139,7 @@ {{:assign var="projects.%d"|args:$id value=$label}} {{/select}} -{{#foreach from=$config.prefixes item="code"}} +{{#foreach from=$config_defaut.prefixes item="code"}} {{:assign var="pattern_array." value="%s*"|args:$code}} {{/foreach}} {{:assign var="patterns" value=$pattern_array|implode:"|"}} diff --git a/amortization.html b/amortization.html index 0ead87c..1a84a12 100644 --- a/amortization.html +++ b/amortization.html @@ -248,7 +248,7 @@ {{if $autres_amortissements != null}}

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

{{/if}} {{/if}} diff --git a/config.html b/config.html index 9038441..8170ac1 100644 --- a/config.html +++ b/config.html @@ -41,7 +41,7 @@ {{/form}} {{* récupérer l'exercice courant ou sinon le plus récent *}} -{{:assign var="selected_year" from="logged_user.preferences.accounting_year"}} +{{:assign var="selected_year" from="logged_user.preferences.accounting_year}} {{if $selected_year == null}} {{* sélectionner l'exercice le plus probable *}} {{#years}} diff --git a/index.html b/index.html index bf12f85..27fd870 100644 --- a/index.html +++ b/index.html @@ -8,15 +8,13 @@ {{/if}} {{if $type_immo == "managed"}} - {{:admin_header title="Immobilisations en cours d'amortissement" custom_css="./style.css" current="module_amortization"}} + {{:admin_header title="Immobilisations en cours" 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" custom_css="./style.css" current="module_amortization"}} {{/if}} {{:include file="_nav.html" current="index" subcurrent="%s"|args:$type_immo}} @@ -49,8 +47,6 @@ {{:include file="_immobilisations_autres.html"}} {{elseif $type_immo == "archived"}} {{:include file="_archives.html"}} -{{elseif $type_immo == "unfinished"}} - {{:include file="_unfinished.html"}} {{elseif $type_immo == "managed" || $type_immo == "amortized"}} {{:include file="_immobilisations.html"}} {{/if}} diff --git a/save_amort.html b/save_amort.html index 875db12..7ad6b50 100644 --- a/save_amort.html +++ b/save_amort.html @@ -147,8 +147,9 @@ - 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="config.prefixes"}} - {{#foreach from=$config.prefixes item="code"}} + {{:read file="./defaut.json" assign="config_json"}} + {{:assign config_defaut=$config_json|json_decode}} + {{#foreach from=$config_defaut.prefixes item="code"}} {{* déterminer le numéro du compte d'amortissement associé au compte d'immobilisation *}} {{:include file="./_get_amort_code.html" diff --git a/write_exit.html b/write_exit.html index a0a1f57..9d0b553 100644 --- a/write_exit.html +++ b/write_exit.html @@ -309,8 +309,10 @@ {{:assign var="%s.%s"|args:$name:$code value="%s — %s"|args:$code:$acc_label}} {{/foreach}} -{{:include file="_get_config.html" keep="config.prefixes"}} -{{#foreach from=$config.prefixes item="code"}} +{{:read file="./defaut.json" assign="config_json"}} +{{:assign config_defaut=$config_json|json_decode}} + +{{#foreach from=$config_defaut.prefixes item="code"}} {{:assign var="pattern_array." value="%s*"|args:$code}} {{/foreach}} {{:assign patterns=$pattern_array|implode:"|"}}