diff --git a/amortization.html b/amortization.html
index 2d18a00..b5caa4e 100644
--- a/amortization.html
+++ b/amortization.html
@@ -14,9 +14,9 @@
{{if $_GET.ok}}
{{if $_GET.msg|match:"attach"}}
- {{:assign msg="Attachement effectué (écriture %s)"|args:$_GET.trans_id}}
+ {{:assign msg="Attachement écriture %s effectué"|args:$_GET.trans_id}}
{{elseif $_GET.msg|match:"detach"}}
- {{:assign msg="Attachement supprimé (écriture %s)"|args:$_GET.trans_id}}
+ {{:assign msg="Détachement écriture %s affectué"|args:$_GET.trans_id}}
{{elseif $_GET.msg|match:"amortissement"}}
{{:assign msg="Amortissement enregistré"}}
{{/if}}
@@ -38,6 +38,7 @@
line.debit as montant,
trans.id as trans_id,
trans.label as label,
+ trans.date,
y.id as year_id,
y.end_date as date_amort,
project.label as project_label
@@ -52,6 +53,7 @@
{{else}}
{{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}}
{{/select}}
+{{:assign date_debut=$ligne_immo.date}}
{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}}
{{:assign var="duree" from="info_immo.duration"|args:$_GET.immo_id}}
@@ -72,9 +74,8 @@
trans.id_year as amort_year,
account.id as account_id,
account.code as account_code,
- account.label as account_name
- FROM
- acc_transactions_lines as l_immo
+ account.label as account_label
+ FROM acc_transactions_lines as l_immo
INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction
INNER JOIN acc_transactions_links as links
ON (
@@ -165,7 +166,7 @@
{{/if}}
{{$line.account_code}} |
- {{$line.account_name}} |
+ {{$line.account_label}} |
{{:linkbutton label="Détacher" href="detach_amort.html?amort_id=%d&immo_id=%d"|args:$line.amort_line:$ligne_immo.immo_id shape="plus"}}
|
@@ -242,19 +243,19 @@
{{* Autres amortissements non rattachés *}}
{{#select
- li.id as l_id,
- li.id_transaction as t_id,
- li.credit as montant,
- li.reference,
- li.label as l_label,
+ line.id as l_id,
+ line.id_transaction as t_id,
+ line.credit as amort_amount,
+ line.label as l_label,
trans.date as t_date,
trans.label as t_label,
- account.code as a_code,
- account.label as a_label,
- y.label as y_label
- FROM acc_transactions_lines AS li
- INNER JOIN acc_accounts AS account ON account.id = li.id_account
- INNER JOIN acc_transactions AS trans ON trans.id = li.id_transaction
+ trans.id_year as amort_year,
+ account.id as account_id,
+ account.code as account_code,
+ account.label as account_label
+ FROM acc_transactions_lines AS line
+ INNER JOIN acc_accounts AS account ON account.id = line.id_account
+ INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction
INNER JOIN acc_years AS y ON y.id = trans.id_year
WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16)
ORDER BY trans.date, trans.label;
@@ -288,21 +289,21 @@
-
{{#foreach from=$autres_amortissements item="line"}}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$line.t_id}}
+ {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}}
#{{$line.t_id}} |
{{$line.t_date|date_short}} |
- {{"%f"|math:$line.montant|money}} |
+ {{"%f"|math:$line.amort_amount|money}} |
{{if $line.l_label == null}}
{{$line.t_label}}
{{else}}
{{$line.l_label}}
{{/if}}
|
- {{$line.a_code}} |
- {{$line.a_label}} |
+ {{$line.account_code}} |
+ {{$line.account_label}} |
{{:linkbutton label="Attacher" href="attach_amort.html?amort_id=%d&immo_id=%d"|args:$line.l_id:$ligne_immo.immo_id shape="plus"}}
|