Correction détermination dates achat et mise en service
This commit is contained in:
parent
e4a637c652
commit
b15eab168c
3 changed files with 36 additions and 21 deletions
|
|
@ -91,22 +91,30 @@
|
|||
{{:assign date_mes=null}}
|
||||
{{:assign status="ignored"}}
|
||||
{{else}}
|
||||
{{if $_POST.date_achat == null || $_POST.date_achat|parse_date == $ligne_immo.date_achat}}
|
||||
{{:assign date_achat=null}}
|
||||
{{elseif $_POST.date_achat|parse_date == $info_immo.date_achat}}
|
||||
{{:assign date_achat=$info_immo.date_achat}}
|
||||
{{else}}
|
||||
{{:assign date_achat=$_POST.date_achat|parse_date}}
|
||||
{{/if}}
|
||||
{{if $_POST.date_achat|parse_date > $ligne_immo.date_achat}}
|
||||
{{:assign da=$ligne_immo.date_achat|date_short}}
|
||||
{{:error message="Erreur : la date d'achat (%s) ne peut être postérieure à la date de l'écriture d'immobilisation (%s)"|args:$_POST.date_achat:$da}}
|
||||
{{/if}}
|
||||
|
||||
{{if $_POST.date_mes == null || $_POST.date_mes|parse_date == $ligne_immo.date_achat}}
|
||||
{{:assign date_mes=null}}
|
||||
{{if $_POST.date_achat == null || $_POST.date_achat|parse_date == $info_immo.date_achat}}
|
||||
{{:assign date_achat=$info_immo.date_achat}}
|
||||
{{elseif $_POST.date_achat|parse_date == $ligne_immo.date_achat}}
|
||||
{{:assign date_achat=null}}
|
||||
{{else}}
|
||||
{{:assign date_achat=$_POST.date_achat|parse_date}}
|
||||
{{/if}}
|
||||
|
||||
{{* TODO : simplifier ? *}}
|
||||
{{if $_POST.date_mes == null || $_POST.date_mes|parse_date == $info_immo.date_mes}}
|
||||
{{:assign date_mes=$info_immo.date_mes}}
|
||||
{{elseif $_POST.date_mes|parse_date == $info_immo.date_achat}}
|
||||
{{:assign date_mes=null}}
|
||||
{{elseif $_POST.date_mes|parse_date == $ligne_immo.date_achat}}
|
||||
{{if $info_immo.date_achat == null}}
|
||||
{{:assign date_mes=null}}
|
||||
{{else}}
|
||||
{{:assign date_mes=$ligne_immo.date_achat}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{:assign date_mes=$_POST.date_mes|parse_date}}
|
||||
{{:assign date_achat_comp=$ligne_immo.date_achat}}
|
||||
|
|
@ -250,7 +258,7 @@
|
|||
{{:input type="text" name="libelle" label="Libellé" default=$info_immo.label}}
|
||||
{{if $info_immo.amount != null}}
|
||||
{{:assign max_aff="%f"|math:$max_disponible|money_currency:false}}
|
||||
{{:input type="money" name="montant" label="Montant de l'immobilisation" default=$montant_immo help="Montant maximum = %s"|args:$max_aff}}
|
||||
{{:input type="money" name="montant" label="Montant de l'immobilisation" default=$montant_immo help="Montant maximum : %s"|args:$max_aff}}
|
||||
{{/if}}
|
||||
{{:input type="date" name="date_achat" label="Date d'acquisition" default=$info_immo.date_achat}}
|
||||
{{:input type="date" name="date_mes" label="Date de mise en service" default=$info_immo.date_mes}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue