Mutualisation _detach_xxx

This commit is contained in:
Jean-Christophe Engel 2026-10-13 10:19:15 +02:00
parent f735245273
commit 275a7a18ca
27 changed files with 88 additions and 179 deletions

View file

@ -17,7 +17,7 @@
une écriture au crédit du compte d'immobilisation
*}}
{{#form on="detach_credit"}}
{{:include file="_detach_credit.html" immo_doc_id=$_POST.immo_doc_id credit_line_id=$_POST.detach_credit}}
{{:include file="_detach_line.html" immo_doc_id=$_POST.immo_doc_id line_id=$_POST.detach_credit type="credit"}}
{{:redirect to="?immo_doc_id=%s&from=exit&ok=1&msg=detach_avoir"|args:$_POST.immo_doc_id}}
{{/form}}
@ -56,15 +56,15 @@
FROM acc_transactions AS trans
INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id
INNER JOIN acc_accounts AS account ON line.id_account = account.id
LEFT JOIN module_data_amortization AS mda ON json_extract(mda.document, '$.amort_line_id') = line.id
LEFT JOIN module_data_amortization AS mda ON json_extract(mda.document, '$.line_id') = line.id
WHERE
account.code LIKE :account_code
AND line.credit > 0
AND credit_line_id NOT IN (
SELECT json_extract(credit_link.document, '$.credit_line_id') AS line_id FROM !table as credit_link
SELECT json_extract(credit_link.document, '$.line_id') AS line_id FROM !table as credit_link
WHERE json_extract(credit_link.document, '$.type') == "credit_link"
UNION
SELECT json_extract(exit_link.document, '$.exit_line_id') AS line_id FROM !table as exit_link
SELECT json_extract(exit_link.document, '$.line_id') AS line_id FROM !table as exit_link
WHERE json_extract(exit_link.document, '$.type') == "exit_link"
)
;
@ -112,7 +112,7 @@
{{:assign amort_amount=0}}
{{:assign keep_amort=true}}
{{#load type="amort_link"
where="$$.amort_line_id = :amort_line_id"
where="$$.line_id = :amort_line_id"
:amort_line_id=$amort_line.amort_line_id
assign="amort_link"
}}