lesanges/amortization
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

liaisons écritures remplacées par liaisons lignes

Browse source
This commit is contained in:
Jean-Christophe Engel 2026-04-29 12:01:24 +02:00
parent d5c62b6ef3
commit 87a1f31bb3
3 changed files with 216 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

241
amortization.html
View file

@ -3,10 +3,16 @@
{{* {{*
Lister les écritures d'amortissement associées à une immobilisation Lister les écritures d'amortissement associées à une immobilisation
@param immo_line_id : id de la ligne d'immo @param immo_line_id : id de la ligne d'immo
@param immo_doc_id : id du doc associé à l'immo
@param type_immo : managed, amortized, archived, others @param type_immo : managed, amortized, archived, others
*}} *}}
{{* récupérer les infos de l'immobilisation *}} {{* données de l'immobilisation *}}
{{#load type="immo" id=$_GET.immo_doc_id|intval assign="info_immo"}}
{{else}}
{{:error message="Immobilisation non trouvée"}}
{{/load}}
{{#select {{#select
line.id as immo_line_id, line.id as immo_line_id,
line.debit as montant, line.debit as montant,
@ -14,167 +20,113 @@
trans.id as immo_trans_id, trans.id as immo_trans_id,
trans.label as label, trans.label as label,
trans.date, trans.date,
account.code as account_code account.code as account_code,
account.label as account_label
FROM acc_transactions_lines AS line 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 INNER JOIN acc_accounts AS account ON line.id_account = account.id
WHERE line.id = :line_id; WHERE line.id = :line_id;
:line_id = $_GET.immo_line_id|intval :line_id = $info_immo.line
assign=ligne_immo assign="ligne_immo"
}} }}
{{else}} {{else}}
{{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{:error message="Immobilisation non trouvée"}}
{{/select}} {{/select}}
{{:assign date_debut=$ligne_immo.date}}
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}}
{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} {{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date}}
{{:assign duree=$duration}} {{:assign label_immo=$info_immo.label|or:$ligne_immo.label}}
{{:assign date_debut=$date}} {{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
{{:assign status=$status}} {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/load}} {{/if}}
{{if $info_immo.amount != null}}
{{:assign var="ligne_immo.montant" value=$info_immo.amount}}
{{/if}}
{{if $status == 'ignored'}} {{if $info_immo.status == 'ignored'}}
{{:error message="Cette immobilisation ne doit pas être amortie"}} {{:error message="Cette immobilisation ne doit pas être amortie"}}
{{/if}} {{/if}}
{{* chercher des écritures liées à l'immo courante au crédit du même compte {{*
chercher des écritures liées à l'immo courante au crédit du même compte
et déduire leur montant de celui de l'immo et déduire leur montant de celui de l'immo
*}} *}}
{{:assign total_credits=0}} {{:assign total_credits=0}}
{{#select {{#load type="immo_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}}
CASE links.id_related = :immo_trans_id {{if $amount == null}}
WHEN true THEN links.id_transaction {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id;
WHEN false THEN links.id_related :credit_line_id=$credit_line_id
END as other_id,
line.credit
FROM acc_transactions AS trans
INNER JOIN acc_transactions_links as links
ON (trans.id = links.id_transaction OR trans.id = links.id_related)
INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id
INNER JOIN acc_accounts AS acc ON line.id_account = acc.id
WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account;
:immo_trans_id=$ligne_immo.immo_trans_id
:account=$ligne_immo.account_code
}} }}
{{:assign total_credits="%d+%d"|math:$total_credits:$credit}} {{:assign total_credits="%d+%d"|math:$total_credits:$credit}}
{{/select}} {{/select}}
{{else}}
{{:assign total_credits="%d+%d"|math:$total_credits:$amount}}
{{/if}}
{{/load}}
{{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} {{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}}
{{:assign solde=$ligne_immo.montant}} {{:assign solde=$ligne_immo.montant}}
{{*:debug info_immo=$info_immo ligne_immo=$ligne_immo total_credits=$total_credits solde=$solde*}}
{{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} {{if $info_immo.status == "amortized"}}
{{#select
l_amort.credit as amort_amount,
l_amort.label as amort_line_label,
l_amort.id as amort_line_id,
CASE WHEN links.id_related = t_immo.id
THEN links.id_transaction
ELSE links.id_related
END as amort_trans_id,
trans.date as amort_date,
trans.label as amort_trans_label,
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 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 (t_immo.id = links.id_transaction OR t_immo.id = links.id_related)
INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction
INNER join acc_transactions as trans on l_amort.id_transaction = trans.id
INNER join acc_accounts as account on l_amort.id_account = account.id
WHERE l_immo.id = :line_id AND account.code LIKE '28%'
ORDER BY trans.date;
:line_id = $_GET.immo_line_id|intval
assign="amort_line"
}}
{{* lister les lignes d'amortissement liées à la ligne d'immobilisation *}}
{{#load type="link"
where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id AND $$.amort_line_id = :amort_line_id"
assign="line"
:immo_line_id=$_GET.immo_line_id|intval
:amort_trans_id=$amort_line.amort_trans_id
:amort_line_id = $amort_line.amort_line_id
}}
{{:assign var="linked_amort." value=$amort_line}}
{{/load}}
{{if $date_debut == null}}
{{:assign date_debut=$amort_date}}
{{/if}}
{{/select}}
{{if $status == "amortized"}}
{{:assign amort_amount=$ligne_immo.montant}} {{:assign amort_amount=$ligne_immo.montant}}
{{:assign valeur_residuelle=0}} {{:assign valeur_residuelle=0}}
{{else}} {{else}}
{{:assign valeur_residuelle=$ligne_immo.montant}} {{:assign valeur_residuelle=$ligne_immo.montant}}
{{#foreach from=$linked_amort}}
{{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}}
{{/foreach}}
{{/if}} {{/if}}
{{* Autres amortissements non rattachés *}} {{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}}
{{:include file="_get_config.html" keep="module.config"}} {{#load type="amort_link"
{{:assign filter_condition=" NOT ("}} where="$$.immo_doc_id = :immo_doc_id"
{{#foreach from=$module.config.filters item="filter"}} :immo_doc_id = $_GET.immo_doc_id|intval
{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} }}
{{:assign filter_condition=$filter_condition|cat:" trans.label LIKE "|cat:$filter|cat:" OR "}} {{#select
{{/foreach}} line.id as amort_line_id,
{{:assign filter_condition=$filter_condition|cat:"0)"}} line.credit,
line.label as amort_line_label,
trans.id as amort_trans_id,
trans.label as amort_trans_label,
trans.date as amort_date,
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_transactions AS trans ON line.id_transaction = trans.id
INNER join acc_accounts AS account on line.id_account = account.id
WHERE line.id = :amort_line_id
;
:amort_line_id = $amort_line_id
assign="amort_line"
}}
{{:assign var="amort_line.amort_amount" value=$amount|or:$credit}}
{{:assign var="linked_amort.%s_%d"|args:$amort_date:$id value=$amort_line}}
{{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_line.amort_amount}}
{{/select}}
{{/load}}
{{:assign autres_amortissements=false}} {{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}}
{{#select {{* Chercher des amortissements non rattachés à une immo *}}
{{:assign autres_amortissements=false}}
{{#select
line.id as amort_line_id,
line.id_transaction AS amort_trans_id line.id_transaction AS amort_trans_id
FROM acc_transactions_lines AS line FROM acc_transactions_lines AS line
INNER JOIN acc_accounts AS account ON account.id = line.id_account 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_transactions AS trans ON trans.id = line.id_transaction
INNER JOIN acc_years AS y ON y.id = trans.id_year 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) AND !filter_condition WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16)
ORDER BY trans.date, trans.label; ORDER BY trans.date, trans.label;
!filter_condition=$filter_condition
assign="amort"
}}
{{* voir s'il existe des écritures liées avec un numéro de compte d'immobilisation *}}
{{#select
links.id_transaction,
links.id_related,
trans.id AS trans_id
FROM acc_transactions_links AS links
INNER JOIN acc_transactions AS trans ON (
CASE
WHEN links.id_transaction = :id_amort THEN links.id_related
WHEN links.id_related = :id_amort THEN links.id_transaction
END) = trans.id
INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id
INNER JOIN acc_accounts AS acc ON line.id_account = acc.id
WHERE
links.id_transaction = :id_amort OR links.id_related = :id_amort
AND acc.code LIKE '21%'
LIMIT 1
;
:id_amort=$amort.amort_trans_id
}} }}
{{* voir s'il existe un doc associé à une ligne de l'amortissement *}} {{* cette ligne d'amortissement a-t-elle un doc associé ? *}}
{{:assign keep=true}} {{#load type="amort_link"
{{#load type="link" where="$$.amort_line_id = :amort_line_id"
where="$$.amort_trans_id = :amort_trans_id" :amort_line_id = $amort_line_id
:amort_trans_id = $amort.amort_trans_id
}} }}
{{if $amort_line_id == $amort.amort_line_id}}
{{:assign keep=false}}
{{:break}}
{{/if}}
{{else}} {{else}}
{{:assign keep=false}} {{:assign autres_amortissements=true}}
{{/load}} {{/load}}
{{if $keep}}
{{:assign autres_amortissements=true}}
{{/if}}
{{else}}
{{:assign autres_amortissements=true}}
{{/select}} {{/select}}
{{/select}} {{/if}}
{{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}} {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}}
@ -200,16 +152,16 @@
{{if $_GET.ok}} {{if $_GET.ok}}
{{if $_GET.msg|match:"attach"}} {{if $_GET.msg|match:"attach"}}
{{:assign msg="Attachement écriture %s effectué"|args:$_GET.trans_id}} {{:assign msg="Attachement amortissement %s effectué"|args:$_GET.trans_id}}
{{elseif $_GET.msg|match:"detach"}} {{elseif $_GET.msg|match:"detach"}}
{{:assign msg="Détachement écriture %s affectué"|args:$_GET.trans_id}} {{:assign msg="Détachement amortissement %s affectué"|args:$_GET.trans_id}}
{{elseif $_GET.msg|match:"amortissement"}} {{elseif $_GET.msg|match:"amortissement"}}
{{:assign msg="Amortissement enregistré"}} {{:assign msg="Amortissement enregistré"}}
{{/if}} {{/if}}
<p class="block confirm">{{$msg}}</p> <p class="block confirm">{{$msg}}</p>
{{elseif $_GET.err}} {{elseif $_GET.err}}
{{if $_GET.msg|match:"attach"}} {{if $_GET.msg|match:"attach"}}
{{:assign msg="Échec attachement"}} {{:assign msg="Échec attachement amortissement"}}
{{elseif $_GET.msg|match:"amortissement"}} {{elseif $_GET.msg|match:"amortissement"}}
{{:assign msg="Échec enregistrement amortissement"}} {{:assign msg="Échec enregistrement amortissement"}}
{{/if}} {{/if}}
@ -222,7 +174,7 @@
<p class="submit"> <p class="submit">
{{:linkbutton {{:linkbutton
label="Sortir du bilan" label="Sortir du bilan"
href="balance_sheet_exit.html?immo_line_id=%s&type_immo=%s"|args:$_GET.immo_line_id:$_GET.type_immo href="balance_sheet_exit.html?immo_line_id=%s&immo_doc_id=%s&type_immo=%s"|args:$_GET.immo_line_id:$_GET.immo_doc_id:$_GET.type_immo
shape="export" shape="export"
class="main" class="main"
}} }}
@ -238,14 +190,22 @@
<div class="informations"> <div class="informations">
<dl class="describe"> <dl class="describe">
<dt>Immobilisation</dt> <dt>Immobilisation</dt>
<dd><span class="num"><a href={{$trans_url}}>#{{$ligne_immo.immo_trans_id}}</a></span> {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}</dd> <dd><span class="num"><a href="{{$trans_url}}">#{{$ligne_immo.immo_trans_id}}</a></span> {{$label_immo}}</dd>
<dt>Montant</dt> <dt>Compte d'immobilisation</dt>
<dd>{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}</dd>
<dt>Montant de l'immobilisation</dt>
<dd class="money strong">{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}</dd> <dd class="money strong">{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}</dd>
{{if $total_credits > 0}}
<dt>Montant des avoirs</dt>
<dd class="money">{{"%f"|math:$total_credits|money_currency_html:false|raw}}</dd>
<dt>Montant à amortir</dt>
<dd class="money strong">{{"%f"|math:$solde|money_currency_html:false|raw}}</dd>
{{/if}}
<dt>Début d'amortissement</dt> <dt>Début d'amortissement</dt>
<dd>{{$date_debut|date_short}}</dd> <dd>{{$date_debut|date_short}}</dd>
{{if $duree != null}} {{if $info_immo.duration != null}}
<dt>Durée</dt> <dt>Durée</dt>
<dd>{{$duree}} ans</dd> <dd>{{$info_immo.duration}} ans</dd>
{{/if}} {{/if}}
{{if $valeur_residuelle > 0}} {{if $valeur_residuelle > 0}}
<dt>Montant des amortissements</dt> <dt>Montant des amortissements</dt>
@ -253,9 +213,9 @@
<dt>Valeur nette comptable</dt> <dt>Valeur nette comptable</dt>
<dd>{{$valeur_residuelle|money_currency_html:false|raw}}</dd> <dd>{{$valeur_residuelle|money_currency_html:false|raw}}</dd>
{{/if}} {{/if}}
{{if $duree != null && $valeur_residuelle > 0}} {{if $info_immo.duration != null && $valeur_residuelle > 0}}
<dt>Annuité estimée</dt> <dt>Annuité estimée</dt>
<dd>{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$duree|money_currency_html:false|raw}}</dd> <dd>{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$info_immo.duration|money_currency_html:false|raw}}</dd>
{{/if}} {{/if}}
</dl> </dl>
</div> </div>
@ -277,13 +237,13 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{{#foreach from=$linked_amort item="line"}} {{#foreach from=$linked_amort|ksort 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 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}}
<tr> <tr>
<td class="num"><a href={{$trans_url}}>#{{$line.amort_trans_id}}</a></td> <td class="num"><a href="{{$trans_url}}">#{{$line.amort_trans_id}}</a></td>
<td>{{$line.amort_date|date_short}}</td> <td>{{$line.amort_date|date_short}}</td>
<td class="money">{{"%f"|math:$line.amort_amount|money_html:false|raw}}</td> <td class="money">{{"%f"|math:$line.amort_amount|money_html:false|raw}}</td>
<td class="money">{{"%f"|math:$solde|money_html:false|raw}}</td> <td class="money">{{"%f"|math:$solde|money_html:false|raw}}</td>
@ -293,10 +253,10 @@
— {{$line.amort_line_label}} — {{$line.amort_line_label}}
{{/if}} {{/if}}
</td> </td>
<td><a href={{$compte_url}}>{{$line.account_code}}</a></td> <td><a href="{{$compte_url}}">{{$line.account_code}}</a></td>
<td>{{$line.account_label}}</td> <td>{{$line.account_label}}</td>
<td> <td>
{{:linkbutton label="Détacher" href="detach_amort.html?amort_line_id=%d&immo_line_id=%d"|args:$line.amort_line_id:$ligne_immo.immo_line_id shape="minus"}} {{:linkbutton label="Détacher" href="detach_amort.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$ligne_immo.immo_line_id:$_GET.immo_doc_id shape="minus"}}
</td> </td>
</tr> </tr>
{{/foreach}} {{/foreach}}
@ -308,13 +268,10 @@
{{/if}} {{/if}}
{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} {{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}}
{{* Autres amortissements non rattachés *}}
{{if $autres_amortissements}} {{if $autres_amortissements}}
<p class="block alert"> <p class="block alert">
Il existe des écritures d'amortissement qui ne sont pas rattachées à une immobilisation ! <br /> Il y a des écritures d'amortissement qui ne sont pas rattachées à une immobilisation ! <br />
Utilisez le bouton « Rattacher une écriture » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation. Utilisez le bouton « Rattacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.
</p> </p>
{{/if}} {{/if}}
{{/if}} {{/if}}

83
other_amortizations.html
View file

@ -4,6 +4,7 @@
Lister les écritures d'amortissement indépendantes Lister les écritures d'amortissement indépendantes
et proposer des les attacher à l'immo sélectionnée et proposer des les attacher à l'immo sélectionnée
@param immo_line_id = id de la ligne d'immo @param immo_line_id = id de la ligne d'immo
@param immo_doc_id id du doc d'immo associé
*}} *}}
{{* récupérer les infos de l'immobilisation *}} {{* récupérer les infos de l'immobilisation *}}
@ -17,11 +18,19 @@
assign=ligne_immo assign=ligne_immo
}} }}
{{else}} {{else}}
{{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{:error message="Immobilisation non trouvée"}}
{{/select}} {{/select}}
{{:include file="_get_config.html" keep="module.config"}} {{#load id=$_GET.immo_doc_id|intval}}
{{:assign label_immo=$label|or:$ligne_immo.label}}
{{else}}
{{:error message="Informations de l'immobilisation %s (%s) non trouvées"|args:$_GET.immo_line_id:$ligne_immo.label}}
{{/load}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}}
{{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}}
{{:include file="_get_config.html" keep="module.config"}}
{{if $_POST.unhide == null}} {{if $_POST.unhide == null}}
{{:assign filter_condition=" NOT ("}} {{:assign filter_condition=" NOT ("}}
{{#foreach from=$module.config.filters item="filter"}} {{#foreach from=$module.config.filters item="filter"}}
@ -54,46 +63,26 @@
!filter_condition=$filter_condition !filter_condition=$filter_condition
assign="amort" assign="amort"
}} }}
{{* voir s'il existe des lignes d'immo liées à cette ligne d'amortissement *}}
{{* voir s'il existe des écritures liées avec un numéro de compte d'immobilisation *}} {{:assign amort_amount=0}}
{{#select {{:assign keep_amort=true}}
links.id_transaction, {{#load type="amort_link"
links.id_related, where="$$.amort_line_id = :amort_line_id"
trans.id AS trans_id :amort_line_id=$amort.amort_line_id|intval
FROM acc_transactions_links AS links assign="amort_link"
INNER JOIN acc_transactions AS trans ON (
CASE
WHEN links.id_transaction = :id_amort THEN links.id_related
WHEN links.id_related = :id_amort THEN links.id_transaction
END) = trans.id
INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id
INNER JOIN acc_accounts AS acc ON line.id_account = acc.id
WHERE
links.id_transaction = :id_amort OR links.id_related = :id_amort
AND acc.code LIKE '21%'
LIMIT 1
;
:id_amort=$amort.amort_trans_id
}} }}
{{* voir s'il existe un doc associé à une ligne de l'amortissement *}} {{if $amort_link.amount == null || $amort_link.amount == 0}}
{{:assign keep=true}} {{:assign amort_amount=$amort.amort_amount}}
{{#load type="link" {{:assign keep_amort=false}}
where="$$.amort_trans_id = :amort_trans_id" {{else}}
:amort_trans_id = $amort.amort_trans_id {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}}
}}
{{if $amort_line_id == $amort.amort_line_id}}
{{:assign keep=false}}
{{:break}}
{{/if}} {{/if}}
{{else}} {{else}}
{{:assign keep=false}} {{* pas de ligne d'immo liée à cette ligne d'amort => garder cette ligne d'amortissement *}}
{{/load}} {{/load}}
{{if $keep}} {{if $keep_amort && $amort_amount < $amort.amort_amount}}
{{:assign var="autres_amortissements." value=$amort}} {{:assign var="free_amort_lines." value=$amort}}
{{/if}} {{/if}}
{{else}}
{{:assign var="autres_amortissements." value=$amort}}
{{/select}}
{{/select}} {{/select}}
{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}} {{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}}
@ -106,7 +95,7 @@
subcurrent="other" subcurrent="other"
subsubcurrent="amortization" subsubcurrent="amortization"
type_immo="other" type_immo="other"
autres_amort=$autres_amortissements autres_amort=$free_amort_lines
}} }}
{{/if}} {{/if}}
@ -116,13 +105,13 @@
<form method="post" action=""> <form method="post" action="">
<fieldset> <fieldset>
{{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher toutes les écritures" }} {{:input type="checkbox" value=1 name="unhide" checked="%s"|args:$checked label="Afficher les écritures ignorées"}}
</fieldset> </fieldset>
</form> </form>
{{if $autres_amortissements != null}} {{if $free_amort_lines != null}}
<section class="amortissement"> <section class="amortissement">
<h3 class="ruler">Immobilisation « {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}} »</h3> <h3 class="ruler">Immobilisation « {{$label_immo}} »</h3>
<table class="list"> <table class="list">
<thead> <thead>
<tr> <tr>
@ -136,20 +125,24 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{{#foreach from=$autres_amortissements item="line"}} {{#foreach from=$free_amort_lines item="line"}}
{{: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 compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}}
<tr> <tr>
<td class="num"><a href={{$trans_url}}>#{{$line.amort_trans_id}}</a></td> <td class="num"><a href="{{$trans_url}}">#{{$line.amort_trans_id}}</a></td>
<td>{{$line.trans_date|date_short}}</td> <td>{{$line.trans_date|date_short}}</td>
<td class="money">{{"%f"|math:$line.amort_amount|money_html:false|raw}}</td> <td class="money">{{"%f"|math:$line.amort_amount|money_html:false|raw}}</td>
<td>{{$line.trans_label}} <td>{{$line.trans_label}}
{{if $line.line_label != null && $line.line_label != $line.trans_label}} - {{$line.line_label}}{{/if}} {{if $line.line_label != null && $line.line_label != $line.trans_label}} - {{$line.line_label}}{{/if}}
</td> </td>
<td><a href={{$compte_url}}>{{$line.account_code}}</a></td> <td><a href="{{$compte_url}}">{{$line.account_code}}</a></td>
<td>{{$line.account_label}}</td> <td>{{$line.account_label}}</td>
<td> <td>
{{:linkbutton label="Attacher" href="attach_amort.html?amort_line_id=%d&immo_line_id=%d"|args:$line.amort_line_id:$_GET.immo_line_id shape="plus"}} {{if $_GET.init == null}}
{{:linkbutton label="Attacher" href="attach_amort.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$_GET.immo_line_id:$_GET.immo_doc_id shape="plus"}}
{{elseif $_GET.init}}
{{:linkbutton label="Attacher" href="attach_amort_init.html?amort_line_id=%d&immo_line_id=%d&immo_doc_id=%s"|args:$line.amort_line_id:$_GET.immo_line_id:$_GET.immo_doc_id shape="plus"}}
{{/if}}
</td> </td>
</tr> </tr>
{{/foreach}} {{/foreach}}

144
save_amort.html
View file

@ -3,6 +3,7 @@
{{* {{*
Créer une écriture d'amortissement Créer une écriture d'amortissement
@param immo_line_id : id de la ligne d'immobilisation @param immo_line_id : id de la ligne d'immobilisation
@param immo_doc_id : id du doc associé à l'immo
*}} *}}
{{* Infos de l'immobilisation *}} {{* Infos de l'immobilisation *}}
@ -11,7 +12,7 @@
line.debit as montant, line.debit as montant,
line.id_project as project_id, line.id_project as project_id,
line.label as line_label, line.label as line_label,
trans.id as trans_id, trans.id as immo_trans_id,
trans.label, trans.label,
trans.date, trans.date,
account.code as account_code account.code as account_code
@ -21,106 +22,90 @@
LEFT JOIN acc_projects AS project ON line.id_project = project.id LEFT JOIN acc_projects AS project ON line.id_project = project.id
WHERE line.id = :line_id; WHERE line.id = :line_id;
:line_id = $_GET.immo_line_id|intval :line_id = $_GET.immo_line_id|intval
assign=ligne_immo assign="ligne_immo"
}} }}
{{else}} {{else}}
{{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{:error message="Immobilisation non trouvée"}}
{{/select}} {{/select}}
{{:assign date_debut=$ligne_immo.date}} {{:assign date_debut=$ligne_immo.date}}
{{:assign var="amort_label" value="Amortissement %s"|args:$ligne_immo.label}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} {{#load id=$_GET.immo_doc_id|intval}}
{{:assign duree=$duration}}
{{if $date_mes != null}}
{{:assign date_debut=$date_mes}}
{{/if}}
{{:assign status=$status}}
{{:assign amort_label=$label|or:$ligne_immo.label}}
{{if $amount != null}}
{{:assign var="ligne_immo.montant" value=$amount}}
{{/if}}
{{else}}
{{:error message="Informations de l'immobilisation « %s » non trouvées ; vous devez d'abord les renseigner"|args:$ligne_immo.label}}
{{/load}}
{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $amort_label}}
{{:assign amort_label=$amort_label|cat:" — "|cat:$ligne_immo.line_label}} {{:assign amort_label=$amort_label|cat:" — "|cat:$ligne_immo.line_label}}
{{/if}} {{/if}}
{{:assign var="amort_label" value="Amortissement %s"|args:$amort_label}}
{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}}
{{:assign duree=$duration}}
{{:assign date_debut=$date}}
{{:assign status=$status}}
{{else}}
{{:error message="Vous devez renseigner la date de mise en service et la durée d'immobilisation"}}
{{/load}}
{{if $status == "amortized" || $status == "archived"}} {{if $status == "amortized" || $status == "archived"}}
{{:error message="Cette immobilisation est complètement amortie ; il est impossible d'ajouter une écriture d'amortissement"}} {{:error message="Cette immobilisation est complètement amortie ; il est impossible d'ajouter une écriture d'amortissement"}}
{{/if}} {{/if}}
{{* chercher des écritures liées à l'immo courante au crédit du même compte {{*
chercher des écritures liées à l'immo courante au crédit du même compte
et déduire leur montant de celui de l'immo et déduire leur montant de celui de l'immo
*}} *}}
{{:assign total_credits=0}} {{:assign total_credits=0}}
{{#select {{#load
CASE links.id_related = :immo_trans_id type="immo_link"
WHEN true THEN links.id_transaction where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $_GET.immo_doc_id|intval
WHEN false THEN links.id_related }}
END as other_id, {{if $amount == null}}
line.credit {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id;
FROM acc_transactions AS trans :credit_line_id=$credit_line_id
INNER JOIN acc_transactions_links as links
ON (trans.id = links.id_transaction OR trans.id = links.id_related)
INNER JOIN acc_transactions_lines AS line on line.id_transaction = other_id
INNER JOIN acc_accounts AS acc ON line.id_account = acc.id
WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account;
:immo_trans_id=$ligne_immo.trans_id
:account=$ligne_immo.account_code
}} }}
{{:assign total_credits="%d+%d"|math:$total_credits:$credit}} {{:assign total_credits="%d+%d"|math:$total_credits:$credit}}
{{/select}} {{/select}}
{{else}}
{{:assign total_credits="%d+%d"|math:$total_credits:$amount}}
{{/if}}
{{/load}}
{{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}} {{:assign var="ligne_immo.montant" value="%d-%d"|math:$ligne_immo.montant:$total_credits}}
{{:assign solde=$ligne_immo.montant}} {{:assign solde=$ligne_immo.montant}}
{{* chercher des écritures d'amortissement liées à l'immobilisation *}} {{* chercher des écritures d'amortissement liées à la ligne d'immobilisation *}}
{{#select {{#load
l_amort.credit as amort_amount, type="amort_link"
l_amort.label as amort_label, where="$$.immo_doc_id = :immo_doc_id"
l_amort.id as amort_line_id, order="$$.date"
CASE WHEN links.id_related = t_immo.id :immo_doc_id=$_GET.immo_doc_id|intval
THEN links.id_transaction }}
ELSE links.id_related {{#select
END as amort_trans_id, line.credit,
trans.date as amort_date, trans.date as amort_date,
trans.label as trans_label,
trans.id_year as amort_year,
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
FROM acc_transactions_lines as l_immo FROM acc_transactions_lines AS line
INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id
INNER JOIN acc_transactions_links as links INNER join acc_accounts AS account on line.id_account = account.id
ON (t_immo.id = links.id_transaction OR t_immo.id = links.id_related) WHERE line.id = :amort_line_id
INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction ;
INNER join acc_transactions as trans on l_amort.id_transaction = trans.id :amort_line_id = $amort_line_id
INNER join acc_accounts as account on l_amort.id_account = account.id
WHERE
l_immo.id = :line_id
AND account.code LIKE '28%'
ORDER BY trans.date;
:line_id = $_GET.immo_line_id|intval
assign="amort_line" assign="amort_line"
}}
{{#load type="link"
where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id"
order="$$.date"
assign="line"
:immo_line_id=$_GET.immo_line_id|intval :amort_trans_id=$amort_line.amort_trans_id
}} }}
{{if $line.amort_line_id == $amort_line.amort_line_id}} {{:assign var="amort_line.amort_amount" value=$amount|or:$credit}}
{{:assign var="linked_amort." value=$amort_line}} {{:assign var="linked_amort.%s_%d"|args:$amort_date:$id value=$amort_line}}
{{/if}} {{/select}}
{{else}} {{/load}}
{{:assign var="linked_amort." value=$amort_line}}
{{/load}}
{{/select}}
{{:assign total_amort=0}} {{:assign total_amort=0}}
{{:assign valeur_residuelle=$ligne_immo.montant}} {{:assign valeur_residuelle=$ligne_immo.montant}}
{{#foreach from=$linked_amort}} {{#foreach from=$linked_amort|ksort item="line"}}
{{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$line.amort_amount}}
{{:assign total_amort="%d+%d"|math:$total_amort:$amort_amount}} {{:assign total_amort="%d+%d"|math:$total_amort:$line.amort_amount}}
{{:assign date_debut=$amort_date}} {{:assign date_debut=$line.amort_date}}
{{:assign code_amort=$account_code}} {{:assign code_amort=$line.account_code}}
{{:assign amort_account_label=$account_label}} {{:assign amort_account_label=$line.account_label}}
{{:assign amort_label=$amort_label}}
{{/foreach}} {{/foreach}}
{{if $valeur_residuelle == 0}} {{if $valeur_residuelle == 0}}
@ -221,7 +206,7 @@
}} }}
{{if $account_ok == null}} {{if $account_ok == null}}
{{:assign compte=$credit_account|implode:""}} {{:assign compte=$credit_account|implode:""}}
{{:redirect url="add_account.html?account=%s&chart=%s&immo_line_id=%s"|args:$compte:$selected_chart:$_GET.immo_line_id}} {{:redirect url="add_account.html?account=%s&chart=%s"|args:$compte:$selected_chart}}
{{/if}} {{/if}}
{{* vérifier que le montant ne dépasse pas le solde restant *}} {{* vérifier que le montant ne dépasse pas le solde restant *}}
@ -256,7 +241,7 @@
date=$_POST.date_amort date=$_POST.date_amort
label=$_POST.designation label=$_POST.designation
lines=$lines lines=$lines
linked_transactions=$ligne_immo.trans_id|intval linked_transactions=$ligne_immo.immo_trans_id|intval
}} }}
{{* enregistrer la liaison des lignes *}} {{* enregistrer la liaison des lignes *}}
@ -275,14 +260,13 @@
{{if $amort_trans_id != null}} {{if $amort_trans_id != null}}
{{:save {{:save
key=""|uuid key=""|uuid
type="link" type="amort_link"
immo_line_id=$_GET.immo_line_id|intval immo_doc_id=$_GET.immo_doc_id|intval
amort_line_id=$amort_line_id|intval amort_line_id=$amort_line_id|intval
amort_trans_id=$result.id
}} }}
{{/if}} {{/if}}
{{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_line_id}} {{:redirect force="amortization.html?immo_line_id=%s&immo_doc_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_line_id:$_GET.immo_doc_id}}
{{/form}} {{/form}}
{{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}} {{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}}