diff --git a/add_asset.html b/add_asset.html index 97eeeb6..6dce231 100644 --- a/add_asset.html +++ b/add_asset.html @@ -93,12 +93,7 @@ {{/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"}} + {{if $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}} @@ -111,7 +106,7 @@ {{if $_POST.date_mes == null || $_POST.date_mes == $_POST.date_achat}} {{:assign date_mes=null}} {{else}} - {{:assign date_mes=$_POST.date_mes|date_short}} + {{:assign date_mes=$_POST.date_mes|parse_date}} {{/if}} {{/if}} @@ -142,18 +137,19 @@ {{* enregistrer les infos de l'immobilisation *}} {{:save key=$key - validate_schema="schema.json" + validate_schema="asset.schema.json" type="immo" line=$immo_line_id duration=$duration date_mes=$date_mes status=$status + created=true }} {{/if}} {{if $status == "unfinished"}} {{:assign type_immo="unfinished"}} - {{elseif $_POST.amortir}} + {{elseif $status == "managed"}} {{:assign type_immo="managed"}} {{else}} {{:assign type_immo="other"}} @@ -206,8 +202,9 @@ name="credit_account" label="Compte de décaissement" required=true - target="!acc/charts/accounts/selector.php?types=%s&id_year=%d"|args:"1|2|3|4":$selected_year + target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:"512*|530*|404*":$selected_year }} +{{* target="!acc/charts/accounts/selector.php?types=%s&id_year=%d"|args:"1|2|3|4":$selected_year*}} {{:input type="list" name="debit_account" @@ -226,7 +223,7 @@