Prise en compte exercices sur 2 années civiles
This commit is contained in:
parent
b45e53f5ea
commit
885f737233
4 changed files with 56 additions and 48 deletions
|
|
@ -40,7 +40,7 @@
|
|||
linked_transactions=$_GET.trans_id|intval
|
||||
}}
|
||||
|
||||
{{:redirect force="amortization.html?line_id=%s&ok=1&msg=amortissement"|args:$_GET.line_id}}
|
||||
{{:redirect force="amortization.html?immo_id=%s&ok=1&msg=amortissement"|args:$_GET.immo_id}}
|
||||
{{/form}}
|
||||
|
||||
{{* Préparer les infos pour le formulaire *}}
|
||||
|
|
@ -56,7 +56,14 @@
|
|||
{{:assign amort_code=$c1|cat:8|cat:$reste}}
|
||||
{{:assign var="credit_account.%s"|args:$amort_code value="%s — Amortissements "|args:$amort_code|cat:$amort_account.label}}
|
||||
|
||||
{{#select id, label, end_date from acc_years where id=:id; :id=$_GET.year assign=year}}{{/select}}
|
||||
{{#select
|
||||
id,
|
||||
label,
|
||||
date(start_date, "start of year", "+1 year", "-1 day") as date_amort
|
||||
from acc_years where id=:id;
|
||||
:id=$_GET.year assign=year
|
||||
}}
|
||||
{{/select}}
|
||||
|
||||
{{#years closed=false}}
|
||||
{{:assign var="open_years.%d"|args:$id value=$label}}
|
||||
|
|
@ -67,7 +74,7 @@
|
|||
<legend>Ajouter une écriture d'amortissement</legend>
|
||||
<dl>
|
||||
{{:input type="select" default=$year.id name="id_year" label="Exercice" required=true options=$open_years}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$year.end_date|date_short}}
|
||||
{{:input type="date" name="date" label="Date" required=true default=$year.date_amort|date_short}}
|
||||
{{:input type="text" name="designation" label="Désignation" required=true default=$_GET.label}}
|
||||
{{:input type="money" name="montant" label="Montant" required=true default=$_GET.amount}}
|
||||
{{:input
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue