Ajout info création nouvelle immobilisation
This commit is contained in:
parent
0cf2a3f7e9
commit
420b91265c
6 changed files with 18 additions and 16 deletions
|
|
@ -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 @@
|
|||
<fieldset>
|
||||
<legend>Amortissement</legend>
|
||||
<dl>
|
||||
{{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur une ou plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"}}
|
||||
{{*:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur une ou plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"*}}
|
||||
<div id="div_amort">
|
||||
{{:input type="number" name="duree" label="Durée d'amortissement" required=true min=0 default=1 suffix="année(s)"}}
|
||||
{{:input type="date" name="date_mes" label="Date de mise en service" help="C'est la date de première utilisation ; à renseigner uniquement si différente de la date d'acquisition"}}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
{{* immobilisation sortie du bilan *}}
|
||||
{{:save
|
||||
key=""|uuid
|
||||
validate_schema="schema.json"
|
||||
validate_schema="asset.schema.json"
|
||||
type="immo"
|
||||
line=$_GET.immo_line_id|intval
|
||||
duration=0
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
{{/if}}
|
||||
{{:save
|
||||
key=$key
|
||||
validate_schema="schema.json"
|
||||
validate_schema="asset.schema.json"
|
||||
type="immo"
|
||||
line=$_GET.immo_line_id|intval
|
||||
duration=$duration
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
||||
"description": "Donnée d'une immobilisation",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": {
|
||||
|
|
@ -35,6 +36,10 @@
|
|||
"status" : {
|
||||
"type" : ["string", "null"],
|
||||
"enum" : ["managed", "amortized", "archived", "ignored"]
|
||||
},
|
||||
"created" : {
|
||||
"description" : "vrai si immobilisation créée dans le module",
|
||||
"type" : ["boolean", "null"]
|
||||
}
|
||||
},
|
||||
"required": ["type", "line", "duration", "status"]
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
{{:assign status="ignored"}}
|
||||
{{:save
|
||||
key=""|uuid
|
||||
validate_schema="schema.json"
|
||||
validate_schema="asset.schema.json"
|
||||
type="immo"
|
||||
line=$_GET.immo_line_id|intval
|
||||
duration=$duration
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@
|
|||
{{* enregistrer les infos de l'immobilisation *}}
|
||||
{{:save
|
||||
key=$info_immo.key
|
||||
validate_schema="schema.json"
|
||||
validate_schema="asset.schema.json"
|
||||
type="immo"
|
||||
line=$info_immo.line
|
||||
duration=$duration
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@
|
|||
{{* enregistrer les infos de l'immobilisation *}}
|
||||
{{:save
|
||||
key=""|uuid
|
||||
validate_schema="schema.json"
|
||||
validate_schema="asset.schema.json"
|
||||
type="immo"
|
||||
line=$immo_line_id
|
||||
duration=$duration
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue