diff --git a/_check_date.html b/_check_date.html index 1afaf8d..2645b7d 100644 --- a/_check_date.html +++ b/_check_date.html @@ -7,8 +7,9 @@ résultat : open_years, selected_year, selected_chart *}} +{{*:debug check::date=$date*}} {{:assign open_years=""}} -{{#years closed=false}} +{{#years status=false}} {{:assign open_years=$open_years|cat:"\n"|cat:" - "|cat:$label|cat:" : "}} {{:assign debut=$start_date|date_short}} {{:assign fin=$end_date|date_short}} diff --git a/_nav.html b/_nav.html index 00dfbda..9008c17 100644 --- a/_nav.html +++ b/_nav.html @@ -1,8 +1,7 @@ diff --git a/add_asset.html b/add_asset.html index 42e50e2..da3a956 100644 --- a/add_asset.html +++ b/add_asset.html @@ -1,6 +1,7 @@ {{* -*- brindille -*- *}} {{:admin_header title="Ajout immobilisation" current="module_amortissement"}} + {{* barre de navigation *}} {{if ! $dialog}} {{:include file="_nav.html" current="index"}} @@ -8,6 +9,7 @@ {{* Traiter l'envoi du formulaire *}} {{#form on="add"}} +{{*:debug add::POST=$_POST*}} {{* vérifier que la date est située dans un exercice ouvert *}} {{:include diff --git a/amortization.html b/amortization.html index 94bfdfd..6d0cf5a 100644 --- a/amortization.html +++ b/amortization.html @@ -196,7 +196,7 @@ {{#foreach count="%d+1"|math:$nbamort key="num"}} {{:assign solde_prec=$solde}} {{:assign solde="%f-%d"|math:$solde:$annuite_courante}} - {{#select id from acc_years where :amort_date >= start_date and :amort_date <= end_date and closed = 0; :amort_date=$date_amort|parse_date}} + {{#select id from acc_years where :amort_date >= start_date and :amort_date <= end_date and status == 0; :amort_date=$date_amort|parse_date}} {{:assign enregistrer=1}} {{:assign current_year=$id}} {{else}} diff --git a/save_amort.html b/save_amort.html index c641716..0422804 100644 --- a/save_amort.html +++ b/save_amort.html @@ -119,7 +119,7 @@ }} {{/select}} -{{#years closed=false}} +{{#years status=false}} {{:assign var="open_years.%d"|args:$id value=$label}} {{/years}}