From bcf89ba8746fcc3c040162dcbbe5487a83dfb48b Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 16 Jul 2025 09:50:25 +0200 Subject: [PATCH] Ajout gestion configuration comptes d'immobilisation --- _archives.html | 3 +- _get_config.html | 23 ++++ _immobilisations.html | 3 +- _immobilisations_autres.html | 3 +- _nav.html | 15 +-- add_asset.html | 5 +- config.html | 247 +++++++++++++++++++++++++++++++++++ defaut.json | 10 +- save_amort.html | 5 +- scripts.js | 18 +++ write_exit.html | 5 +- 11 files changed, 309 insertions(+), 28 deletions(-) create mode 100644 _get_config.html create mode 100644 config.html diff --git a/_archives.html b/_archives.html index e774b6d..0bf6672 100644 --- a/_archives.html +++ b/_archives.html @@ -37,10 +37,9 @@ {{* 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"}} +{{#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}} diff --git a/_get_config.html b/_get_config.html new file mode 100644 index 0000000..25cd4e7 --- /dev/null +++ b/_get_config.html @@ -0,0 +1,23 @@ +{{* -*- 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.tva != null}} + {{:assign var="config.tva" value=$module.config.tva}} +{{else}} + {{:assign var="config.tva" value=$config_defaut.tva}} +{{/if}} +*}} + +{{if $module.config.prefixes != null}} + {{:assign var="config.prefixes" value=$module.config.prefixes}} +{{else}} + {{:assign var="config.prefixes" value=$config_defaut.prefixes}} +{{/if}} diff --git a/_immobilisations.html b/_immobilisations.html index e9d6eab..6144a45 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -28,9 +28,8 @@ {{* lister les immobilisations *}} {{:read file="./defaut.json" assign="config_json"}} {{:assign config_defaut=$config_json|json_decode}} - {{:assign var="prefix_array" value=$config_defaut.prefixes|keys}} {{:assign condition="("}} - {{#foreach from=$prefix_array item="code"}} + {{#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}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index f283686..f5cf801 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -29,9 +29,8 @@ {{* lister les immobilisations *}} {{:read file="./defaut.json" assign="config_json"}} {{:assign config_defaut=$config_json|json_decode}} - {{:assign var="prefix_array" value=$config_defaut.prefixes|keys}} {{:assign condition="("}} - {{#foreach from=$prefix_array item="code"}} + {{#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}} diff --git a/_nav.html b/_nav.html index fc5c3c3..323d316 100644 --- a/_nav.html +++ b/_nav.html @@ -15,14 +15,13 @@ {{/if}} - {{if $current == "index"}} {{* && $subsubcurrent != "balance_exit" *}} - - {{/if}} + {{if $subsubcurrent == "amortization"}}