Aucune immobilisation
{{/if}} diff --git a/_immobilisations_autres.html b/_immobilisations_autres.html index 1f08e9b..69f2603 100644 --- a/_immobilisations_autres.html +++ b/_immobilisations_autres.html @@ -48,19 +48,6 @@ - {{* vérifier l'existence de la table du module *}} - {{#load limit="1"}} - {{:assign columns="$$.duration as duration, $$.status as status,"}} - {{:assign table_join="LEFT JOIN !table AS info ON $$.line = line.id"}} - {{:assign doc_condition1="($$.status == 'ignored')"}} - {{:assign doc_condition2="$$.status IS NULL"}} - {{else}} - {{:assign columns=""}} - {{:assign table_join=""}} - {{:assign doc_condition1="0"}} - {{:assign doc_condition2="1"}} - {{/load}} - {{* lister les immobilisations *}} {{:assign account_condition="("}} {{#foreach from=$module.config.prefixes item="code"}} @@ -68,6 +55,7 @@ {{:assign account_condition=$account_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}} {{/foreach}} {{:assign account_condition=$account_condition|cat:"0)"}} + {{:assign doc_condition="($$.status == 'ignored')" }} {{if $unhide == null}} {{:assign filter_condition="NOT ("}} @@ -79,9 +67,9 @@ {{else}} {{:assign filter_condition="1"}} {{/if}} - {{:assign filter_condition="("|cat:$doc_condition2|cat:" AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:")"}} + {{:assign filter_condition="($$.status IS NULL AND NOT (trans.status & 16) AND "|cat:$filter_condition|cat:")"}} - {{:assign condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition1|cat:")"}} + {{:assign condition=$account_condition|cat:" AND debit > 0 AND ("|cat:$filter_condition|cat:" OR "|cat:$doc_condition|cat:")"}} {{:assign nb_immo=0}} {{#select @@ -94,17 +82,16 @@ account.id as account_id, account.code as account_code, account.label as account_label, - !columns - trans.id_year as trans_id_year + trans.id_year as trans_id_year, + $$.duration as duration, + $$.status as status FROM acc_transactions AS trans INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id INNER JOIN acc_accounts AS account ON line.id_account = account.id INNER JOIN acc_years AS years ON trans.id_year = years.id - !table_join + LEFT JOIN !table AS info ON $$.line = line.id WHERE !condition ORDER BY trans.date DESC; - !columns=$columns - !table_join=$table_join !table=$module.table !condition=$condition }} diff --git a/add_infos.html b/add_infos.html index 1ee848b..bf0b6be 100644 --- a/add_infos.html +++ b/add_infos.html @@ -9,11 +9,9 @@ {{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_line_id|intval}} {{/load}} {{#select - trans.id as immo_trans_id, - trans.label, + trans.id, trans.date as date_achat, line.debit as montant, - line.label as line_label, acc.code FROM acc_transactions_lines AS line INNER join acc_transactions AS trans ON line.id_transaction = trans.id @@ -39,7 +37,7 @@ WHERE (links.id_transaction = :immo_trans_id or links.id_related = :immo_trans_id) AND line.credit > 0 ; - :immo_trans_id = $ligne_immo.immo_trans_id + :immo_trans_id = $ligne_immo.id }} {{:assign var="linked_transactions.%d."|args:$code value=$linked_id}} {{/select}} @@ -124,7 +122,7 @@ {{if $new_transactions != null}} {{:api method="POST" - path="accounting/transaction/%s/transactions"|args:$ligne_immo.immo_trans_id + path="accounting/transaction/%s/transactions"|args:$ligne_immo.id assign="result" assign_code="result_code" transactions=$new_transactions @@ -142,11 +140,11 @@ {{/form}} {{:form_errors}} -{{:admin_header title="Classer l'immobilisation" custom_css="./style.css" current="module_amortization"}} +{{:admin_header title="Classer l'immobilisation" custom_css=$custom_css current="module_amortization"}} {{* barre de navigation *}} {{if ! $dialog}} - {{:include file="_nav.html" current="index" subcurrent="%s"|args:$_GET.type_immo subsubcurrent="parameter"}} + {{:include file="_nav.html" current="index"}} {{/if}} {{:assign choix_defaut=$_GET.type_immo}} @@ -163,23 +161,6 @@ - classer l'immobilisation - renseigner ou modifier la date de mise en service, les écritures associées ou la durée d'amortissement *}} - -{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$ligne_immo.immo_trans_id}} -