diff --git a/details_immo.html b/details_immo.html index 0954f68..70fc845 100644 --- a/details_immo.html +++ b/details_immo.html @@ -1,6 +1,5 @@ {{* -*- brindille -*- *}} -{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} {{* Afficher les détails d'une immmo @@ -32,7 +31,7 @@ account.code as account_code, account.label as account_label FROM acc_transactions_lines AS line - INNER join acc_transactions AS trans ON line.id_transaction = trans.id + INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id INNER JOIN acc_accounts AS account ON line.id_account = account.id WHERE line.id = :line_id; :line_id = $info_immo.line @@ -44,7 +43,7 @@ {{:assign var="info_immo.amount" value=$info_immo.amount|or:$ligne_immo.montant}} {{:assign var="info_immo.date_achat" value=$info_immo.date_achat|or:$ligne_immo.date_achat}} -{{:assign var="info_immo.date_mes" value=$info_immo.date_mes|or:$ligne_immo.date_achat}} +{{:assign var="info_immo.date_mes" value=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date_achat}} {{:assign var="info_immo.label" value=$info_immo.label|or:$ligne_immo.label}} {{if $ligne_immo.line_label != null && $ligne_immo.line_label != $info_immo.label}} {{:assign var="info_immo.label" value=$info_immo.label|cat:" — "|cat:$ligne_immo.line_label}} @@ -56,19 +55,20 @@ *}} {{:assign linked_immos=null}} {{:assign total_credits=0}} -{{#load type="immo_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} +{{#load type="credit_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} {{#select line.credit, - trans.id + trans.id, + trans.label, + trans.date FROM acc_transactions_lines AS line INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id WHERE line.id = :credit_line_id; :credit_line_id=$credit_line_id }} {{:assign credit=$credit}} - {{:assign credit_trans_id=$id}} + {{:assign var="linked_immos." id=$id label=$label amount=$credit date=$date}} {{/select}} - {{:assign var="linked_immos." value=$credit_trans_id}} {{if $amount == null}} {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} {{else}} @@ -94,17 +94,37 @@ {{/if}} {{/load}} -{{* barre de navigation *}} +{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}} + +{{* {{if ! $dialog}} + {{:assign subsubcurrent=null}} {{if $total_credits == 0 && $total_amort == 0}} {{:assign subsubcurrent="credit"}} - {{else}} - {{:assign subsubcurrent=null}} + {{/if}} + {{if $total_amort == 0}} + {{:assign subsubcurrent=$subsubcurrent|cat:"-modif"}} {{/if}} {{:include file="_nav.html" current="index" subcurrent="details" subsubcurrent=$subsubcurrent}} {{/if}} +*}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} + + {{if $_GET.ok}} {{if $_GET.msg|match:"attach_amort"}} {{:assign msg="Attachement amortissement effectué"}} @@ -119,14 +139,34 @@
{{$msg}}
{{/if}} +{{*