Merge branch 'main' into val_defaut

This commit is contained in:
Jean-Christophe Engel 2026-06-24 09:13:32 +02:00
commit 44c0033951
2 changed files with 8 additions and 8 deletions

View file

@ -7,7 +7,7 @@
*}} *}}
{{* données de l'immobilisation *}} {{* données de l'immobilisation *}}
{{:include file="_get_immo_data.html" immo_doc_id=$immo_doc_id|intval keep="ligne_immo, message"}} {{:include file="_get_immo_data.html" immo_doc_id=$immo_doc_id|intval keep="info_immo, ligne_immo, message"}}
{{if $message != null}} {{if $message != null}}
{{:error message=$message}} {{:error message=$message}}
{{/if}} {{/if}}

View file

@ -7,8 +7,7 @@
@param amort_line_id : id de la ligne d'amortissement @param amort_line_id : id de la ligne d'amortissement
*}} *}}
{{:include file="_common_detach.html" immo_doc_id=$_GET.immo_doc_id line_id=$_GET.amort_line_id}} {{:include file="_common_detach.html" immo_doc_id=$_GET.immo_doc_id line_id=$_GET.amort_line_id keep="info_immo"}}
{{* supprimer le doc de liaison entre les lignes *}} {{* supprimer le doc de liaison entre les lignes *}}
{{#load type="amort_link" {{#load type="amort_link"
where="$$.immo_doc_id = :immo_doc_id AND $$.amort_line_id = :amort_line_id" where="$$.immo_doc_id = :immo_doc_id AND $$.amort_line_id = :amort_line_id"
@ -19,11 +18,12 @@
{{/load}} {{/load}}
{{* marquer immo non soldée *}} {{* marquer immo non soldée *}}
{{* TODO : À VÉRIFIER *}} {{if $info_immo.status == "amortized"}}
{{:save {{:save
key=$info_immo.key key=$info_immo.key
status="managed" status="managed"
}} }}
{{/if}}
{{if $_GET.from == "exit"}} {{if $_GET.from == "exit"}}
{{:redirect force="exit_step2.html?immo_doc_id=%s&ok=1&msg=detach_amort"|args:$_GET.immo_doc_id}} {{:redirect force="exit_step2.html?immo_doc_id=%s&ok=1&msg=detach_amort"|args:$_GET.immo_doc_id}}