diff --git a/_nav.html b/_nav.html index b04310b..57a6f51 100644 --- a/_nav.html +++ b/_nav.html @@ -24,13 +24,15 @@
  • Configuration
    • - {{if $subsubcurrent == "amortization"}} + {{if $subsubcurrent != null}} - {{elseif $subsubcurrent == "balance_exit"}} - {{/if}} diff --git a/_unfinished.html b/_unfinished.html index 500413c..c8a2e5a 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -59,6 +59,11 @@ {{: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}} diff --git a/add_account.html b/add_account.html index c5b471a..76aded1 100644 --- a/add_account.html +++ b/add_account.html @@ -1,5 +1,5 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Ajout immobilisation" current="module_amortissement"}} +{{:admin_header title="Ajout immobilisation" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} diff --git a/add_asset.html b/add_asset.html index 805311f..9648331 100644 --- a/add_asset.html +++ b/add_asset.html @@ -56,7 +56,12 @@ {{#foreach from=$module.config.prefixes item="code"}} {{:assign var="prefix_array." value=$code}} {{/foreach}} - {{#foreach from=$module.config.unfinished item="code"}} + {{#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}} @@ -77,7 +82,12 @@ {{: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="code"}} + {{#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}} @@ -147,7 +157,7 @@ {{/form}} -{{:admin_header title="Ajout immobilisation" current="module_amortissement"}} +{{:admin_header title="Ajout immobilisation" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index"}} @@ -164,8 +174,13 @@ {{#foreach from=$module.config.prefixes item="code"}} {{:assign var="pattern_array." value="%s*"|args:$code}} {{/foreach}} -{{#foreach from=$module.config.unfinished item="code"}} - {{:assign var="pattern_array." value="%s*"|args:$code}} +{{#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:"|"}} diff --git a/add_infos.html b/add_infos.html index 8001254..569aff8 100644 --- a/add_infos.html +++ b/add_infos.html @@ -76,7 +76,7 @@ {{:form_errors}} {{/form}} -{{:admin_header title="Informations amortissement" custom_css=$custom_css current="module_amortissement"}} +{{:admin_header title="Informations amortissement" custom_css=$custom_css current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} diff --git a/aide.html b/aide.html index 94d77e6..e6855d7 100644 --- a/aide.html +++ b/aide.html @@ -1,6 +1,6 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Aide" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Aide" custom_css="./style.css" current="module_amortization"}} {{* barre de navigation *}} {{:include file="_nav.html" current="aide"}} diff --git a/amortization.html b/amortization.html index df3fb57..25e7ba9 100644 --- a/amortization.html +++ b/amortization.html @@ -120,7 +120,7 @@ {{/select}} -{{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}} {{* barre de navigation *}} {{if $_GET.type_immo == "amortized" || $valeur_residuelle== 0 }} diff --git a/balance_sheet_exit.html b/balance_sheet_exit.html index d75fe21..226179d 100644 --- a/balance_sheet_exit.html +++ b/balance_sheet_exit.html @@ -170,7 +170,7 @@ {{:redirect to="compute_exit_data.html?immo_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s"|args:$_GET.immo_id:$amort_amount:$selected_year:$ts_mes:$ts_debut:$ts_exit:$duree_amort}} {{/form}} -{{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index" subcurrent="%s"|args:$_GET.type_immo subsubcurrent="balance_exit"}} diff --git a/compute_exit_data.html b/compute_exit_data.html index e991034..48d6597 100644 --- a/compute_exit_data.html +++ b/compute_exit_data.html @@ -46,7 +46,7 @@ {{:redirect to="write_exit.html?immo_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s&cession=%s"|args:$_GET.immo_id:$_GET.amort_amount:$_GET.year:$_GET.date_mes:$_GET.date_debut:$_GET.exit_date:$_GET.duree_amort:$_POST.montant_cession}} {{/form}} -{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} diff --git a/config.html b/config.html index 8cb3a61..b8affb5 100644 --- a/config.html +++ b/config.html @@ -45,7 +45,7 @@ {{:form_errors}} {{/form}} -{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortization"}} {{:include file="_nav.html" current="config"}} {{if $_GET.ok == 1}}

    Configuration enregistrée.

    @@ -99,6 +99,11 @@ {{* 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}} diff --git a/filters.html b/filters.html index 36228af..7590c9e 100644 --- a/filters.html +++ b/filters.html @@ -1,6 +1,6 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortization"}} {{:include file="_nav.html" current="config" subcurrent="filters"}} {{if $_GET.ok == 1}} diff --git a/ignore.html b/ignore.html index dc55e63..7cd4cb1 100644 --- a/ignore.html +++ b/ignore.html @@ -49,7 +49,7 @@ {{:form_errors}} {{/form}} -{{:admin_header title="Ignorer l'écriture" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Ignorer l'écriture" custom_css="./style.css" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} diff --git a/index.html b/index.html index bf12f85..ed61086 100644 --- a/index.html +++ b/index.html @@ -16,7 +16,7 @@ {{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"}} + {{: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}} diff --git a/other_amortizations.html b/other_amortizations.html index 6ce187e..4669742 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -63,7 +63,7 @@ {{/select}} {{/select}} -{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} diff --git a/save_amort.html b/save_amort.html index a26412a..c2cfa63 100644 --- a/save_amort.html +++ b/save_amort.html @@ -208,7 +208,7 @@ {{:redirect force="amortization.html?immo_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_id}} {{/form}} -{{:admin_header title="Ajout amortissement" current="module_amortissement"}} +{{:admin_header title="Ajout amortissement" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} diff --git a/transfer.html b/transfer.html index 71f123e..c356497 100644 --- a/transfer.html +++ b/transfer.html @@ -1,6 +1,6 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Transfert d'immobilisation en cours" current="module_amortissement"}} +{{: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.}} @@ -21,6 +21,11 @@ {{: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}} @@ -191,7 +196,7 @@ {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="index"}} + {{:include file="_nav.html" current="index" subcurrent="unfinished" subsubcurrent="transfer"}} {{/if}} {{:form_errors}} diff --git a/write_exit.html b/write_exit.html index 290ad26..616ff6b 100644 --- a/write_exit.html +++ b/write_exit.html @@ -248,7 +248,7 @@ {{:redirect to="index.html?type_immo=archived"}} {{/form}} -{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortissement"}} +{{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}}