diff --git a/amortization.html b/amortization.html index cf162a2..710bb6d 100644 --- a/amortization.html +++ b/amortization.html @@ -3,10 +3,16 @@ {{* Lister les écritures d'amortissement associées à une immobilisation @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 *}} -{{* 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 line.id as immo_line_id, line.debit as montant, @@ -14,167 +20,113 @@ trans.id as immo_trans_id, trans.label as label, trans.date, - account.code as account_code + 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 = :line_id; - :line_id = $_GET.immo_line_id|intval - assign=ligne_immo + :line_id = $info_immo.line + assign="ligne_immo" }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/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}} -{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} - {{:assign duree=$duration}} - {{:assign date_debut=$date}} - {{:assign status=$status}} -{{/load}} +{{:assign date_debut=$info_immo.date_mes|or:$info_immo.date_achat|or:$ligne_immo.date}} +{{:assign label_immo=$info_immo.label|or:$ligne_immo.label}} +{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $label_immo}} + {{:assign label_immo=$label_immo|cat:" — "|cat:$ligne_immo.line_label}} +{{/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"}} {{/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 *}} {{:assign total_credits=0}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - 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}} -{{/select}} +{{#load type="immo_link" where="$$.immo_doc_id=:immo_doc_id" :immo_doc_id=$_GET.immo_doc_id|intval}} + {{if $amount == null}} + {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; + :credit_line_id=$credit_line_id + }} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{/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 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 *}} -{{#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"}} +{{if $info_immo.status == "amortized"}} {{:assign amort_amount=$ligne_immo.montant}} {{:assign valeur_residuelle=0}} {{else}} {{:assign valeur_residuelle=$ligne_immo.montant}} - {{#foreach from=$linked_amort}} - {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} - {{/foreach}} {{/if}} -{{* Autres amortissements non rattachés *}} -{{:include file="_get_config.html" keep="module.config"}} -{{:assign filter_condition=" NOT ("}} -{{#foreach from=$module.config.filters item="filter"}} - {{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}} - {{:assign filter_condition=$filter_condition|cat:" trans.label LIKE "|cat:$filter|cat:" OR "}} -{{/foreach}} -{{:assign filter_condition=$filter_condition|cat:"0)"}} - -{{:assign autres_amortissements=false}} -{{#select - line.id_transaction AS amort_trans_id - 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) AND !filter_condition - ORDER BY trans.date, trans.label; - !filter_condition=$filter_condition - assign="amort" +{{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} +{{#load type="amort_link" + where="$$.immo_doc_id = :immo_doc_id" + :immo_doc_id = $_GET.immo_doc_id|intval }} - {{* 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 + line.id as amort_line_id, + 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 ; - :id_amort=$amort.amort_trans_id + :amort_line_id = $amort_line_id + assign="amort_line" }} - {{* voir s'il existe un doc associé à une ligne de l'amortissement *}} - {{:assign keep=true}} - {{#load type="link" - where="$$.amort_trans_id = :amort_trans_id" - :amort_trans_id = $amort.amort_trans_id - }} - {{if $amort_line_id == $amort.amort_line_id}} - {{:assign keep=false}} - {{:break}} - {{/if}} - {{else}} - {{:assign keep=false}} - {{/load}} - {{if $keep}} - {{:assign autres_amortissements=true}} - {{/if}} - {{else}} - {{:assign autres_amortissements=true}} + {{: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}} -{{/select}} +{{/load}} + +{{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} + {{* 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 + 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; + }} + {{* cette ligne d'amortissement a-t-elle un doc associé ? *}} + {{#load type="amort_link" + where="$$.amort_line_id = :amort_line_id" + :amort_line_id = $amort_line_id + }} + {{else}} + {{:assign autres_amortissements=true}} + {{/load}} + {{/select}} +{{/if}} {{:admin_header title="Liste des amortissements" custom_css="./style.css" current="module_amortization"}} @@ -200,16 +152,16 @@ {{if $_GET.ok}} {{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"}} - {{: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"}} {{:assign msg="Amortissement enregistré"}} {{/if}}

{{$msg}}

{{elseif $_GET.err}} {{if $_GET.msg|match:"attach"}} - {{:assign msg="Échec attachement"}} + {{:assign msg="Échec attachement amortissement"}} {{elseif $_GET.msg|match:"amortissement"}} {{:assign msg="Échec enregistrement amortissement"}} {{/if}} @@ -222,7 +174,7 @@

{{:linkbutton 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" class="main" }} @@ -238,14 +190,22 @@

Immobilisation
-
#{{$ligne_immo.immo_trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}
-
Montant
+
#{{$ligne_immo.immo_trans_id}} {{$label_immo}}
+
Compte d'immobilisation
+
{{$ligne_immo.account_code}} — {{$ligne_immo.account_label}}
+
Montant de l'immobilisation
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
+ {{if $total_credits > 0}} +
Montant des avoirs
+
{{"%f"|math:$total_credits|money_currency_html:false|raw}}
+
Montant à amortir
+
{{"%f"|math:$solde|money_currency_html:false|raw}}
+ {{/if}}
Début d'amortissement
{{$date_debut|date_short}}
- {{if $duree != null}} + {{if $info_immo.duration != null}}
Durée
-
{{$duree}} ans
+
{{$info_immo.duration}} ans
{{/if}} {{if $valeur_residuelle > 0}}
Montant des amortissements
@@ -253,9 +213,9 @@
Valeur nette comptable
{{$valeur_residuelle|money_currency_html:false|raw}}
{{/if}} - {{if $duree != null && $valeur_residuelle > 0}} + {{if $info_immo.duration != null && $valeur_residuelle > 0}}
Annuité estimée
-
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$duree|money_currency_html:false|raw}}
+
{{"min(%d, %f/%d)"|math:$valeur_residuelle:$ligne_immo.montant:$info_immo.duration|money_currency_html:false|raw}}
{{/if}}
@@ -277,13 +237,13 @@ - {{#foreach from=$linked_amort item="line"}} + {{#foreach from=$linked_amort|ksort item="line"}} {{* données de l'écriture *}} {{: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}} - #{{$line.amort_trans_id}} + #{{$line.amort_trans_id}} {{$line.amort_date|date_short}} {{"%f"|math:$line.amort_amount|money_html:false|raw}} {{"%f"|math:$solde|money_html:false|raw}} @@ -293,10 +253,10 @@ — {{$line.amort_line_label}} {{/if}} - {{$line.account_code}} + {{$line.account_code}} {{$line.account_label}} - {{: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"}} {{/foreach}} @@ -308,13 +268,10 @@ {{/if}} {{if $_GET.type_immo == null || $_GET.type_immo != "amortized"}} - - {{* Autres amortissements non rattachés *}} - {{if $autres_amortissements}}

- Il existe des écritures d'amortissement qui ne sont pas rattachées à une immobilisation !
- Utilisez le bouton « Rattacher une écriture » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation. + Il y a des écritures d'amortissement qui ne sont pas rattachées à une immobilisation !
+ Utilisez le bouton « Rattacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.

{{/if}} {{/if}} diff --git a/other_amortizations.html b/other_amortizations.html index 91b379a..ec439b7 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -4,6 +4,7 @@ Lister les écritures d'amortissement indépendantes et proposer des les attacher à l'immo sélectionnée @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 *}} @@ -17,11 +18,19 @@ assign=ligne_immo }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/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}} {{:assign filter_condition=" NOT ("}} {{#foreach from=$module.config.filters item="filter"}} @@ -54,46 +63,26 @@ !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 des lignes d'immo liées à cette ligne d'amortissement *}} + {{:assign amort_amount=0}} + {{:assign keep_amort=true}} + {{#load type="amort_link" + where="$$.amort_line_id = :amort_line_id" + :amort_line_id=$amort.amort_line_id|intval + assign="amort_link" }} - {{* voir s'il existe un doc associé à une ligne de l'amortissement *}} - {{:assign keep=true}} - {{#load type="link" - where="$$.amort_trans_id = :amort_trans_id" - :amort_trans_id = $amort.amort_trans_id - }} - {{if $amort_line_id == $amort.amort_line_id}} - {{:assign keep=false}} - {{:break}} - {{/if}} + {{if $amort_link.amount == null || $amort_link.amount == 0}} + {{:assign amort_amount=$amort.amort_amount}} + {{:assign keep_amort=false}} {{else}} - {{:assign keep=false}} - {{/load}} - {{if $keep}} - {{:assign var="autres_amortissements." value=$amort}} + {{:assign amort_amount="%d+%d"|math:$amort_amount:$amort_link.amount}} {{/if}} {{else}} - {{:assign var="autres_amortissements." value=$amort}} - {{/select}} + {{* pas de ligne d'immo liée à cette ligne d'amort => garder cette ligne d'amortissement *}} + {{/load}} + {{if $keep_amort && $amort_amount < $amort.amort_amount}} + {{:assign var="free_amort_lines." value=$amort}} + {{/if}} {{/select}} {{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}} @@ -106,7 +95,7 @@ subcurrent="other" subsubcurrent="amortization" type_immo="other" - autres_amort=$autres_amortissements + autres_amort=$free_amort_lines }} {{/if}} @@ -116,13 +105,13 @@
- {{: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"}}
-{{if $autres_amortissements != null}} +{{if $free_amort_lines != null}}
-

Immobilisation « {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}} »

+

Immobilisation « {{$label_immo}} »

@@ -136,20 +125,24 @@ - {{#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 compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$line.account_id:$line.amort_year}} - + - + {{/foreach}} diff --git a/save_amort.html b/save_amort.html index 4aa8e64..6a8459c 100644 --- a/save_amort.html +++ b/save_amort.html @@ -3,6 +3,7 @@ {{* Créer une écriture d'amortissement @param immo_line_id : id de la ligne d'immobilisation + @param immo_doc_id : id du doc associé à l'immo *}} {{* Infos de l'immobilisation *}} @@ -11,7 +12,7 @@ line.debit as montant, line.id_project as project_id, line.label as line_label, - trans.id as trans_id, + trans.id as immo_trans_id, trans.label, trans.date, account.code as account_code @@ -21,106 +22,90 @@ LEFT JOIN acc_projects AS project ON line.id_project = project.id WHERE line.id = :line_id; :line_id = $_GET.immo_line_id|intval - assign=ligne_immo + assign="ligne_immo" }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} + {{:error message="Immobilisation non trouvée"}} {{/select}} {{: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}} {{/if}} - -{{#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}} +{{:assign var="amort_label" value="Amortissement %s"|args:$amort_label}} {{if $status == "amortized" || $status == "archived"}} {{:error message="Cette immobilisation est complètement amortie ; il est impossible d'ajouter une écriture d'amortissement"}} {{/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 *}} {{:assign total_credits=0}} -{{#select - CASE links.id_related = :immo_trans_id - WHEN true THEN links.id_transaction - WHEN false THEN links.id_related - 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.trans_id - :account=$ligne_immo.account_code +{{#load + type="immo_link" + where="$$.immo_doc_id = :immo_doc_id" :immo_doc_id = $_GET.immo_doc_id|intval }} - {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} -{{/select}} + {{if $amount == null}} + {{#select credit FROM acc_transactions_lines WHERE id = :credit_line_id; + :credit_line_id=$credit_line_id + }} + {{:assign total_credits="%d+%d"|math:$total_credits:$credit}} + {{/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 solde=$ligne_immo.montant}} -{{* chercher des écritures d'amortissement liées à l'immobilisation *}} -{{#select - l_amort.credit as amort_amount, - l_amort.label as amort_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 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" -}} - {{#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 +{{* chercher des écritures d'amortissement liées à la ligne d'immobilisation *}} +{{#load + type="amort_link" + where="$$.immo_doc_id = :immo_doc_id" + order="$$.date" + :immo_doc_id=$_GET.immo_doc_id|intval }} - {{if $line.amort_line_id == $amort_line.amort_line_id}} - {{:assign var="linked_amort." value=$amort_line}} - {{/if}} - {{else}} - {{:assign var="linked_amort." value=$amort_line}} - {{/load}} -{{/select}} - + {{#select + line.credit, + trans.date as amort_date, + 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}} + {{/select}} +{{/load}} {{:assign total_amort=0}} {{:assign valeur_residuelle=$ligne_immo.montant}} -{{#foreach from=$linked_amort}} - {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$amort_amount}} - {{:assign total_amort="%d+%d"|math:$total_amort:$amort_amount}} - {{:assign date_debut=$amort_date}} - {{:assign code_amort=$account_code}} - {{:assign amort_account_label=$account_label}} - {{:assign amort_label=$amort_label}} +{{#foreach from=$linked_amort|ksort item="line"}} + {{:assign valeur_residuelle="%d-%d"|math:$valeur_residuelle:$line.amort_amount}} + {{:assign total_amort="%d+%d"|math:$total_amort:$line.amort_amount}} + {{:assign date_debut=$line.amort_date}} + {{:assign code_amort=$line.account_code}} + {{:assign amort_account_label=$line.account_label}} {{/foreach}} {{if $valeur_residuelle == 0}} @@ -221,7 +206,7 @@ }} {{if $account_ok == null}} {{: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}} {{* vérifier que le montant ne dépasse pas le solde restant *}} @@ -256,7 +241,7 @@ date=$_POST.date_amort label=$_POST.designation lines=$lines - linked_transactions=$ligne_immo.trans_id|intval + linked_transactions=$ligne_immo.immo_trans_id|intval }} {{* enregistrer la liaison des lignes *}} @@ -275,14 +260,13 @@ {{if $amort_trans_id != null}} {{:save key=""|uuid - type="link" - immo_line_id=$_GET.immo_line_id|intval + type="amort_link" + immo_doc_id=$_GET.immo_doc_id|intval amort_line_id=$amort_line_id|intval - amort_trans_id=$result.id }} {{/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}} {{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}}
#{{$line.amort_trans_id}}#{{$line.amort_trans_id}} {{$line.trans_date|date_short}} {{"%f"|math:$line.amort_amount|money_html:false|raw}} {{$line.trans_label}} {{if $line.line_label != null && $line.line_label != $line.trans_label}} - {{$line.line_label}}{{/if}} {{$line.account_code}}{{$line.account_code}} {{$line.account_label}} - {{: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}}