diff --git a/_archives.html b/_archives.html index 671ceb4..fafad3b 100644 --- a/_archives.html +++ b/_archives.html @@ -66,10 +66,12 @@ !condition=$condition }} {{:assign montant_immo=$debit}} - {{* voir si l'immo est prise en charge *}} {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} {{:assign status=$status}} + {{if $amount != null}} + {{:assign montant_immo=$amount}} + {{/if}} {{else}} {{:assign amortissable="nsp"}} {{:assign status="unknown"}} @@ -78,46 +80,32 @@ {{:continue}} {{/if}} - {{* 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 solde_immo=$montant_immo}} - {{:assign credit_immo=null}} + {{* voir s'il existe une écriture liée qui solde l'immobilisation *}} {{#select - CASE links.id_related = :immo_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 - INNER JOIN acc_transactions AS trans2 ON trans2.id = other_id - WHERE trans.id = :immo_id AND line.credit > 0 AND acc.code = :account - ORDER BY trans2.date, trans2.id + trans.date as exit_date + FROM acc_transactions_links AS link + INNER JOIN acc_transactions AS trans ON + (CASE + WHEN link.id_transaction = :trans_id THEN link.id_related + WHEN link.id_related = :trans_id THEN link.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 line.credit = :montant_immo + AND acc.code = :account_code ; - :immo_id=$trans_id - :account=$account_code - assign="credit_immo." + :trans_id = $trans_id + :montant_immo = $montant_immo + :account_code = $account_code }} - {{:assign solde_immo="%d-%d"|math:$solde_immo:$credit}} - {{/select}} - - {{if $solde_immo == 0}} {{:assign status="archived"}} - {{/if}} + {{:assign exit_date=$exit_date}} + {{/select}} {{if $status != "archived"}} {{:continue}} {{/if}} - {{:assign nb=$credit_immo|count}} - {{:assign nb="%d-1"|math:$nb}} - {{:assign var="last_credit" from="credit_immo.%d"|args:$nb}} - {{:assign montant_immo=$last_credit.credit}} - {{: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}} {{:assign nb_immo="%d+1"|math:$nb_immo}} @@ -128,7 +116,12 @@ {{* voir s'il y a une écriture de cession associée à cette immo *}} {{#select trans.id, - line.debit + trans.label, + trans.date, + line.id, + line.debit, + acc.code, + acc.label FROM acc_transactions_links AS link INNER JOIN acc_transactions AS trans ON (CASE WHEN link.id_transaction = :trans_id THEN link.id_related @@ -161,9 +154,6 @@ {{if $total_immo != 0}} - - - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} diff --git a/_immobilisations.html b/_immobilisations.html index f26b23f..aacdc34 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -49,13 +49,14 @@ {{:assign nb_immo=0}} {{:assign total_immo = 0}} {{#select - trans.id as immo_trans_id, + trans.id as trans_id, trans.label as trans_label, trans.date as trans_date, - line.id as immo_line_id, + line.id as immo_id, line.debit AS debit, account.id as account_id, account.code as account_code, + account.label as account_label, trans.id_year as trans_id_year FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id @@ -65,15 +66,18 @@ ORDER BY trans.date DESC; !condition=$condition }} - {{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$immo_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}} {{:assign duration=null}} {{:assign montant_immo=$debit}} {{* voir si l'immo est prise en charge *}} - {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id|intval}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} {{:assign duration=$duration}} {{:assign status=$status}} + {{if $amount != null}} + {{:assign montant_immo=$amount}} + {{/if}} {{else}} {{:assign amortissable="nsp"}} {{:assign status="unknown"}} @@ -82,77 +86,57 @@ {{:continue}} {{/if}} - {{* 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 - *}} + {{* voir s'il existe une écriture qui solde l'immobilisation *}} {{#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=$immo_trans_id - :account=$account_code - }} - {{:assign montant_immo="%d-%d"|math:$montant_immo:$credit}} - {{/select}} - {{if $montant_immo == 0}} + line.id AS line + FROM acc_transactions_lines AS line + INNER JOIN acc_accounts AS acc ON acc.id = line.id_account + INNER JOIN acc_transactions_lines AS line2 ON line2.id_account = acc.id + WHERE + line.id = :line_id + AND line2.credit = :montant_immo; + :line_id = $immo_id|intval + :montant_immo = $montant_immo + }} {{:assign status="archived"}} - {{/if}} + {{/select}} {{if $status == "archived"}} {{:continue}} {{/if}} {{* voir s'il existe des écritures d'amortissement associées *}} - {{:assign amort_lines=null}} {{#select - (l_amort.credit) as amount, + sum(l_amort.credit) as amort_amount, CASE links.id_related = t_immo.id WHEN true THEN links.id_transaction WHEN false THEN links.id_related - END as amort_trans_id, - l_amort.id AS amort_line_id + END as amort_trans_id 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) + 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_accounts AS account ON l_amort.id_account = account.id - WHERE l_immo.id = :line_id AND l_amort.credit <> 0 AND account.code LIKE '28%'; - :line_id = $immo_line_id|intval - assign="amort_lines." + WHERE + l_immo.id = :line_id + AND + l_amort.credit <> 0 + AND + account.code LIKE '28%'; + :line_id = $immo_id|intval }} - {{/select}} - - {{:assign amort_amount=0}} - {{#foreach from=$amort_lines item="elem"}} - {{* voir s'il existe un doc associé *}} - {{#load type="link" - where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id" - :immo_line_id = $immo_line_id - :amort_trans_id = $elem.amort_trans_id - assign="link" - }} - {{if $link.amort_line_id == $elem.amort_line_id}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$amount}} - {{/if}} + {{if $amort_amount == null}} + {{:assign exist_amort=false}} + {{:assign amort_amount=0}} {{else}} - {{:assign amort_amount="%d+%d"|math:$amort_amount:$amount}} - {{/load}} - {{/foreach}} - - {{if $amort_amount == 0}} - {{:assign exist_amort=false}} - {{else}} - {{:assign exist_amort=true}} - {{:assign amort_amount=$amort_amount}} - {{/if}} + {{:assign exist_amort=true}} + {{:assign amort_amount=$amort_amount}} + {{/if}} + {{/select}} {{* classement par onglet *}} {{if $type_immo == "managed" && $amort_amount >= $montant_immo}}{{:continue}}{{/if}} @@ -165,7 +149,7 @@ {{:assign var="montant" from="sommes_immo.%s"|args:$account_code}} {{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$montant_immo}} - #{{$immo_trans_id}} + #{{$trans_id}} {{$trans_date|date_short}} {{$trans_label}} {{$montant_immo|money_html:false|raw}} @@ -176,13 +160,13 @@ {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo + href="add_infos.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo shape="settings" target="_dialog" }} {{:linkbutton label="Amortissements" - href="amortization.html?immo_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo + href="amortization.html?immo_id=%s&type_immo=%s"|args:$immo_id:$type_immo shape="table" }} @@ -191,9 +175,6 @@ {{if $total_immo != 0}} - - - {{#foreach from=$sommes_immo|ksort key="code" item="value"}} diff --git a/_nav.html b/_nav.html index a7894b5..57a6f51 100644 --- a/_nav.html +++ b/_nav.html @@ -7,7 +7,7 @@ {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "managed" || $type_immo == "other"}}