Modif pour rétro-compatibilité Paheko 1.3.15 (chgt value => key)
This commit is contained in:
parent
53695b6547
commit
379f523eaa
6 changed files with 15 additions and 16 deletions
|
|
@ -19,7 +19,7 @@
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
{{:assign condition=$condition|cat:"0)"}}
|
{{:assign condition=$condition|cat:"0)"}}
|
||||||
|
|
||||||
{{:assign account_code=$account|keys|value:0}}
|
{{:assign account_code=$account|keys|key:0}}
|
||||||
{{#sql
|
{{#sql
|
||||||
select="code"
|
select="code"
|
||||||
tables="acc_accounts"
|
tables="acc_accounts"
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,7 @@
|
||||||
la forme : code — libellé
|
la forme : code — libellé
|
||||||
*}}
|
*}}
|
||||||
|
|
||||||
{{:assign values=$account|values}}
|
{{:assign label=$account|values|key:0}}
|
||||||
{{:assign label=$values.0}}
|
|
||||||
{{:assign pos=$label|strpos:" "}}
|
{{:assign pos=$label|strpos:" "}}
|
||||||
{{:assign account_code=$label|substr:0:$pos}}
|
{{:assign account_code=$label|substr:0:$pos}}
|
||||||
{{:assign var="account_code.%s"|args:$account_code value=$label}}
|
{{:assign var="account_code.%s"|args:$account_code value=$label}}
|
||||||
|
|
|
||||||
|
|
@ -78,8 +78,8 @@
|
||||||
{{: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_id=%s"|args:$compte:$selected_chart:$_GET.immo_id}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{:assign debit_account=$debit_account|keys|value:0}}
|
{{:assign debit_account=$debit_account|keys|key:0}}
|
||||||
{{:assign credit_account=$credit_account|keys|value:0}}
|
{{:assign credit_account=$credit_account|keys|key:0}}
|
||||||
|
|
||||||
{{* déterminer si le compte d'immo est un compte d'immo en cours *}}
|
{{* déterminer si le compte d'immo est un compte d'immo en cours *}}
|
||||||
{{#foreach from=$module.config.unfinished item="elem"}}
|
{{#foreach from=$module.config.unfinished item="elem"}}
|
||||||
|
|
|
||||||
|
|
@ -184,14 +184,14 @@
|
||||||
{{:assign
|
{{:assign
|
||||||
var="lines."
|
var="lines."
|
||||||
debit=$_POST.montant
|
debit=$_POST.montant
|
||||||
account=$debit_account|keys|value:0
|
account=$debit_account|keys|key:0
|
||||||
id_project=$_GET.project_id
|
id_project=$_GET.project_id
|
||||||
label=$_POST.designation
|
label=$_POST.designation
|
||||||
}}
|
}}
|
||||||
{{:assign
|
{{:assign
|
||||||
var="lines."
|
var="lines."
|
||||||
credit=$_POST.montant
|
credit=$_POST.montant
|
||||||
account=$credit_account|keys|value:0
|
account=$credit_account|keys|key:0
|
||||||
id_project=$_GET.project_id
|
id_project=$_GET.project_id
|
||||||
label=$_POST.designation
|
label=$_POST.designation
|
||||||
}}
|
}}
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@
|
||||||
account=$elem
|
account=$elem
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign debit_account=$account_code|keys|value:0}}
|
{{:assign debit_account=$account_code|keys|key:0}}
|
||||||
{{:assign var="amount" from="_POST.credit_lines.%s"|args:$rang}}
|
{{:assign var="amount" from="_POST.credit_lines.%s"|args:$rang}}
|
||||||
{{:assign var="label" from="_POST.line_labels.%s"|args:$rang}}
|
{{:assign var="label" from="_POST.line_labels.%s"|args:$rang}}
|
||||||
{{:assign
|
{{:assign
|
||||||
|
|
@ -127,7 +127,7 @@
|
||||||
account=$_POST.debit_account
|
account=$_POST.debit_account
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign credit_account=$account_code|keys|value:0}}
|
{{:assign credit_account=$account_code|keys|key:0}}
|
||||||
{{:assign var="amount" from="_POST.debit_lines.%s"|args:0}}
|
{{:assign var="amount" from="_POST.debit_lines.%s"|args:0}}
|
||||||
{{:assign count=$_POST.line_labels|count}}
|
{{:assign count=$_POST.line_labels|count}}
|
||||||
{{:assign count="%d-1"|math:$count}}
|
{{:assign count="%d-1"|math:$count}}
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@
|
||||||
account=$account
|
account=$account
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign amort_account_code=$account_code|keys|value:0}}
|
{{:assign amort_account_code=$account_code|keys|key:0}}
|
||||||
|
|
||||||
{{if $valeur_nette > 0}}
|
{{if $valeur_nette > 0}}
|
||||||
{{* immo non totalement amortie *}}
|
{{* immo non totalement amortie *}}
|
||||||
|
|
@ -87,7 +87,7 @@
|
||||||
account=$_POST.comp_account
|
account=$_POST.comp_account
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign comp_account_code=$account_code|keys|value:0}}
|
{{:assign comp_account_code=$account_code|keys|key:0}}
|
||||||
|
|
||||||
{{:assign libelle="Amortissement complémentaire "|cat:$ligne_immo.label}}
|
{{:assign libelle="Amortissement complémentaire "|cat:$ligne_immo.label}}
|
||||||
{{:assign
|
{{:assign
|
||||||
|
|
@ -113,7 +113,7 @@
|
||||||
account=$_POST.except_account
|
account=$_POST.except_account
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign except_account_code=$account_code|keys|value:0}}
|
{{:assign except_account_code=$account_code|keys|key:0}}
|
||||||
{{:assign libelle="Amortissement exceptionnel "|cat:$ligne_immo.label}}
|
{{:assign libelle="Amortissement exceptionnel "|cat:$ligne_immo.label}}
|
||||||
{{:assign
|
{{:assign
|
||||||
var="lines."
|
var="lines."
|
||||||
|
|
@ -153,7 +153,7 @@
|
||||||
account=$_POST.immo_account
|
account=$_POST.immo_account
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign immo_account_code=$account_code|keys|value:0}}
|
{{:assign immo_account_code=$account_code|keys|key:0}}
|
||||||
{{:assign libelle="Sortie du bilan de "|cat:$ligne_immo.label}}
|
{{:assign libelle="Sortie du bilan de "|cat:$ligne_immo.label}}
|
||||||
{{:assign
|
{{:assign
|
||||||
var="lines."
|
var="lines."
|
||||||
|
|
@ -175,7 +175,7 @@
|
||||||
account=$_POST.vnc_account
|
account=$_POST.vnc_account
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign vnc_account_code=$account_code|keys|value:0}}
|
{{:assign vnc_account_code=$account_code|keys|key:0}}
|
||||||
{{:assign
|
{{:assign
|
||||||
var="lines."
|
var="lines."
|
||||||
account=$vnc_account_code
|
account=$vnc_account_code
|
||||||
|
|
@ -206,13 +206,13 @@
|
||||||
account=$_POST.creance_account
|
account=$_POST.creance_account
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign creance_account=$account_code|keys|value:0}}
|
{{:assign creance_account=$account_code|keys|key:0}}
|
||||||
{{:include
|
{{:include
|
||||||
file="_get_codes.html"
|
file="_get_codes.html"
|
||||||
account=$_POST.cession_account
|
account=$_POST.cession_account
|
||||||
keep="account_code"
|
keep="account_code"
|
||||||
}}
|
}}
|
||||||
{{:assign cession_account=$account_code|keys|value:0}}
|
{{:assign cession_account=$account_code|keys|key:0}}
|
||||||
{{:api
|
{{:api
|
||||||
method="POST"
|
method="POST"
|
||||||
path="accounting/transaction"
|
path="accounting/transaction"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue