Ne pas lister amortissements antérieurs mise en service immo
This commit is contained in:
parent
64d4788e76
commit
2b6ac366ec
3 changed files with 15 additions and 6 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{{*
|
||||
lister les amortissement non rattachés à une immo
|
||||
@param filter_condition
|
||||
@param condition
|
||||
*}}
|
||||
{{#select
|
||||
line.id as line_id,
|
||||
|
|
@ -18,9 +18,9 @@
|
|||
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
|
||||
WHERE credit > 0 AND (NOT trans.status & 16) AND !filter_condition
|
||||
WHERE credit > 0 AND (NOT trans.status & 16) AND !condition
|
||||
ORDER BY trans.date, trans.label;
|
||||
!filter_condition=$filter_condition
|
||||
!condition=$condition
|
||||
assign="amort_line"
|
||||
}}
|
||||
{{* voir s'il existe des lignes d'immo liées à cette ligne d'amortissement *}}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,11 @@
|
|||
{{* lister les amortissements non attachés à une immo *}}
|
||||
{{:assign account_filter="28%"|quote_sql}}
|
||||
{{:assign filter_condition="account.code LIKE "|cat:$account_filter}}
|
||||
{{:include file="./_get_free_amort.html" filter_condition=$filter_condition keep="free_amort_lines"}}
|
||||
|
||||
{{:assign date_amort=$date_debut|quote_sql}}
|
||||
{{:assign date_condition="trans.date >= "|cat:$date_amort}}
|
||||
{{:assign condition=$date_condition|cat:" AND "|cat:$filter_condition}}
|
||||
{{:include file="./_get_free_amort.html" condition=$condition keep="free_amort_lines"}}
|
||||
{{/if}}
|
||||
|
||||
{{:admin_header title="Détails de l'immobilisation" custom_css="./style.css" current="module_amortization"}}
|
||||
|
|
|
|||
|
|
@ -29,14 +29,19 @@
|
|||
keep="code_amort"
|
||||
}}
|
||||
{{if $_GET.filter}}
|
||||
{{:assign filter_condition="account.code = "|cat:$code_amort}}
|
||||
{{:assign amort_account=$code_amort|quote_sql}}
|
||||
{{:assign filter_condition="account.code = "|cat:$amort_account}}
|
||||
{{else}}
|
||||
{{:assign account_filter="28%"|quote_sql}}
|
||||
{{:assign filter_condition="account.code LIKE "|cat:$account_filter}}
|
||||
{{/if}}
|
||||
|
||||
{{:assign date_amort=$date_mes|quote_sql}}
|
||||
{{:assign date_condition="trans.date >= "|cat:$date_amort}}
|
||||
{{:assign condition=$date_condition|cat:" AND "|cat:$filter_condition}}
|
||||
|
||||
{{* lister les amortissements non rattachés à une immo *}}
|
||||
{{:include file="./_get_free_amort.html" filter_condition=$filter_condition keep="free_amort_lines"}}
|
||||
{{:include file="./_get_free_amort.html" condition=$condition keep="free_amort_lines"}}
|
||||
|
||||
{{:admin_header title="Amortissements non rattachés" custom_css="./style.css" current="module_amortization"}}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue