diff --git a/_archives.html b/_archives.html index 4a679bf..56f6b14 100644 --- a/_archives.html +++ b/_archives.html @@ -50,7 +50,7 @@ trans.label as trans_label, trans.date as trans_date, trans.id_year as trans_id_year, - line.id as immo_id, + line.id as immo_line_id, line.label as line_label, line.debit AS debit, account.id as account_id, @@ -69,7 +69,7 @@ {{:assign montant_immo=$debit}} {{* voir si l'immo est prise en charge *}} - {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id|intval}} {{:assign status=$status}} {{else}} {{:assign amortissable="nsp"}} @@ -85,7 +85,7 @@ {{:assign solde_immo=$montant_immo}} {{:assign credit_immo=null}} {{#select - CASE links.id_related = :immo_id + CASE links.id_related = :immo_trans_id WHEN true THEN links.id_transaction WHEN false THEN links.id_related END as other_id, @@ -97,10 +97,10 @@ 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 + WHERE trans.id = :immo_trans_id AND line.credit > 0 AND acc.code = :account ORDER BY trans2.date, trans2.id ; - :immo_id=$trans_id + :immo_trans_id=$trans_id :account=$account_code assign="credit_immo." }} diff --git a/_immobilisations.html b/_immobilisations.html index 92a6022..d78ca56 100644 --- a/_immobilisations.html +++ b/_immobilisations.html @@ -131,9 +131,9 @@ {{* voir s'il existe un doc associé à l'écriture d'amortissement *}} {{#load type="link" where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id" + assign="link" :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}} @@ -172,14 +172,14 @@ {{if ! $exist_amort || $status == "unknown"}} {{: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_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo shape="settings" target="_dialog" }} {{/if}} {{:linkbutton label="Amortissements" - href="amortization.html?immo_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo + href="amortization.html?immo_line_id=%s&type_immo=%s"|args:$immo_line_id:$type_immo shape="table" }} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 05849bb..80b91d0 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -72,7 +72,7 @@ trans.id as trans_id, trans.label as trans_label, trans.date as trans_date, - line.id as immo_id, + line.id as immo_line_id, line.label as line_label, account.id as account_id, account.code as account_code, @@ -91,7 +91,7 @@ {{:assign compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}} {{* voir si l'immo est prise en charge *}} - {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_id|intval}} + {{#load type="immo" where="$$.line = :line_id" :line_id=$immo_line_id|intval}} {{:assign status=$status}} {{else}} {{:assign status="unknown"}} @@ -136,7 +136,7 @@ l_amort.credit <> 0 AND account.code LIKE '28%'; - :line_id = $immo_id|intval + :line_id = $immo_line_id|intval }} {{if $amort_amount != null}} {{:assign ignore=true}} @@ -160,7 +160,7 @@ {{:linkbutton label="Paramètres" - href="add_infos.html?immo_id=%s&type_immo=other"|args:$immo_id + href="add_infos.html?immo_line_id=%s&type_immo=other"|args:$immo_line_id shape="settings" target="_dialog" }} diff --git a/_nav.html b/_nav.html index 2192b2e..57b9dee 100644 --- a/_nav.html +++ b/_nav.html @@ -8,10 +8,10 @@ {{elseif $subsubcurrent == "amortization" && $type_immo == null || $type_immo == "managed" || $type_immo == "other"}} {{/if}} diff --git a/_unfinished.html b/_unfinished.html index 359877a..a222475 100644 --- a/_unfinished.html +++ b/_unfinished.html @@ -102,7 +102,7 @@ trans.id as trans_id, trans.label as trans_label, trans.date as trans_date, - line.id as immo_id, + line.id as immo_line_id, account.id as account_id, account.code as account_code, account.label as account_label, @@ -119,7 +119,7 @@ }} {{* voir si l'écriture a été marquée ignorée *}} {{:assign ignore=false}} - {{#load type="immo" assign="info_immo" where="$$.line = :line_id AND $$.status = 'ignored'" :line_id=$immo_id|intval}} + {{#load type="immo" assign="info_immo" where="$$.line = :line_id AND $$.status = 'ignored'" :line_id=$immo_line_id|intval}} {{:assign ignore=true}} {{/load}} {{if $ignore && $unhide == null}} @@ -163,7 +163,7 @@ {{:linkbutton label="Modifier" - href="ignore.html?immo_id=%s"|args:$immo_id + href="ignore.html?immo_line_id=%s"|args:$immo_line_id shape="edit" target="_dialog" }} diff --git a/add_asset.html b/add_asset.html index a1f0c10..5cbe061 100644 --- a/add_asset.html +++ b/add_asset.html @@ -75,7 +75,7 @@ {{if $account_ok == null}} {{:assign compte=$debit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s&immo_id=%s"|args:$compte:$selected_chart:$_GET.immo_id}} + {{:redirect url="add_account.html?account=%s&chart=%s&immo_line_id=%s"|args:$compte:$selected_chart:$_GET.immo_line_id}} {{/if}} {{:assign debit_account=$debit_account|keys|value:0}} @@ -127,8 +127,8 @@ {{if $status != "unfinished"}} {{* vérifier s'il y a déjà un document avec le même numéro de ligne *}} - {{:assign var="immo_id" value=$result.lines.1.id}} - {{#load where="$$.line = :line_id" :line_id=$immo_id}} + {{:assign var="immo_line_id" value=$result.lines.1.id}} + {{#load where="$$.line = :line_id" :line_id=$immo_line_id}} {{:assign key=$key}} {{else}} {{:assign key=""|uuid}} @@ -139,7 +139,7 @@ key=$key validate_schema="schema.json" type="immo" - line=$immo_id + line=$immo_line_id duration=$duration date=$date_debut status=$status diff --git a/add_infos.html b/add_infos.html index 7b3b924..bf0b6be 100644 --- a/add_infos.html +++ b/add_infos.html @@ -1,12 +1,12 @@ {{* -*- brindille -*- *}} {{* - @param immo_id + @param immo_line_id @param type_immo : managed, amortized, archived, other *}} {{* données de l'immobilisaion *}} -{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} +{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} {{/load}} {{#select trans.id, @@ -17,7 +17,7 @@ INNER join acc_transactions AS trans ON line.id_transaction = trans.id INNER JOIN acc_accounts AS acc ON line.id_account = acc.id WHERE line.id = :line_id; - :line_id = $_GET.immo_id + :line_id = $_GET.immo_line_id assign=ligne_immo }} {{else}} @@ -97,7 +97,7 @@ key=$key validate_schema="schema.json" type="immo" - line=$_GET.immo_id|intval + line=$_GET.immo_line_id|intval duration=$duration date=$date_debut status=$status diff --git a/amortization.html b/amortization.html index 4edf953..342abf3 100644 --- a/amortization.html +++ b/amortization.html @@ -2,16 +2,16 @@ {{* Lister les écritures d'amortissement associées à une immobilisation - @param immo_id : id de la ligne d'immo + @param immo_line_id : id de la ligne d'immo @param type_immo : managed, amortized, archived, others *}} {{* récupérer les infos de l'immobilisation *}} {{#select - line.id as immo_id, + line.id as immo_line_id, line.debit as montant, line.label as line_label, - trans.id as trans_id, + trans.id as immo_trans_id, trans.label as label, trans.date, account.code as account_code @@ -19,16 +19,16 @@ 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_id|intval + :line_id = $_GET.immo_line_id|intval assign=ligne_immo }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{/select}} {{:assign date_debut=$ligne_immo.date}} -{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_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_id|intval}} +{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} {{:assign duree=$duration}} {{:assign date_debut=$date}} {{:assign status=$status}} @@ -43,7 +43,7 @@ *}} {{:assign total_credits=0}} {{#select - CASE links.id_related = :immo_id + CASE links.id_related = :immo_trans_id WHEN true THEN links.id_transaction WHEN false THEN links.id_related END as other_id, @@ -53,8 +53,8 @@ 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_id AND line.credit > 0 AND acc.code = :account; - :immo_id=$ligne_immo.trans_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}} @@ -62,7 +62,7 @@ {{: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 *}} +{{* lister les lignes des écritures d'amortissement liées à l'immobilisation *}} {{#select l_amort.credit as amort_amount, l_amort.label as amort_label, @@ -84,18 +84,17 @@ 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%' + WHERE l_immo.id = :line_id AND account.code LIKE '28%' ORDER BY trans.date; - :line_id = $_GET.immo_id|intval + :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" assign="line" - :immo_line_id=$_GET.immo_id|intval :amort_trans_id=$amort_line.amort_trans_id + :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="linked_amort." value=$amort_line}} @@ -226,7 +225,7 @@

{{:linkbutton label="Sortir du bilan" - href="balance_sheet_exit.html?immo_id=%s&type_immo=%s"|args:$_GET.immo_id:$_GET.type_immo + href="balance_sheet_exit.html?immo_line_id=%s&type_immo=%s"|args:$_GET.immo_line_id:$_GET.type_immo shape="export" class="main" }} @@ -242,7 +241,7 @@

Immobilisation
-
#{{$ligne_immo.trans_id}} {{$ligne_immo.label}}{{if $ligne_immo.line_label != null && $ligne_immo.line_label != $ligne_immo.label}} — {{$ligne_immo.line_label}}{{/if}}
+
#{{$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
{{"%f"|math:$ligne_immo.montant|money_currency_html:false|raw}}
Début d'amortissement
@@ -300,7 +299,7 @@ {{$line.account_code}} {{$line.account_label}} - {{:linkbutton label="Détacher" href="detach_amort.html?amort_id=%d&immo_id=%d"|args:$line.amort_line_id:$ligne_immo.immo_id shape="minus"}} + {{: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"}} {{/foreach}} diff --git a/attach_amort.html b/attach_amort.html index 5d910cb..4770afa 100644 --- a/attach_amort.html +++ b/attach_amort.html @@ -10,11 +10,11 @@ id_transaction FROM acc_transactions_lines WHERE id = :line_id; - :line_id = $_GET.immo_id|intval + :line_id = $_GET.immo_line_id|intval }} {{:assign immo_trans_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_id}} + {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_line_id}} {{/select}} {{* chercher l'écriture d'amortissement *}} @@ -22,11 +22,11 @@ id_transaction FROM acc_transactions_lines WHERE id = :line_id; - :line_id = $_GET.amort_id|intval + :line_id = $_GET.amort_line_id|intval }} - {{:assign amort_id=$id_transaction}} + {{:assign amort_trans_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_id}} + {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_line_id}} {{/select}} {{* chercher les liaisons de l'écriture d'immobilisation *}} @@ -43,7 +43,7 @@ {{/select}} {{* ajouter la nouvelle liaison *}} -{{:assign var="linked_transactions." value=$amort_id}} +{{:assign var="linked_transactions." value=$amort_trans_id}} {{:api method="POST" path="accounting/transaction/%s/transactions"|args:$immo_trans_id @@ -57,18 +57,18 @@ where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id AND $$.amort_line_id = :amort_line_id" - :immo_line_id=$_GET.immo_id|intval - :amort_trans_id = $amort_id - :amort_line_id = $_GET.amort_id|intval + :immo_line_id=$_GET.immo_line_id|intval + :amort_trans_id = $amort_trans_id + :amort_line_id = $_GET.amort_line_id|intval limit=1 }} {{else}} {{:save key=""|uuid type="link" - immo_line_id=$_GET.immo_id|intval - amort_line_id=$_GET.amort_id|intval - amort_trans_id=$amort_id + immo_line_id=$_GET.immo_line_id|intval + amort_line_id=$_GET.amort_line_id|intval + amort_trans_id=$amort_trans_id }} {{/load}} -{{:redirect force="amortization.html?immo_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_id:$amort_id}} +{{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=attach&trans_id=%s"|args:$_GET.immo_line_id:$amort_trans_id}} diff --git a/balance_sheet_exit.html b/balance_sheet_exit.html index e06588f..e7d9ba7 100644 --- a/balance_sheet_exit.html +++ b/balance_sheet_exit.html @@ -2,7 +2,7 @@ {{* Sortir une immobilisation du bilan - @param immo_id : id de la ligne d'immobilisation + @param immo_line_id : id de la ligne d'immobilisation *}} {{* Infos de l'immobilisation *}} @@ -16,17 +16,17 @@ 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_id|intval + :line_id = $_GET.immo_line_id|intval assign="ligne_immo" }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{/select}} {{:assign date_debut=$ligne_immo.date_achat}} {{:assign ts_mes=$ligne_immo.date_achat|strtotime}} -{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} +{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} {{:assign ts_mes=$date|strtotime}} {{:assign date_debut=$date}} {{:assign duree_amort=$duration}} @@ -37,7 +37,7 @@ *}} {{:assign total_credits=0}} {{#select - CASE links.id_related = :immo_id + CASE links.id_related = :immo_trans_id WHEN true THEN links.id_transaction WHEN false THEN links.id_related END as other_id, @@ -47,8 +47,8 @@ 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_id AND line.credit > 0 AND acc.code = :account; - :immo_id=$ligne_immo.trans_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}} @@ -76,14 +76,14 @@ INNER JOIN acc_accounts AS account ON l_amort.id_account = account.id WHERE l_immo.id = :line_id AND account.code LIKE '28%' ; - :line_id = $_GET.immo_id|intval + :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" assign="line" - :immo_line_id=$_GET.immo_id|intval :amort_trans_id=$amort_line.amort_trans_id + :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 amort_number="%d+1"|math:$amort_number}} @@ -223,7 +223,7 @@ {{:error message="Vous devez d'abord enregistrer les amortissements des exercices suivants : %s"|args:$msg_amort}} {{/if}} - {{:redirect to="compute_exit_data.html?immo_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s"|args:$_GET.immo_id:$total_amort:$selected_year:$ts_mes:$ts_debut:$ts_exit:$duree_amort}} + {{:redirect to="compute_exit_data.html?immo_line_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s"|args:$_GET.immo_line_id:$total_amort:$selected_year:$ts_mes:$ts_debut:$ts_exit:$duree_amort}} {{/form}} {{:admin_header title="Sortie de bilan" custom_css="./style.css" current="module_amortization"}} diff --git a/compute_exit_data.html b/compute_exit_data.html index a0fc557..25231bd 100644 --- a/compute_exit_data.html +++ b/compute_exit_data.html @@ -3,7 +3,7 @@ {{* Calculer les valeurs de la sortie et saisir le montant de la cession (optionnel) paramètres : - - immo_id : numéro de ligne de l'écriture d'immobilisation + - immo_line_id : numéro de ligne de l'écriture d'immobilisation - amort_amount : montant des amortissements - year : exercice de la date de sortie de l'immobilisation - date_mes : datede mise en service de l'immobilisation @@ -22,11 +22,11 @@ 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_id|intval + :line_id = $_GET.immo_line_id|intval assign="ligne_immo" }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{/select}} {{* chercher des écritures liées à l'immo courante au crédit du même compte @@ -34,7 +34,7 @@ *}} {{:assign total_credits=0}} {{#select - CASE links.id_related = :immo_id + CASE links.id_related = :immo_trans_id WHEN true THEN links.id_transaction WHEN false THEN links.id_related END as other_id, @@ -44,8 +44,8 @@ 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_id AND line.credit > 0 AND acc.code = :account; - :immo_id=$ligne_immo.trans_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}} @@ -69,7 +69,7 @@ {{/if}} {{/if}} - {{:redirect to="write_exit.html?immo_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s&cession=%s"|args:$_GET.immo_id:$_GET.amort_amount:$_GET.year:$_GET.date_mes:$_GET.date_debut:$_GET.exit_date:$_GET.duree_amort:$_POST.montant_cession}} + {{:redirect to="write_exit.html?immo_line_id=%s&amort_amount=%s&year=%s&date_mes=%s&date_debut=%s&exit_date=%s&duree_amort=%s&cession=%s"|args:$_GET.immo_line_id:$_GET.amort_amount:$_GET.year:$_GET.date_mes:$_GET.date_debut:$_GET.exit_date:$_GET.duree_amort:$_POST.montant_cession}} {{/form}} {{:admin_header title="Sortie du bilan" custom_css="./style.css" current="module_amortization"}} diff --git a/detach_amort.html b/detach_amort.html index 04495dc..c078c3f 100644 --- a/detach_amort.html +++ b/detach_amort.html @@ -10,11 +10,11 @@ id_transaction FROM acc_transactions_lines WHERE id = :line_id; - :line_id = $_GET.immo_id|intval + :line_id = $_GET.immo_line_id|intval }} {{:assign immo_trans_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_id}} + {{:error message="Impossible de trouver l'écriture d'immobilisation de la ligne « %s »"|args:$_GET.immo_line_id}} {{/select}} {{* chercher l'écriture d'amortissement *}} @@ -22,11 +22,11 @@ id_transaction FROM acc_transactions_lines WHERE id = :line_id; - :line_id = $_GET.amort_id|intval + :line_id = $_GET.amort_line_id|intval }} {{:assign amort_id=$id_transaction}} {{else}} - {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_id}} + {{:error message="Impossible de trouver l'écriture d'amortissement de la ligne « %s »"|args:$_GET.amort_line_id}} {{/select}} {{* @@ -61,11 +61,11 @@ where="$$.immo_line_id = :immo_line_id AND $$.amort_trans_id = :amort_trans_id AND $$.amort_line_id = :amort_line_id" - :immo_line_id=$_GET.immo_id|intval + :immo_line_id=$_GET.immo_line_id|intval :amort_trans_id = $amort_id|intval - :amort_line_id = $_GET.amort_id|intval + :amort_line_id = $_GET.amort_line_id|intval }} {{:delete id=$id}} {{/load}} -{{:redirect to="amortization.html?immo_id=%s&ok=1&msg=detach&trans_id=%s"|args:$_GET.immo_id:$amort_id}} +{{:redirect to="amortization.html?immo_line_id=%s&ok=1&msg=detach&trans_id=%s"|args:$_GET.immo_line_id:$amort_id}} diff --git a/ignore.html b/ignore.html index 7cd4cb1..e396a77 100644 --- a/ignore.html +++ b/ignore.html @@ -2,7 +2,7 @@ {{* Marquer la ligne d'écriture « à ignorer » - @param immo_id : numéro de ligne + @param immo_line_id : numéro de ligne *}} {{#select @@ -14,13 +14,13 @@ INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id WHERE line.id = :line_id ; - :line_id = $_GET.immo_id + :line_id = $_GET.immo_line_id assign=ligne_immo }} {{else}} - {{:error message="Il n'y a aucune écriture avec le numéro de ligne %s !"|args:$_GET.immo_id}} + {{:error message="Il n'y a aucune écriture avec le numéro de ligne %s !"|args:$_GET.immo_line_id}} {{/select}} -{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}}{{/load}} +{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}}{{/load}} {{* Traiter l'envoi du formulaire *}} {{#form on="proceed"}} @@ -32,7 +32,7 @@ key=""|uuid validate_schema="schema.json" type="immo" - line=$_GET.immo_id|intval + line=$_GET.immo_line_id|intval duration=$duration date=$ligne_immo.date status=$status diff --git a/other_amortizations.html b/other_amortizations.html index 7018b2e..91b379a 100644 --- a/other_amortizations.html +++ b/other_amortizations.html @@ -3,7 +3,7 @@ {{* Lister les écritures d'amortissement indépendantes et proposer des les attacher à l'immo sélectionnée - @param immo_id = id de la ligne d'immo + @param immo_line_id = id de la ligne d'immo *}} {{* récupérer les infos de l'immobilisation *}} @@ -13,11 +13,11 @@ FROM acc_transactions_lines AS line INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id WHERE line.id = :line_id; - :line_id = $_GET.immo_id|intval + :line_id = $_GET.immo_line_id|intval assign=ligne_immo }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{/select}} {{:include file="_get_config.html" keep="module.config"}} @@ -149,7 +149,7 @@ {{$line.account_code}} {{$line.account_label}} - {{:linkbutton label="Attacher" href="attach_amort.html?amort_id=%d&immo_id=%d"|args:$line.amort_line_id:$_GET.immo_id shape="plus"}} + {{: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"}} {{/foreach}} diff --git a/save_amort.html b/save_amort.html index d34e8c0..f03de67 100644 --- a/save_amort.html +++ b/save_amort.html @@ -2,7 +2,7 @@ {{* Créer une écriture d'amortissement - @param immo_id : id de la ligne d'immobilisation + @param immo_line_id : id de la ligne d'immobilisation *}} {{* Infos de l'immobilisation *}} @@ -20,11 +20,11 @@ INNER JOIN acc_accounts AS account ON line.id_account = account.id LEFT JOIN acc_projects AS project ON line.id_project = project.id WHERE line.id = :line_id; - :line_id = $_GET.immo_id|intval + :line_id = $_GET.immo_line_id|intval assign=ligne_immo }} {{else}} - {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}} + {{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_line_id}} {{/select}} {{:assign date_debut=$ligne_immo.date}} {{:assign var="amort_label" value="Amortissement %s"|args:$ligne_immo.label}} @@ -32,7 +32,7 @@ {{:assign amort_label=$amort_label|cat:" — "|cat:$ligne_immo.line_label}} {{/if}} -{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}} +{{#load type="immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} {{:assign duree=$duration}} {{:assign date_debut=$date}} {{:assign status=$status}} @@ -49,7 +49,7 @@ *}} {{:assign total_credits=0}} {{#select - CASE links.id_related = :immo_id + CASE links.id_related = :immo_trans_id WHEN true THEN links.id_transaction WHEN false THEN links.id_related END as other_id, @@ -59,8 +59,8 @@ 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_id AND line.credit > 0 AND acc.code = :account; - :immo_id=$ligne_immo.trans_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}} @@ -94,14 +94,14 @@ l_immo.id = :line_id AND account.code LIKE '28%' ORDER BY trans.date; - :line_id = $_GET.immo_id|intval + :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_id|intval :amort_trans_id=$amort_line.amort_trans_id + :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="linked_amort." value=$amort_line}} @@ -221,7 +221,7 @@ }} {{if $account_ok == null}} {{:assign compte=$credit_account|implode:""}} - {{:redirect url="add_account.html?account=%s&chart=%s&immo_id=%s"|args:$compte:$selected_chart:$_GET.immo_id}} + {{:redirect url="add_account.html?account=%s&chart=%s&immo_line_id=%s"|args:$compte:$selected_chart:$_GET.immo_line_id}} {{/if}} {{* vérifier que le montant ne dépasse pas le solde restant *}} @@ -259,7 +259,7 @@ linked_transactions=$ligne_immo.trans_id|intval }} - {{:redirect force="amortization.html?immo_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_id}} + {{:redirect force="amortization.html?immo_line_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_line_id}} {{/form}} {{:admin_header title="Ajout amortissement" custom_css="./style.css" current="module_amortization"}} diff --git a/transfer.html b/transfer.html index 02a6f5d..6f5bbcb 100644 --- a/transfer.html +++ b/transfer.html @@ -174,13 +174,13 @@ {{:assign lines_count=$lines|count}} {{:assign lines_count="%d-1"|math:$lines_count}} - {{:assign var="immo_id" from="result.lines.%s.id"|args:$lines_count}} + {{:assign var="immo_line_id" from="result.lines.%s.id"|args:$lines_count}} {{* enregistrer les infos de l'immobilisation *}} {{:save key=""|uuid validate_schema="schema.json" type="immo" - line=$immo_id + line=$immo_line_id duration=$duration date=$date_debut status=$status diff --git a/write_exit.html b/write_exit.html index 60f8be2..a4de1cd 100644 --- a/write_exit.html +++ b/write_exit.html @@ -3,7 +3,7 @@ {{* Enregistrer les écritures de sortie du bilan paramètres : - - immo_id : numéro de ligne de l'écriture d'immobilisation + - immo_line_id : numéro de ligne de l'écriture d'immobilisation - amort_amount : montant des amortissements - year : exercice de la date de sortie de l'immobilisation - date_mes : date de mise en service de l'immobilisation @@ -24,8 +24,8 @@ FROM acc_transactions_lines AS line INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id INNER JOIN acc_accounts AS acc ON line.id_account = acc.id - WHERE line.id = :immo_id; - :immo_id = $_GET.immo_id|intval + WHERE line.id = :immo_line_id; + :immo_line_id = $_GET.immo_line_id|intval assign="ligne_immo" }} {{/select}} @@ -35,7 +35,7 @@ *}} {{:assign total_credits=0}} {{#select - CASE links.id_related = :immo_id + CASE links.id_related = :immo_trans_id WHEN true THEN links.id_transaction WHEN false THEN links.id_related END as other_id, @@ -45,8 +45,8 @@ 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_id AND line.credit > 0 AND acc.code = :account; - :immo_id=$ligne_immo.trans_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}} @@ -258,7 +258,7 @@ key=""|uuid validate_schema="schema.json" type="immo" - line=$_GET.immo_id|intval + line=$_GET.immo_line_id|intval duration=$_GET.duree_amort|intval date=$_GET.date_mes|date:"Y-m-d" status="archived"