amélioration classification immobilisations

This commit is contained in:
Jean-Christophe Engel 2025-01-09 18:51:49 +01:00
parent c943c9d3e6
commit 3ef33e15e3
2 changed files with 6 additions and 0 deletions

View File

@ -31,6 +31,7 @@
{{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}} {{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}}
{{/foreach}} {{/foreach}}
{{:assign condition=$condition|cat:"0)"}} {{:assign condition=$condition|cat:"0)"}}
{{:assign condition=$condition|cat:" AND debit > 0"}}
{{#select {{#select
trans.id as trans_id, trans.id as trans_id,
@ -55,6 +56,7 @@
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$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 compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}}
{{:assign duration=null}} {{:assign duration=null}}
{{* 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_id|intval}}
{{:assign duration=$duration}} {{:assign duration=$duration}}
{{if $noamort}} {{if $noamort}}
@ -92,6 +94,7 @@
}} }}
{{if $amort_amount == null}} {{if $amort_amount == null}}
{{:assign exist_amort=false}} {{:assign exist_amort=false}}
{{:assign amort_amount=0}}
{{else}} {{else}}
{{:assign amort_amount=$amort_amount}} {{:assign amort_amount=$amort_amount}}
{{:assign exist_amort=true}} {{:assign exist_amort=true}}

View File

@ -31,6 +31,7 @@
{{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}} {{:assign condition=$condition|cat:" account.code LIKE "|cat:$quote|cat:$code|cat:"%"|cat:$quote|cat:" OR "}}
{{/foreach}} {{/foreach}}
{{:assign condition=$condition|cat:"0)"}} {{:assign condition=$condition|cat:"0)"}}
{{:assign condition=$condition|cat:" AND debit > 0"}}
{{#select {{#select
trans.id as trans_id, trans.id as trans_id,
@ -55,6 +56,7 @@
{{:assign trans_url="%s/acc/transactions/details.php?id=%s"|args:$admin_url:$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 compte_url="%s/acc/accounts/journal.php?id=%s&year=%s"|args:$admin_url:$account_id:$trans_id_year}}
{{:assign duration=null}} {{:assign duration=null}}
{{* 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_id|intval}}
{{:assign duration=$duration}} {{:assign duration=$duration}}
{{if $noamort}} {{if $noamort}}
@ -92,6 +94,7 @@
}} }}
{{if $amort_amount == null}} {{if $amort_amount == null}}
{{:assign exist_amort=false}} {{:assign exist_amort=false}}
{{:assign amort_amount=0}}
{{else}} {{else}}
{{:assign amort_amount=$amort_amount}} {{:assign amort_amount=$amort_amount}}
{{:assign exist_amort=true}} {{:assign exist_amort=true}}