ajout lien vers comptes sur pages immobilisation et amortissement

This commit is contained in:
Jean-Christophe Engel 2024-10-11 09:40:00 +02:00
parent 00071437ef
commit 0e3a9669ec
2 changed files with 16 additions and 11 deletions

View File

@ -68,6 +68,7 @@
trans.date as amort_date, trans.date as amort_date,
trans.label as trans_label, trans.label as trans_label,
trans.id_year as amort_year, trans.id_year as amort_year,
acc.id as account_id,
acc.code as account_code, acc.code as account_code,
acc.label as account_name, acc.label as account_name,
"vrai" as linked "vrai" as linked
@ -123,7 +124,7 @@
<th></th> <th></th>
<th>Date</th> <th>Date</th>
<th class="nombre">Montant</th> <th class="nombre">Montant</th>
<th class="nombre"">Solde</th> <th class="nombre">Solde</th>
<th>Libellé</th> <th>Libellé</th>
<th>N° compte</th> <th>N° compte</th>
<th>Compte</th> <th>Compte</th>
@ -134,6 +135,7 @@
{{#foreach from=$linked_lines item="line"}} {{#foreach from=$linked_lines item="line"}}
{{* données de l'écriture *}} {{* données de l'écriture *}}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.amort_trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.amort_trans_id}}
{{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}}
{{:assign solde="%f-%d"|math:$solde:$line.amort_amount}} {{:assign solde="%f-%d"|math:$solde:$line.amort_amount}}
{{:assign date_amort=$line.amort_date}} {{:assign date_amort=$line.amort_date}}
{{:assign current_year=$line.amort_year}} {{:assign current_year=$line.amort_year}}
@ -149,7 +151,7 @@
{{$line.amort_label}} {{$line.amort_label}}
{{/if}} {{/if}}
</td> </td>
<td>{{$line.account_code}}</td> <td><a href={{$compte_url}}>{{$line.account_code}}</a></td>
<td>{{$line.account_name}}</td> <td>{{$line.account_name}}</td>
<td> <td>
{{if $line.linked == null}} {{if $line.linked == null}}

View File

@ -43,10 +43,12 @@
trans.label as trans_label, trans.label as trans_label,
trans.date as trans_date, trans.date as trans_date,
line.id as immo_id, line.id as immo_id,
account.id as account_id,
account.code as account_code, account.code as account_code,
account.label as account_label, account.label as account_label,
line.debit AS debit, line.debit AS debit,
project.label as project_label project.label as project_label,
trans.id_year as trans_id_year
FROM acc_transactions AS trans FROM acc_transactions AS trans
INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id 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 INNER JOIN acc_accounts AS account ON line.id_account = account.id
@ -57,6 +59,7 @@
ORDER BY trans.date DESC ORDER BY trans.date DESC
}} }}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$trans_id}}
{{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}}
{{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}}
{{:assign duration=$duration}} {{:assign duration=$duration}}
{{else}} {{else}}
@ -69,7 +72,7 @@
<td>{{$trans_label}}</td> <td>{{$trans_label}}</td>
<td class="money">{{"%f"|math:$debit|money}}</td> <td class="money">{{"%f"|math:$debit|money}}</td>
<td class="num">{{if $duration != null}}{{$duration}}{{/if}}</td> <td class="num">{{if $duration != null}}{{$duration}}{{/if}}</td>
<td>{{$account_code}}</td> <td><a href={{$compte_url}}>{{$account_code}}</a></td>
<td>{{$account_label}}</td> <td>{{$account_label}}</td>
<td>{{$project_label}}</td> <td>{{$project_label}}</td>
<td class="actions"> <td class="actions">