Complément filtrage des libellés

_archives.html

@@ -1,52 +1,28 @@
 {{* -*- brindille -*- *}}
 
 {{* Liste des immobilisations archivées *}}
-
-{{* Immobilisation archivées prises en charge *}}
-{{#load type="immo" where="$$.status = 'archived'"}}
-	{{:assign var="lines." value="'%s'"|args:$line}}
-{{/load}}
-{{:assign lines=$lines|implode:","}}
-{{:assign lines="("|cat:$lines|cat:")"}}
-{{:assign condition="line.id IN %s"|args:$lines}}
-
-{{#select
-	trans.id as trans_id,
-	trans.label as trans_label,
-	trans.date as trans_date,
-	line.id as immo_id,
-	account.id as account_id,
-	account.code as account_code,
-	account.label as account_label,
-	line.debit AS debit,
-	project.label as project_label,
-	trans.id_year as trans_id_year
-	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
-	LEFT JOIN acc_projects AS project ON line.id_project = project.id
-	WHERE !condition
-	ORDER BY trans.date DESC;
-	!condition=$condition
-	assign="immo_archivee"
-}}
-	{{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}}
-{{/select}}
+<p class="help">
+	Cette page liste les immobilisations sorties du bilan
+</p>
 
 {{* Immobilisation avec une écriture de sortie de bilan *}}
-{{:read file="./defaut.json" assign="config_json"}}
-{{:assign config_defaut=$config_json|json_decode}}
+{{:include file="_get_config.html" keep="module.config"}}
 
-{{:assign condition="("}}
-{{#foreach from=$config_defaut.prefixes item="code"}}
+{{:assign accounts_condition="("}}
+{{#foreach from=$module.config.prefixes item="code"}}
 	{{:assign code=$code|cat:"%"|quote_sql}}
-	{{:assign condition=$condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}}
+	{{:assign accounts_condition=$accounts_condition|cat:"account.code LIKE "|cat:$code|cat:" OR "}}
 {{/foreach}}
-{{:assign condition=$condition|cat:"0)"}}
-{{:assign cond2=$condition|replace:"account.":"acc2."}}
-{{:assign condition=$condition|cat:" AND "|cat:$cond2}}
-{{:assign condition=$condition|cat:" AND line.debit > 0 AND NOT (trans.status & 16)"}}
+{{:assign accounts_condition=$accounts_condition|cat:"0)"}}
+{{:assign condition=$accounts_condition|cat:" AND acc2.code = account.code AND line.debit > 0 AND line.debit = line2.credit AND NOT (trans.status & 16)"}}
+
+{{:assign filter_condition=" NOT ("}}
+{{#foreach from=$module.config.filters item="filter"}}
+	{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
+	{{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}}
+{{/foreach}}
+{{:assign filter_condition=$filter_condition|cat:"0)"}}
+{{:assign condition=$condition|cat:" AND "|cat:$filter_condition}}
 
 {{#select
 	trans.id as trans_id,
@@ -58,11 +34,11 @@
 	account.label as account_label,
 	line.debit AS debit,
 	project.label as project_label,
-	trans.id_year as trans_id_year
+	trans.id_year as trans_id_year,
+	trans2.date as exit_date
 	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
 	INNER JOIN acc_transactions_lines AS line2 ON line.debit = line2.credit
 	INNER JOIN acc_transactions AS trans2 ON trans2.id = line2.id_transaction
 	INNER JOIN acc_accounts AS acc2 ON acc2.id = line2.id_account
@@ -72,18 +48,16 @@
 	!condition=$condition
 	assign="immo_archivee"
 	}}
-	{{if ! $trans_id|key_in:$immo_archivees}}
 	{{:assign var="immo_archivees.%s"|args:$trans_id value=$immo_archivee}}
-	{{/if}}
 {{/select}}
 
 <section class="immobilisation">
-	{{:assign nb_immo=0}}
 	<table class="list">
 		<thead>
 			<tr>
 				<th>N°</th>
-				<th>Date</th>
+				<th>Mise en service</th>
+				<th>Date sortie</th>
 				<th>Libellé</th>
 				<th class="nombre">Montant</th>
 				<th>N° compte</th>
@@ -93,13 +67,20 @@
 			</tr>
 		</thead>
 		<tbody>
+			{{:assign nb_immo=0}}
+			{{:assign total_immo = 0}}
+			{{:assign total_cessions = 0}}
 			{{#foreach from=$immo_archivees}}
 				{{: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 nb_immo="%d+1"|math:$nb_immo}}
+				{{:assign total_immo="%d+%d"|math:$total_immo:$debit}}
+				{{:assign var="montant" from="sommes_immo.%s"|args:$account_code}}
+				{{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}}
 			<tr>
 				<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
 				<td>{{$trans_date|date_short}}</td>
+				<td>{{$exit_date|date_short}}</td>
 				<td>{{$trans_label}}</td>
 				<td class="money">{{"%f"|math:$debit|money:false}}</td>
 				<td><a href={{$compte_url}}>{{$account_code}}</a></td>
@@ -108,8 +89,90 @@
 				<td class="actions">
 				</td>
 			</tr>
+			{{* voir s'il y a une écriture de cession associée à cette immo *}}
+			{{#select
+				trans.id,
+				trans.label,
+				trans.date,
+				line.id,
+				line.debit,
+				acc.code,
+				acc.label
+				FROM acc_transactions_links AS link
+				INNER JOIN acc_transactions AS trans ON (CASE
+				WHEN link.id_transaction = :trans_id THEN link.id_related
+				WHEN link.id_related = :trans_id THEN link.id_transaction
+				END) = trans.id
+				INNER JOIN acc_transactions_lines AS line ON line.id_transaction = trans.id
+				INNER JOIN acc_accounts AS acc ON line.id_account = acc.id
+				WHERE (link.id_transaction = :trans_id OR link.id_related = :trans_id) AND acc.code = 462
+				;
+				:trans_id = $trans_id
+				}}
+				{{:assign var="montant" from="montant_cessions.%d"|args:$account_code}}
+				{{:assign var="montant_cessions.%d"|args:$account_code value="%d+%d"|math:$montant:$debit}}
+				{{:assign total_cessions="%d+%d"|math:$total_cessions:$debit}}
+			{{/select}}
 		{{/foreach}}
 		</tbody>
+		</tbody>
+		<tfoot>
+			{{if $total_immo != 0}}
+				{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
+					<tr>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td>Total du compte {{$code}}</td>
+						<td class="money">{{$value|money}}</td>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td class="actions"></td>
+					</tr>
+					{{/foreach}}
+					<tr>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td>Total des immobilisations</td>
+						<td class="money"><span class="strong">{{$total_immo|money}}</span></td>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td class="actions"></td>
+					</tr>
+			{{/if}}
+			{{if $total_cessions != 0}}
+				<tr>
+					<td colspan="9">
+				</tr>
+				{{#foreach from=$montant_cessions|ksort key="code" item="value"}}
+					<tr>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td>Cessions du compte {{$code}}</td>
+						<td class="money">{{$value|money}}</td>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td class="actions"></td>
+					</tr>
+				{{/foreach}}
+				<tr>
+					<td></td>
+					<td></td>
+					<td></td>
+					<td>Total des cessions</td>
+					<td class="money"><span class="strong">{{$total_cessions|money}}</span></td>
+					<td></td>
+					<td></td>
+					<td></td>
+					<td class="actions"></td>
+				</tr>
+			{{/if}}
+		</tfoot>
 	</table>
 	{{if $nb_immo == 0}}
 		<p class="block alert">Aucune immobilisation</p>

_get_config.html

@@ -8,16 +8,16 @@
 {{:read file="./defaut.json" assign="config_defaut"}}
 {{:assign config_defaut=$config_defaut|json_decode}}
 
+{{if $module.config.prefixes == null}}
+	{{:assign var="module.config.prefixes" value=$config_defaut.prefixes}}
+{{/if}}
+
+{{if $module.config.unfinished == null}}
+	{{:assign var="module.config.unfinished" value=$config_defaut.unfinished}}
+{{/if}}
+
 {{*
-{{if $module.config.tva != null}}
-	{{:assign var="config.tva" value=$module.config.tva}}
-{{else}}
-	{{:assign var="config.tva" value=$config_defaut.tva}}
+{{if $module.config.tva == null}}
+	{{:assign var="module.config.tva" value=$config_defaut.tva}}
 {{/if}}
 *}}
-
-{{if $module.config.prefixes != null}}
-	{{:assign var="config.prefixes" value=$module.config.prefixes}}
-{{else}}
-	{{:assign var="config.prefixes" value=$config_defaut.prefixes}}
-{{/if}}

_immobilisations.html

@@ -3,34 +3,52 @@
 {{* Liste des immobilisations en cours ou amorties *}}
 
 <section class="immobilisation">
-	{{:assign nb_immo=0}}
+
+	<p class="help">
+		{{if $type_immo == "managed"}}
+			Cette page liste les immobilisations en cours d'amortissement
+		{{elseif $type_immo == "amortized"}}
+			Cette page liste les immobilisations dont l'amortissement est terminé
+		{{/if}}
+	</p>
 
 	<table class="list">
 		<thead>
 			<tr>
-				<th>N°</th>
+				<th class="num">N°</th>
 				<th>Date</th>
 				<th>Libellé</th>
 				<th class="nombre">Montant</th>
 				<th class="nombre">Durée</th>
+				<th class="nombre">Amortissements</th>
+				<th class="nombre">Valeur nette</th>
 				<th>N° compte</th>
-				<th>Compte</th>
 				<th class="actions"></th>
 			</tr>
 		</thead>
 		<tbody>
 
 			{{* lister les immobilisations *}}
-			{{:read file="./defaut.json" assign="config_json"}}
-			{{:assign config_defaut=$config_json|json_decode}}
+			{{:include file="_get_config.html" keep="module.config"}}
+
 			{{:assign condition="("}}
-			{{#foreach from=$config_defaut.prefixes item="code"}}
+			{{#foreach from=$module.config.prefixes item="code"}}
 				{{:assign code=$code|cat:"%"|quote_sql}}
 				{{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
 			{{/foreach}}
 			{{:assign condition=$condition|cat:"0)"}}
 			{{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
 
+			{{:assign filter_condition=" NOT ("}}
+			{{#foreach from=$module.config.filters item="filter"}}
+				{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
+				{{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}}
+			{{/foreach}}
+			{{:assign filter_condition=$filter_condition|cat:"0)"}}
+			{{:assign condition=$condition|cat:" AND "|cat:$filter_condition}}
+
+			{{:assign nb_immo=0}}
+			{{:assign total_immo = 0}}
 			{{#select
 				trans.id as trans_id,
 				trans.label as trans_label,
@@ -132,14 +150,18 @@
 				{{if $type_immo == "amortized" && $amort_amount < $debit && $status != "amortized"}}{{:continue}}{{/if}}
 
 				{{:assign nb_immo="%d+1"|math:$nb_immo}}
+				{{:assign total_immo="%d+%d"|math:$total_immo:$debit}}
+				{{:assign var="montant" from="sommes_immo.%s"|args:$account_code}}
+				{{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}}
 			<tr>
 				<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
 				<td>{{$trans_date|date_short}}</td>
 				<td>{{$trans_label}}</td>
-				<td class="money">{{"%f"|math:$debit|money}}</td>
+				<td class="money">{{$debit|money}}</td>
 				<td class="money">{{if $duration != null}}{{$duration}}{{/if}}</td>
+				<td class="money">{{$amort_amount|money|or:"0,00"}}</td>
+				<td class="money">{{"%d-%d"|math:$debit:$amort_amount|money|or:"0,00"}}</td>
 				<td><a href={{$compte_url}}>{{$account_code}}</a></td>
-				<td>{{$account_label}}</td>
 				<td class="actions">
 					{{if ! $exist_amort}}
 						{{:linkbutton
@@ -165,6 +187,34 @@
 			</tr>
 			{{/select}}
 		</tbody>
+		<tfoot>
+			{{if $total_immo != 0}}
+				{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
+					<tr>
+						<td></td>
+						<td></td>
+						<td>Total du compte {{$code}}</td>
+						<td class="money">{{$value|money}}</td>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td class="actions"></td>
+					</tr>
+				{{/foreach}}
+				<tr>
+					<td></td>
+					<td></td>
+					<td>Total des immobilisations</td>
+					<td class="money"><span class="strong">{{$total_immo|money}}</span></td>
+					<td></td>
+					<td></td>
+					<td></td>
+					<td></td>
+					<td class="actions"></td>
+				</tr>
+			{{/if}}
+		</tfoot>
 	</table>
 	{{if $nb_immo == 0}}
 		<p class="block alert">Aucune immobilisation</p>

_immobilisations_autres.html

@@ -3,7 +3,6 @@
 {{* Liste des immobilisations non amortissables ou non (encore) gérées *}}
 
 <section class="immobilisation">
-	{{:assign nb_immo=0}}
 
 	<p class="help">
 		Cette page liste les écritures pas (encore) prises en charges par le module ou classées non amortissables
@@ -30,16 +29,25 @@
 		<tbody>
 
 			{{* lister les immobilisations *}}
-			{{:read file="./defaut.json" assign="config_json"}}
-			{{:assign config_defaut=$config_json|json_decode}}
+			{{:include file="_get_config.html" keep="module.config"}}
+
 			{{:assign condition="("}}
-			{{#foreach from=$config_defaut.prefixes item="code"}}
+			{{#foreach from=$module.config.prefixes item="code"}}
 				{{:assign code=$code|cat:"%"|quote_sql}}
 				{{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
 			{{/foreach}}
 			{{:assign condition=$condition|cat:"0)"}}
 			{{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
 
+			{{:assign filter_condition=" NOT ("}}
+			{{#foreach from=$module.config.filters item="filter"}}
+				{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
+				{{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}}
+			{{/foreach}}
+			{{:assign filter_condition=$filter_condition|cat:"0)"}}
+			{{:assign condition=$condition|cat:" AND "|cat:$filter_condition}}
+
+			{{:assign nb_immo=0}}
 			{{#select
 				trans.id as trans_id,
 				trans.label as trans_label,

_nav.html

@@ -16,9 +16,10 @@
 	{{/if}}
 
 	<ul>
-		<li {{if $subcurrent == "managed"}}class="current"{{/if}}><a href="index.html?type_immo=managed">En cours</a></li>
+		<li {{if $subcurrent == "managed"}}class="current"{{/if}}><a href="index.html?type_immo=managed">Amortissables</a></li>
 		<li {{if $subcurrent == "amortized"}}class="current"{{/if}}><a href="index.html?type_immo=amortized">Amorties</a></li>
 		<li {{if $subcurrent == "archived"}}class="current"{{/if}}><a href="index.html?type_immo=archived">Sorties du bilan</a></li>
+		<li {{if $subcurrent == "unfinished"}}class="current"{{/if}}><a href="index.html?type_immo=unfinished">En cours</a></li>
 		<li {{if $subcurrent == "other"}}class="current"{{/if}}><a href="index.html?type_immo=other">Autres</a></li>
 		<li {{if $current == "config"}} class="current"{{/if}}><a href="config.html">Configuration</a></li>
 	</ul>
@@ -32,4 +33,11 @@
 			<li class="title"><strong>Sortie de bilan</strong></li>
 		</ul>
 	{{/if}}
+
+	{{if $current == "config"}}
+		<ul class="sub">
+			<li {{if $subcurrent == null}} class="current"{{/if}}><a href="config.html">Comptes d'immobilisation</a></li>
+			<li {{if $subcurrent == "filters"}} class="current"{{/if}}><a href="filters.html">Filtres de libellés</a></li>
+		</ul>
+	{{/if}}
 </nav>

_unfinished.html

@@ -0,0 +1,203 @@
+{{* -*- brindille -*- *}}
+
+{{* Liste des immobilisations en cours de constitution *}}
+
+<section class="immobilisation">
+
+	<p class="help">
+		Cette page liste les immobilisations en cours de constitution, donc non amortissables
+	</p>
+
+	<form method="post" action="">
+		<fieldset class="shortFormLeft">
+			<legend>Transférer une ou plusieurs lignes vers une immobilisation amortissable</legend>
+			<p class="help">
+				Cocher les lignes concernées ; les montants seront additionnés par numéro de compte
+			</p>
+			<div class="shortFormRight informations" id="total_amount">
+				<legend>Montants sélectionnés</legend>
+				<ul>
+					<li>&nbsp;</li>
+				</ul>
+			</div>
+			<div>
+				<p class="submit">
+					{{:linkbutton
+					label="Transférer"
+					href="transfer.html?trans="
+					shape="right"
+					id="transfer"
+					}}
+				</p>
+			</div>
+		</fieldset>
+		<fieldset>
+			{{:input type="checkbox" value=1 name="unhide" label="Afficher les écritures marquées ignorées" }}
+		</fieldset>
+	</form>
+
+	<table class="list">
+		<thead>
+			<tr>
+				<th class="check">{{*:input type="checkbox" name="all" value="all"*}}</th>
+				<th class="num">N°</th>
+				<th>Date</th>
+				<th>Libellé</th>
+				<th class="nombre">Montant</th>
+				<th>N° compte</th>
+				<th>Compte</th>
+				<th class="actions"></th>
+			</tr>
+		</thead>
+		<tbody>
+
+			{{* lister les immobilisations en cours de constitution *}}
+			{{:include file="_get_config.html" keep="module.config"}}
+
+			{{:assign accounts_condition="("}}
+			{{#foreach from=$module.config.unfinished item="elem"}}
+				{{:assign code=$elem.code|cat:"%"|quote_sql}}
+				{{:assign accounts_condition=$accounts_condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
+			{{/foreach}}
+			{{:assign accounts_condition=$accounts_condition|cat:"0)"}}
+			{{:assign condition=$accounts_condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
+
+			{{:assign filter_condition=" NOT ("}}
+			{{#foreach from=$module.config.filters item="filter"}}
+				{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
+				{{:assign filter_condition=$filter_condition|cat:" trans_label LIKE "|cat:$filter|cat:" OR "}}
+			{{/foreach}}
+			{{:assign filter_condition=$filter_condition|cat:"0)"}}
+			{{:assign condition=$condition|cat:" AND "|cat:$filter_condition}}
+			{{*:debug condition=$condition*}}
+
+			{{:assign nb_immo=0}}
+			{{:assign total_immo = 0}}
+			{{#select
+				trans.id as trans_id,
+				trans.label as trans_label,
+				trans.date as trans_date,
+				line.id as immo_id,
+				account.id as account_id,
+				account.code as account_code,
+				account.label as account_label,
+				sum(line.debit) AS debit,
+				trans.id_year as trans_id_year
+				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
+				WHERE !condition
+				GROUP BY trans.id
+				ORDER BY trans.date DESC;
+				!condition=$condition
+			}}
+				{{* voir si l'écriture a été marquée ignorée *}}
+				{{:assign ignore=false}}
+				{{#load type="immo" assign="info_immo" where="$$.line = :line_id AND $$.status = 'ignored'" :line_id=$immo_id|intval}}
+					{{:assign ignore=true}}
+				{{/load}}
+				{{if $ignore && $_POST.unhide == null}}
+					{{:continue}}
+				{{/if}}
+
+				{{* voir s'il existe une écriture qui solde l'immobilisation *}}
+				{{#select
+					count(*) AS count
+					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
+					WHERE line.credit = :amount AND code = :account_code
+					;
+					:amount = $debit
+					:account_code = $account_code
+					}}
+					{{:assign count=$count}}
+				{{/select}}
+
+				{{* S'il y a plus d'une écriture de même montant on ne peut pas décider *}}
+				{{if $count == 1}}
+					{{:continue}}
+				{{/if}}
+
+				{{: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 nb_immo="%d+1"|math:$nb_immo}}
+				{{:assign total_immo="%d+%d"|math:$total_immo:$debit}}
+				{{:assign var="montant" from="sommes_immo.%s"|args:$account_code}}
+				{{:assign var="sommes_immo.%s"|args:$account_code value="%d+%d"|math:$montant:$debit}}
+
+			<tr>
+				<td class="check">{{:input type="checkbox" name="selected[]" value=$trans_id}}</td>
+				<td class="num"><a href={{$trans_url}}>#{{$trans_id}}</a></td>
+				<td>{{$trans_date|date_short}}</td>
+				<td>{{$trans_label}}</td>
+				<td class="money">{{"%f"|math:$debit|money:false}}</td>
+				<td class="account_code"><a href={{$compte_url}}>{{$account_code}}</a></td>
+				<td>{{$account_label}}</td>
+				<td class="actions">
+					{{:linkbutton
+					label="Modifier"
+					href="ignore.html?immo_id=%s"|args:$immo_id
+					shape="edit"
+					target="_dialog"
+					}}
+				</td>
+			</tr>
+			{{/select}}
+		</tbody>
+		<tfoot>
+			{{if $total_immo != 0}}
+				{{#foreach from=$sommes_immo|ksort key="code" item="value"}}
+					<tr>
+						<td></td>
+						<td></td>
+						<td></td>
+						<td>Total du compte {{$code}}</td>
+						<td class="money">{{$value|money}}</td>
+						<td></td>
+						<td></td>
+						<td class="actions"></td>
+					</tr>
+				{{/foreach}}
+				<tr>
+					<td></td>
+					<td></td>
+					<td></td>
+					<td>Total des immobilisations</td>
+					<td class="money"><span class="strong">{{$total_immo|money}}</span></td>
+					<td></td>
+					<td></td>
+					<td class="actions"></td>
+				</tr>
+			{{/if}}
+		</tfoot>
+	</table>
+	{{if $nb_immo == 0}}
+		<p class="block alert">Aucune immobilisation</p>
+	{{/if}}
+</section>
+
+<script type="text/javascript" src="scripts.js"></script>
+<script type="text/javascript" async="async">
+
+	let lines = document.querySelectorAll('.list tbody tr');
+	for (const line of lines) {
+		let button = line.querySelector('input[type=checkbox]');
+
+		button.onchange = () => {
+			computeTotal('total_amount', 'transfer');
+		};
+
+	}
+
+function changeVisibility(evt, idcheck = 'f_unhide_1') {
+	this.form.dispatchEvent(new Event('submit'));
+	this.form.submit();
+}
+
+(function () {
+	document.getElementById('f_unhide_1').onclick = changeVisibility;
+})();
+
+</script>

add_asset.html

@@ -1,7 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{:read file="./defaut.json" assign="config_json"}}
-{{:assign config_defaut=$config_json|json_decode}}
+{{:include file="_get_config.html" keep="module.config.prefixes"}}
 
 {{#years closed=false order="start_date" assign=years.}}
 	{{:assign ts_debut=$start_date|strtotime}}
@@ -13,6 +12,8 @@
 	{{if $ts_debut <= $now && $now <= $ts_fin}}
 		{{:assign selected_year=$id}}
 	{{/if}}
+{{else}}
+	{{:error message="Aucun exercice ouvert"}}
 {{/years}}
 
 {{* Traiter l'envoi du formulaire *}}
@@ -73,7 +74,7 @@
 		file="_check_account.html"
 		account=$debit_account
 		chart_id=$selected_chart
-		prefix_array=$config_defaut.prefixes
+		prefix_array=$module.config.prefixes
 		keep="account_ok"
 	}}
 
@@ -137,7 +138,7 @@
 	{{:assign var="projects.%d"|args:$id value=$label}}
 {{/select}}
 
-{{#foreach from=$config_defaut.prefixes item="code"}}
+{{#foreach from=$module.config.prefixes item="code"}}
 	{{:assign var="pattern_array." value="%s*"|args:$code}}
 {{/foreach}}
 {{:assign var="patterns" value=$pattern_array|implode:"|"}}
@@ -152,7 +153,7 @@
 		<dl>
 			{{:input type="select" name="id_year" label="Exercice" default=$selected_year required=true default_empty="— Faire un choix —" options=$open_years}}
 			{{:input type="date" name="date_achat" label="Date d'acquisition" required=true default=$now|date_short}}
-			{{:input type="text" name="designation" label="Désignation" required=true}}
+			{{:input type="text" name="designation" label="Libellé" required=true}}
 			{{:input type="money" name="montant" label="Montant" required=true}}
 			{{:input
 				type="list"
@@ -179,7 +180,7 @@
 	<fieldset>
 		<legend>Amortissement</legend>
 		<dl>
-			{{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"}}
+			{{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur une ou plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"}}
 			<div id="div_amort">
 				{{:input type="number" name="duree" label="Durée d'amortissement" required=true min=0 default=1 suffix="année(s)"}}
 				{{:input type="date" name="date_mes" label="Date de mise en service" help="C'est la date de première utilisation ; à renseigner uniquement si différente de la date d'acquisition"}}

amortization.html

@@ -79,6 +79,14 @@
 {{/if}}
 
 {{* Autres amortissements non rattachés *}}
+{{:include file="_get_config.html" keep="module.config"}}
+{{:assign filter_condition=" NOT ("}}
+{{#foreach from=$module.config.filters item="filter"}}
+	{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
+	{{:assign filter_condition=$filter_condition|cat:" trans.label LIKE "|cat:$filter|cat:" OR "}}
+{{/foreach}}
+{{:assign filter_condition=$filter_condition|cat:"0)"}}
+
 {{#select
 	line.id as l_id,
 	line.id_transaction as t_id,
@@ -94,8 +102,9 @@
 	INNER JOIN acc_accounts AS account ON account.id = line.id_account
 	INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction
 	INNER JOIN acc_years AS y ON y.id = trans.id_year
-	WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16)
+	WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) AND !filter_condition
 	ORDER BY trans.date, trans.label;
+	!filter_condition=$filter_condition
 	assign=autre_amort
 }}
 	{{#select
@@ -170,6 +179,7 @@
 	</fieldset>
 </form>
 
+<div class="informations">
 	<dl class="describe">
 		<dt>Immobilisation</dt>
 		<dd><span class="num"><a href={{$trans_url}}>#{{$ligne_immo.trans_id}}</a></span> {{$ligne_immo.label}}</dd>
@@ -182,9 +192,9 @@
 			<dd>{{$duree}} ans</dd>
 		{{/if}}
 		{{if $valeur_residuelle > 0}}
-		<dt>Montant déjà amorti</dt>
+			<dt>Montant des amortissements</dt>
 			<dd>{{"%d-%d"|math:$ligne_immo.montant:$valeur_residuelle|money_currency:false}}</dd>
-		<dt>Valeur résiduelle</dt>
+			<dt>Valeur nette comptable</dt>
 			<dd>{{$valeur_residuelle|money_currency}}</dd>
 		{{/if}}
 		{{if $duree != null && $valeur_residuelle > 0}}
@@ -192,6 +202,7 @@
 			<dd>{{"%f/%d"|math:$ligne_immo.montant:$duree|money_currency}}</dd>
 		{{/if}}
 	</dl>
+</div>
 
 <h3 class="center-block ruler">Amortissements enregistrés</h3>
 {{if $linked_lines != null}}
@@ -248,7 +259,7 @@
 	{{if $autres_amortissements != null}}
 		<p class="block alert">
 			Il existe des écritures d'amortissement qui ne sont pas rattachés à une immobilisation ! <br />
-			Utilisez le bouton « Attacher un amortissement » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.
+			Utilisez le bouton « Rattacher une écriture » pour les afficher ; vous pourrez choisir d'en attacher certaines à cette immobilisation.
 		</p>
 	{{/if}}
 {{/if}}

config.html

@@ -1,60 +1,82 @@
 {{* -*- brindille -*- *}}
 
-{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}}
-{{* barre de navigation *}}
-{{:include file="_nav.html" current="config"}}
 {{if $_GET.ok == 1}}
 	<p class="block confirm">Configuration enregistrée.</p>
 {{/if}}
 
 {{* lecture config (défaut ou enregistrée) *}}
-{{:include file="./_get_config.html" keep="config"}}
+{{:include file="./_get_config.html" keep="module.config, config_defaut"}}
 
 {{#form on="save"}}
 	{{:assign ok=0}}
 	{{#foreach from=$_POST.immo_accounts item="line"}}
 		{{:assign elem=$line|values}}
 		{{:assign elem=$elem.0}}
-		{{:assign var="fields" value=$elem|explode:" "}}
-		{{:assign present=false}}
-		{{* ne pas garder si préfixe d'un compte déjà présent *}}
-		{{#foreach from=$account_codes item="code"}}
-			{{:assign pos=$code|strpos:$fields.0}}
-			{{if $pos !== false}}
-				{{:assign present=true}}
-				{{:break}}
+		{{:assign var="fields" value=$elem|explode:" — "}}
+		{{if $fields.0|strpos:$config_defaut.unfinished.0.code === 0}}
+			{{:error message="Le compte « %s » n'est pas un compte d'immobilisation amortissable"|args:$fields.0}}
+		{{/if}}
+		{{:assign var="account_codes." value=$fields.0}}
+	{{/foreach}}
+
+	{{#foreach from=$_POST.unfinished_accounts item="line"}}
+		{{:assign elem=$line|values}}
+		{{:assign elem=$elem.0}}
+		{{:assign var="fields" value=$elem|explode:" — "}}
+		{{:assign var="unfinished_codes." value=$fields.0}}
+	{{/foreach}}
+
+	{{* vérifier qu'il n'y a pas d'intersection entre les deux listes de codes *}}
+	{{#foreach from=$account_codes item="i_code"}}
+		{{#foreach from=$unfinished_codes item="u_code"}}
+			{{if $i_code|strpos:$u_code === 0}}
+				{{:error message="Le compte d'immobilisation amortissable « %s » est incompatible avec le compte d'immobilisation en cours « %s »"|args:$i_code:$u_code}}
+			{{/if}}
+			{{if $u_code|strpos:$i_code === 0}}
+				{{:error message="Le compte d'immobilisation amortissable « %s » est incompatible avec le compte d'immobilisation en cours « %s »"|args:$i_code:$u_code}}
 			{{/if}}
 		{{/foreach}}
-		{{if ! $present}}
-			{{:assign var="account_codes." value=$fields.0}}
-		{{/if}}
 	{{/foreach}}
 
 	{{:save
 		key="config"
 		prefixes=$account_codes|sort
+		unfinished=$unfinished_codes|sort
 	}}
 	{{:assign ok=1}}
-
 	{{:redirect to="./config.html?ok=%d"|args:$ok}}
+{{else}}
+	{{:form_errors}}
 {{/form}}
 
-{{* récupérer l'exercice courant *}}
-{{:assign var="selected_year" from="logged_user.preferences.accounting_year}}
+{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}}
+{{:include file="_nav.html" current="config"}}
+
+{{* récupérer l'exercice courant ou sinon le plus récent *}}
+{{:assign var="selected_year" from="logged_user.preferences.accounting_year"}}
 {{if $selected_year == null}}
 	{{* sélectionner l'exercice le plus probable *}}
-	{{#years closed=false order="start_date"}}
-		{{:assign var="open_years.%d"|args:$id value=$label}}
+	{{#years}}
 		{{if $start_date|strtotime <= $now && $end_date|strtotime >= $now}}
 			{{:assign selected_year=$id}}
 			{{:break}}
 		{{/if}}
+		{{:assign last_year=$id}}
 	{{/years}}
 {{/if}}
 
-{{* libellés des comptes d'immobilisation *}}
+{{if $selected_year == null}}
+	{{if $last_year == null}}
+		<p class="block alert">Aucun exercice</p>
+	{{else}}
+		{{:assign selected_year=$last_year}}
+	{{/if}}
+{{/if}}
+{{if $selected_year != null}}
+
+	{{* libellés des comptes d'immobilisation amortissables *}}
 	{{:assign condition="("}}
-{{#foreach from=$config.prefixes item="code"}}
+	{{#foreach from=$module.config.prefixes item="code"}}
 		{{:assign code=$code|quote_sql}}
 		{{:assign condition=$condition|cat:" account.code = "|cat:$code|cat:" OR "}}
 	{{/foreach}}
@@ -64,10 +86,7 @@
 	{{#select
 		account.id as account_id,
 		account.code,
-	account.id_chart,
-	account.label,
-	year.label as year_label,
-	chart.label as chart_label
+		account.label
 		FROM acc_accounts AS account
 		INNER JOIN acc_charts AS chart ON chart.id = account.id_chart
 		INNER JOIN acc_years AS year ON year.id_chart = chart.id
@@ -75,34 +94,104 @@
 		;
 		!condition=$condition
 		}}
-	{{:assign var="accounts.%s"|args:$code label=$label id=$account_id}}
+		{{:assign var="immo_accounts.%s"|args:$code label=$label}}
 	{{/select}}
 
-<h3>Comptes d'immobilisation</h3>
-	<form method="post" action="">
+	{{* libellés des comptes d'immobilisation en cours de constitution *}}
+	{{:assign condition="("}}
+	{{#foreach from=$module.config.unfinished item="elem"}}
+		{{:assign code=$elem.code|quote_sql}}
+		{{:assign condition=$condition|cat:" account.code = "|cat:$code|cat:" OR "}}
+	{{/foreach}}
+	{{:assign condition=$condition|cat:"0)"}}
+	{{:assign condition=$condition|cat:" AND year.id = %s"|args:$selected_year}}
 
+	{{#select
+		account.id as account_id,
+		account.code,
+		account.label
+		FROM acc_accounts AS account
+		INNER JOIN acc_charts AS chart ON chart.id = account.id_chart
+		INNER JOIN acc_years AS year ON year.id_chart = chart.id
+		WHERE !condition
+		;
+		!condition=$condition
+		}}
+		{{:assign var="unfinished_accounts.%s"|args:$code label=$label}}
+	{{/select}}
+	{{if $unfinished_accounts|count == 0}}
+		{{:assign var="unfinished_accounts.%s"|args:$config_defaut.unfinished.0.code label=$config_defaut.unfinished.0.label}}
+	{{/if}}
+
+	<form method="post" action="">
+		<h3>Comptes d'immobilisation amortissables</h3>
 		<p class="help">
-			Les immobilisations sont cherchées dans les comptes sélectionnées et leurs sous-comptes.
+			Les immobilisations amortissables sont cherchées dans les comptes sélectionnés et leurs sous-comptes.
 		</p>
 
 		<table class="list transaction-lines" id="asset_prefixes">
 			<thead>
 				<tr>
-					<td>Compte</td>
-					<td></td>
+					<th>Compte</th>
+					<th></th>
 				</tr>
 			</thead>
 			<tbody>
-				{{#foreach from=$accounts key=code item=elem}}
+				{{#foreach from=$immo_accounts key=code item=elem}}
 					<tr>
 						<td>
 							{{:assign var="immo_account.%s.%s"|args:$code:$code value="%s — "|args:$code|cat:$elem.label}}
 							{{:assign var="current_account" from="immo_account.%s"|args:$code}}
-							{{*:debug immo_account=$immo_account current_account=$current_account*}}
 							{{:input
 								type="list"
 								name="immo_accounts[]"
-								target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code::$selected_year
+								target="!acc/charts/accounts/selector.php?codes=%s*&id_year=%d"|args:$code:$selected_year
+								default=$current_account
+							}}
+						</td>
+						<td class="actions">
+							{{:button
+								label="Enlever"
+								title="Enlever une ligne"
+								shape="minus"
+								min="1"
+								name="remove_line"
+							}}
+						</td>
+					</tr>
+				{{/foreach}}
+			</tbody>
+			<tfoot>
+				<tr>
+					<td></td>
+					<td class="actions">{{:button shape="plus" label="Ajouter" title="Ajouter un compte"}}</td>
+				</tr>
+			</tfoot>
+		</table>
+
+		<h3>Comptes d'immobilisation en cours de constitution</h3>
+		<p class="help">
+			Ces immobilisations ne sont pas amortissables ; elles sont cherchées dans les comptes sélectionnés et leurs sous-comptes.
+		</p>
+
+		<table class="list transaction-lines" id="unfinished_accounts">
+			<thead>
+				<tr>
+					<th>Compte</th>
+					<th></th>
+				</tr>
+			</thead>
+			<tbody>
+
+				{{#foreach from=$unfinished_accounts key=code item=elem}}
+					<tr>
+						<td>
+							{{:assign var="unfinished_account.%s.%s"|args:$code:$code value="%s — "|args:$code|cat:$elem.label}}
+							{{:assign var="current_account" from="unfinished_account.%s"|args:$code}}
+							{{:input
+								type="list"
+								name="unfinished_accounts[]"
+								target="!acc/charts/accounts/selector.php?codes=%s*&id_year=%d"|args:$code:$selected_year
 								default=$current_account
 							}}
 						</td>
@@ -130,62 +219,23 @@
 			{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
 		</p>
 	</form>
+{{/if}}
 
 <script type="text/javascript" src="scripts.js"></script>
-<script type="text/javascript">
-	function remove_line(idtable, code) {
-		let trouve = false, row = null;
-		const table = document.getElementById(idtable);
-		for (let i = 0; i < table.rows.length; ++i) {
-			row = table.rows[i];
-			for (let j = 0; j < row.cells.length; ++j) {
-				const col = row.cells[j];
-				if (col.innerText == code) {
-					trouve = true;
-					break;
-				}
-			}
-			if (trouve) { break; }
-		}
-		if (row != null) {
-			row.parentNode.removeChild(row);
-		}
-	}
-</script>
-
 <script type="text/javascript" async="async">
 
 	// bouton - : supprimer une ligne
-	var lines = $('.transaction-lines tbody tr');
+	let lines = $('.transaction-lines tbody tr');
 	lines.forEach(initLine);
 
-	// bouton + : dupliquer une ligne
-	$('.transaction-lines tfoot button')[0].onclick = () => {
-		let lines = $('.transaction-lines tbody tr');
-		var line = lines[lines.length - 1];
-		var n = line.cloneNode(true);
+	// bouton + : dupliquer une ligne de la 1ère table
+	for (const b of $('#asset_prefixes tfoot button')) {
+		addLine(b, "2*");
+	}
 
-		// Réinitialiser le sélecteur de compte
-		let b = n.querySelector('.input-list button');
-		let url = b.value;
-		let new_url = url.replace(/codes=[0-9]+\*?/, "codes=2*");
-		b.value = new_url;
+	// bouton + : dupliquer une ligne de la 2ème table
+	for (const b of  $('#unfinished_accounts tfoot button')) {
+		addLine(b, "23*");
+	}
 
-		// gestionnaire d'événement
-		b.onclick = () => {
-			g.current_list_input = b.parentNode;
-			let url = b.value + (b.value.indexOf('?') > 0 ? '&' : '?') + '_dialog';
-			g.openFrameDialog(url);
-			return false;
-		};
-
-		// réinitialiser le label
-		let l = n.querySelector('.input-list span.label');
-		console.log("label=" + l.innerText);
-		l.innerText = '';
-
-		line.parentNode.appendChild(n);
-		initLine(n);
-
-	};
 </script>

defaut.json

@@ -4,5 +4,11 @@
 		"20",
 		"21",
 		"27"
+    ],
+	"unfinished": [
+		{
+			"code" : "23",
+			"label" : "Immobilisations en cours"
+		}
 	]
 }

filters.html

@@ -0,0 +1,94 @@
+{{* -*- brindille -*- *}}
+
+{{:admin_header title="Configuration" custom_css="./style.css" current="module_amortissement"}}
+{{:include file="_nav.html" current="config" subcurrent="filters"}}
+
+{{if $_GET.ok == 1}}
+	<p class="block confirm">Configuration enregistrée.</p>
+{{/if}}
+
+{{* lecture config *}}
+{{:include file="./_get_config.html" keep="module.config"}}
+
+{{#form on="save"}}
+	{{* enregistrer les filtres dans la config *}}
+	{{#foreach from=$_POST.filters item="filter"}}
+		{{if $filter != ""}}
+			{{:assign var="filters." value=$filter}}
+		{{/if}}
+	{{/foreach}}
+	{{:save key="config" filters=$filters}}
+	{{:redirect to="./filters.html"}}
+{{/form}}
+
+<form method="post" action="">
+	<h3>Liste de libellés à ignorer</h3>
+	<p class="help">
+		Les écritures dont le libellé contient un des textes ci-dessous seront ignorées
+	</p>
+
+	<table class="list" id="filter_list">
+		<thead>
+			<tr>
+				<th>Libellé</th>
+				<th></th>
+			</tr>
+		</thead>
+		<tbody>
+			{{if $module.config.filters == null}}
+				<tr>
+					<td>
+						{{:input type="text" name="filters[]" required=false}}
+					</td>
+					<td class="actions">
+						{{:button
+						label="Enlever"
+						title="Enlever une ligne"
+						shape="minus"
+						name="remove_line"
+						}}
+					</td>
+				</tr>
+			{{else}}
+				{{#foreach from=$module.config.filters item="filter"}}
+					<tr>
+						<td>
+							{{:input type="text" name="filters[]" default=$filter required=false}}
+						</td>
+						<td class="actions">
+							{{:button
+							label="Enlever"
+							title="Enlever une ligne"
+							shape="minus"
+							name="remove_line"
+							}}
+						</td>
+					</tr>
+				{{/foreach}}
+			{{/if}}
+		</tbody>
+		<tfoot>
+			<tr>
+				<td></td>
+				<td class="actions">{{:button shape="plus" label="Ajouter" title="Ajouter un libellé"}}</td>
+			</tr>
+		</tfoot>
+	</table>
+	<p class="submit">
+		{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
+	</p>
+</form>
+
+<script type="text/javascript" src="scripts.js"></script>
+<script type="text/javascript" async="async">
+
+	// bouton - : supprimer une ligne
+	let lines = $('#filter_list tbody tr');
+	lines.forEach(initLine);
+
+	// bouton + : dupliquer une ligne de la 1ère table
+	for (const b of $('#filter_list tfoot button')) {
+		copyLine(b);
+	}
+
+</script>

ignore.html

@@ -0,0 +1,85 @@
+{{* -*- brindille -*- *}}
+
+{{*
+	Marquer la ligne d'écriture « à ignorer »
+	@param immo_id : numéro de ligne
+*}}
+
+{{#select
+	trans.id AS trans_id,
+	trans.date AS date,
+	trans.label AS label,
+	line.debit AS amount
+	FROM acc_transactions_lines AS line
+	INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id
+	WHERE line.id = :line_id
+	;
+	:line_id = $_GET.immo_id
+	assign=ligne_immo
+}}
+{{else}}
+	{{:error message="Il n'y a aucune écriture avec le numéro de ligne %s !"|args:$_GET.immo_id}}
+{{/select}}
+{{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}}{{/load}}
+
+{{* Traiter l'envoi du formulaire *}}
+{{#form on="proceed"}}
+	{{if $_POST.ignore != null && $info_immo == null}}
+		{{* ignorer l'écriture *}}
+		{{:assign duration=0}}
+		{{:assign status="ignored"}}
+		{{:save
+			key=""|uuid
+			validate_schema="schema.json"
+			type="immo"
+			line=$_GET.immo_id|intval
+			duration=$duration
+			date=$ligne_immo.date
+			status=$status
+		}}
+		{{:redirect force="index.html?ok=1&msg=infos&type_immo=unfinished"}}
+	{{elseif $_POST.ignore == null && $info_immo != null}}
+		{{* dés-ignorer l'écriture *}}
+		{{:delete id=$info_immo.id}}
+		{{:redirect force="index.html?ok=1&msg=infos&type_immo=unfinished"}}
+	{{else}}
+		{{:redirect force="index.html?type_immo=unfinished"}}
+	{{/if}}
+{{else}}
+	{{:form_errors}}
+{{/form}}
+
+{{:admin_header title="Ignorer l'écriture" custom_css="./style.css" current="module_amortissement"}}
+
+{{* barre de navigation *}}
+{{if ! $dialog}}
+	{{:include file="_nav.html" current="index"}}
+{{/if}}
+
+<form method="post" action="">
+	<fieldset id="classement_immo">
+		<legend>Ignorer</legend>
+		<div class="informations">
+			<dl class="describe">
+				<dt>Écriture</dt>
+				<dd><span class="num"><a href={{$trans_url}}>#{{$ligne_immo.trans_id}}</a></span> {{$ligne_immo.label}}</dd>
+				<dt>Montant</dt>
+				<dd><strong class="money">{{"%f"|math:$ligne_immo.amount|money_currency}}</strong></dd>
+			</dl>
+		</div>
+		<dl>
+			{{if $info_immo != null && $info_immo.status == "ignored"}}
+				{{:input type="checkbox" name="ignore" checked="checked" value="1" label="Ignoré" help="Décocher pour ne plus ignorer l'écriture"}}
+			{{else}}
+				{{:input type="checkbox" name="ignore" value="1" label="Ignoré" help="Cocher pour ignorer l'écriture ; elle n'apparaitra plus dans la liste des immobilisations"}}
+		{{/if}}
+		</dl>
+	</fieldset>
+
+	<p class="submit">
+		{{:button type="submit" name="proceed" label="Confirmer" shape="right" class="main"}}
+	</p>
+
+</form>
+
+{{:admin_footer}}

index.html

@@ -8,13 +8,15 @@
 {{/if}}
 
 	{{if $type_immo == "managed"}}
-		{{:admin_header title="Immobilisations en cours" custom_css="./style.css" current="module_amortization"}}
+		{{:admin_header title="Immobilisations en cours d'amortissement" custom_css="./style.css" current="module_amortization"}}
 	{{elseif $type_immo == "amortized"}}
 		{{:admin_header title="Immobilisations amorties" custom_css="./style.css" current="module_amortization"}}
 	{{elseif $type_immo == "archived"}}
 		{{:admin_header title="Immobilisations archivées" custom_css="./style.css" current="module_amortization"}}
 	{{elseif $type_immo == "other"}}
 		{{:admin_header title="Autres immobilisations" custom_css="./style.css" current="module_amortization"}}
+	{{elseif $type_immo == "unfinished"}}
+		{{:admin_header title="Immobilisations en cours" custom_css="./style.css" current="module_amortization"}}
 	{{/if}}
 
 {{:include file="_nav.html" current="index" subcurrent="%s"|args:$type_immo}}
@@ -47,6 +49,8 @@
 	{{:include file="_immobilisations_autres.html"}}
 {{elseif $type_immo == "archived"}}
 	{{:include file="_archives.html"}}
+{{elseif $type_immo == "unfinished"}}
+	{{:include file="_unfinished.html"}}
 {{elseif $type_immo == "managed" || $type_immo == "amortized"}}
 	{{:include file="_immobilisations.html"}}
 {{/if}}

module.ini

@@ -1,5 +1,5 @@
 name="Amortissements"
-description="Immobilisations et amortissements"
+description="Immobilisations et amortissements\nversion 0.24"
 author="Jean-Christophe Engel"
 author_url="https://gitea.zaclys.com/lesanges"
 home_button=false

other_amortizations.html

@@ -23,6 +23,14 @@
 	{{:error message="Immobilisation %s non trouvée"|args:$_GET.immo_id}}
 {{/select}}
 
+{{:include file="_get_config.html" keep="module.config"}}
+{{:assign filter_condition=" NOT ("}}
+{{#foreach from=$module.config.filters item="filter"}}
+	{{:assign filter="%"|cat:$filter|cat:"%"|quote_sql}}
+	{{:assign filter_condition=$filter_condition|cat:" trans.label LIKE "|cat:$filter|cat:" OR "}}
+{{/foreach}}
+{{:assign filter_condition=$filter_condition|cat:"0)"}}
+
 {{#select
 	line.id as l_id,
 	line.id_transaction as t_id,
@@ -38,8 +46,9 @@
 	INNER JOIN acc_accounts AS account ON account.id = line.id_account
 	INNER JOIN acc_transactions AS trans ON trans.id = line.id_transaction
 	INNER JOIN acc_years AS y ON y.id = trans.id_year
-	WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16)
+	WHERE account.code LIKE "28%" AND credit > 0 AND (NOT trans.status & 16) AND !filter_condition
 	ORDER BY trans.date, trans.label;
+	!filter_condition=$filter_condition
 	assign=autre_amort
 }}
 	{{#select

save_amort.html

@@ -147,9 +147,8 @@
 		- que le compte d'amortissement débute par un préfixe correct (280, 281, ...)
 		- est présent dans le PC de l'exercice correspondant à la date
 	*}}
-	{{:read file="./defaut.json" assign="config_json"}}
-	{{:assign config_defaut=$config_json|json_decode}}
-	{{#foreach from=$config_defaut.prefixes item="code"}}
+	{{:include file="_get_config.html" keep="module.config.prefixes"}}
+	{{#foreach from=$module.config.prefixes item="code"}}
 		{{* déterminer le numéro du compte d'amortissement associé au compte d'immobilisation *}}
 		{{:include
 			file="./_get_amort_code.html"

scripts.js

@@ -119,7 +119,6 @@ function displayAmort(id_immo, id_duree, id_amort, id_years, id_exercices, id_mo
 	}
 	if (id_date != null) {
 		const date_choisie = str2sec(document.getElementById(id_date).value);
-		console.log("date_choisie = " + date_choisie + ", date_debut=" + date_debut + ", date_fin = " + date_fin);
 		if (date_debut <= date_choisie && date_choisie <= date_fin) {
 			date_fin = date_choisie;
 		} else {
@@ -142,14 +141,15 @@ function setSelectorYear(button_names, f_years_selector) {
 
 // config : gestion des ajouts/suppression comptes immo
 
+// Associer au bouton « Enlever » de chaque ligne l'action de suppression de la ligne
 function initLine(row) {
 	var removeBtn = row.querySelector('button[name="remove_line"]');
 	removeBtn.onclick = () => {
-		var count = $('.transaction-lines tbody tr').length;
+		let count = removeBtn.closest("table").querySelectorAll('tbody tr').length;
 		var min = removeBtn.getAttribute('min');
 
 		if (count <= min) {
-			alert("Il n'est pas possible d'avoir moins de " + min + " compte(s).");
+			alert("Il n'est pas possible d'avoir moins de " + min + " ligne(s).");
 			return false;
 		}
 
@@ -157,3 +157,96 @@ function initLine(row) {
 		return true;
 	};
 }
+
+// Associer au bouton « Ajouter » de chaque table l'action d'ajouter une ligne
+function addLine(button, codes) {
+	button.onclick = () => {
+		let lines = button.closest("table").querySelectorAll('tbody tr');
+		let line = lines[lines.length - 1];
+		let newNode = line.cloneNode(true);
+
+		// Réinitialiser le sélecteur de compte
+		let selectButton = newNode.querySelector('.input-list button');
+		let url = selectButton.value;
+		let new_url = url.replace(/codes=[0-9]+\*?/, "codes=" + codes);
+		selectButton.value = new_url;
+
+		// gestionnaire d'événement du sélecteur
+		selectButton.onclick = () => {
+			g.current_list_input = selectButton.parentNode;
+			let url = selectButton.value + (selectButton.value.indexOf('?') > 0 ? '&' : '?') + '_dialog';
+			g.openFrameDialog(url);
+			return false;
+		};
+
+		// réinitialiser le libellé associé au sélecteur
+		let lib = newNode.querySelector('.input-list span.label');
+		lib.innerText = '';
+
+		// ajouter la nouvelle ligne
+		line.parentNode.appendChild(newNode);
+		initLine(newNode);
+	};
+}
+
+// calculer et afficher le total des lignes sélectionnées
+function computeTotal(id_total, id_url) {
+
+	// calculer le total par compte
+	let total = new Object;
+	const transactions = [];
+	let lines = document.querySelectorAll('.list tbody tr');
+	for (const line of lines) {
+		let button = line.querySelector('input[type=checkbox]');
+		if (button.checked) {
+			let money = line.querySelector('.money');
+			let code = line.querySelector('.account_code a').innerText;
+			if (code in total) {
+				total[code] += getNumber(money.innerText) * 100;
+			} else {
+				total[code] = getNumber(money.innerText) * 100;
+			}
+			const number = line.querySelector('.num a').innerText.slice(1);
+			transactions.push(number);
+		}
+	}
+	// afficher les totaux
+	const liste = document.getElementById(id_total).querySelector('ul');
+	while (liste.firstChild) {
+		liste.removeChild(liste.firstChild);
+	}
+	for (const code in total) {
+		const node = document.createElement("li");
+		const para = document.createElement("p");
+		const libelle = document.createTextNode("Compte " + code + " : ");
+		const span = document.createElement("strong");
+		span.classList.add("money");
+		const montant = document.createTextNode(new Intl.NumberFormat("fr-FR", { style: "currency", currency: "EUR" }).format(total[code] / 100., ));
+
+		span.appendChild(montant);
+		para.appendChild(libelle);
+		para.appendChild(span);
+		node.appendChild(para);
+		liste.appendChild(node);
+	}
+
+	// mettre à jour les paramètres de l'url
+	let url = document.getElementById(id_url);
+	let new_href = url.href.replace(/trans=.*/, 'trans=' + Object.values(transactions));
+	url.href = new_href;
+}
+
+// dupliquer la dernière ligne d'une table
+function copyLine(button) {
+	button.onclick = () => {
+		let lines = button.closest("table").querySelectorAll('tbody tr');
+		let line = lines[lines.length - 1];
+		let newNode = line.cloneNode(true);
+		let libelle = newNode.querySelector('input');
+		libelle.value = '';
+
+		// ajouter la nouvelle ligne
+		line.parentNode.appendChild(newNode);
+		initLine(newNode);
+	};
+}

style.css

@@ -38,10 +38,20 @@ h2[class="aide"], h3[class="aide"] {
 	margin-right: 0;
 }
 
+.informations dl.describe > dd {
+	margin-right: 0;
+}
+
 nav.amort aside {
 	margin-top : 0;
 }
 
-.describe dt::after {
-	content: ' :';
+fieldset.shortFormLeft div.informations {
+	border: 1px solid var(--gLightBorderColor);
+	background: rgba(var(--gSecondColor), 0.2);
+	border-radius: .5em;
+}
+
+span.strong {
+	font-weight: bold;
 }

transfer.html

@@ -0,0 +1,317 @@
+{{* -*- brindille -*- *}}
+
+{{:admin_header title="Transfert d'immobilisation en cours" current="module_amortissement"}}
+{{:include file="_get_config.html" keep="module.config.prefixes"}}
+
+{{#years closed=false order="start_date" assign=years.}}
+	{{:assign ts_debut=$start_date|strtotime}}
+	{{:assign ts_fin=$end_date|strtotime}}
+	{{:assign debut=$start_date|date_short}}
+	{{:assign fin=$end_date|date_short}}
+	{{:assign var="years_data.%d"|args:$id value=$ts_debut|cat:" "|cat:$ts_fin}}
+	{{:assign var="open_years.%d"|args:$id value=$label|cat:" ("|cat:$debut|cat:" - "|cat:$fin|cat:")"}}
+	{{if $ts_debut <= $now && $now <= $ts_fin}}
+		{{:assign selected_year=$id}}
+	{{/if}}
+{{else}}
+	{{:error message="Aucun exercice ouvert"}}
+{{/years}}
+
+{{* Traiter l'envoi du formulaire *}}
+{{#form on="transfer"}}
+	{{* vérifier que la date de mise en service est située dans l'exercice sélectionné *}}
+	{{:assign ts_date = $_POST.date_mes|parse_date|strtotime}}
+	{{:assign ok=false}}
+	{{#foreach from=$years}}
+		{{if $id == $_POST.id_year}}
+			{{:assign selected_chart=$id_chart}}
+			{{if $start_date|strtotime <= $ts_date && $ts_date <= $end_date|strtotime}}
+				{{:assign ok=true}}
+				{{:break}}
+			{{/if}}
+		{{/if}}
+	{{/foreach}}
+	{{if ! $ok}}
+		{{:error message="La date saisie n'est pas dans l'exercice choisi !"}}
+	{{/if}}
+
+	{{if ! $_POST.amortir}}
+		{{* ne pas amortir *}}
+		{{:assign duration=0}}
+		{{:assign date_debut=$_POST.date_achat|parse_date}}
+		{{:assign status="ignored"}}
+	{{else}}
+		{{* vérifier que la date d'acquisition est antérieure à la date de mise en service *}}
+		{{:assign date_debut=$_POST.date_mes|parse_date}}
+		{{:assign duration=$_POST.duree|intval}}
+		{{:assign status="managed"}}
+	{{/if}}
+
+	{{* comptes de débit *}}
+	{{#foreach from=$_POST.credit_accounts key="rang" item="elem"}}
+		{{:include
+			file="_get_codes.html"
+			account=$elem
+			keep="account_code"
+		}}
+		{{:assign debit_account=$account_code|keys|key:0}}
+		{{:assign var="amount" from="_POST.credit_lines.%s"|args:$rang}}
+		{{:assign var="label"  from="_POST.line_labels.%s"|args:$rang}}
+		{{:assign
+			var="lines."
+			account=$debit_account
+			credit=$amount
+			label=$label
+		}}
+	{{/foreach}}
+
+	{{* compte de crédit *}}
+	{{:include
+		file="_get_codes.html"
+		account=$_POST.debit_account
+		keep="account_code"
+	}}
+	{{:assign credit_account=$account_code|keys|key:0}}
+	{{:assign var="amount" from="_POST.debit_lines.%s"|args:0}}
+	{{:assign count=$_POST.line_labels|count}}
+	{{:assign count="%d-1"|math:$count}}
+	{{:assign var="label" from="_POST.line_labels.%s"|args:$count}}
+	{{:assign
+			var="lines."
+			account=$credit_account
+			debit=$amount
+			label=$label
+	}}
+
+	{{* vérifier :
+		- que le compte d'immo débute par un préfixe correct (20, 21, ...)
+		- est présent dans le PC de l'exercice correspondant à la date
+	*}}
+
+	{{:include
+		file="_check_account.html"
+		account=$account_code
+		chart_id=$selected_chart
+		prefix_array=$module.config.prefixes
+		keep="account_ok"
+	}}
+
+	{{if $account_ok == null}}
+		{{:assign compte=$credit_account|implode:""}}
+		{{:error message="Le compte « %s » n'est pas un compte d'immobilisation ou n'est pas dans le plan comptable de l'exercice choisi"|args:$compte}}
+	{{/if}}
+
+	{{* écritures liées *}}
+	{{:assign var="linked_transactions" value=$_GET.trans|explode:","}}
+
+	{{* enregistrer l'écriture *}}
+	{{:api
+		method="POST"
+		path="accounting/transaction"
+		assign="result"
+		id_year=$_POST.id_year
+		type="advanced"
+		date=$_POST.date_mes
+		label=$_POST.designation|trim
+		lines=$lines
+		linked_transactions=$linked_transactions
+	}}
+
+	{{:assign lines_count=$lines|count}}
+	{{:assign lines_count="%d-1"|math:$lines_count}}
+	{{:assign var="immo_id" from="result.lines.%s.id"|args:$lines_count}}
+
+	{{* enregistrer les infos de l'immobilisation *}}
+	{{:save
+		key=""|uuid
+		validate_schema="schema.json"
+		type="immo"
+		line=$immo_id
+		duration=$duration
+		date=$date_debut
+		status=$status
+	}}
+	{{if $_POST.amortir}}
+		{{:assign type_immo="managed"}}
+	{{else}}
+		{{:assign type_immo="other"}}
+	{{/if}}
+	{{:redirect force="index.html?ok=1&msg=immobilisation&type_immo=%s"|args:$type_immo}}
+
+{{/form}}
+
+{{* barre de navigation *}}
+{{if ! $dialog}}
+	{{:include file="_nav.html" current="index"}}
+{{/if}}
+
+{{:form_errors}}
+
+{{* formulaire d'ajout d'immobilisation *}}
+
+{{#select id,label FROM acc_projects WHERE archived = 0;}}
+	{{:assign var="projects.%d"|args:$id value=$label}}
+{{/select}}
+
+{{#foreach from=$module.config.prefixes item="code"}}
+	{{:assign var="pattern_array." value="%s*"|args:$code}}
+{{/foreach}}
+{{:assign var="patterns" value=$pattern_array|implode:"|"}}
+
+<div id="erreur" class="hidden">
+	<p class="block error">La date choisie n'est dans aucun exercice ouvert !</p>
+</div>
+
+{{if $_GET.trans == null}}
+	{{:error message="Vous n'avez sélectionné aucune écriture !"}}
+{{/if}}
+
+{{* déterminer les comptes d'immo en cours *}}
+{{:include file="_get_config.html" keep="module.config.unfinished"}}
+{{:assign condition="("}}
+{{#foreach from=$module.config.unfinished item="elem"}}
+	{{:assign code=$elem.code|cat:"%"|quote_sql}}
+	{{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
+{{/foreach}}
+{{:assign condition=$condition|cat:"0)"}}
+
+{{* détails des écritures paramètres *}}
+{{:assign trans=$_GET.trans|explode:","}}
+{{:assign var="trans_list" value=$trans|map:quote_sql}}
+{{:assign trans_list=$trans_list|implode:","}}
+{{:assign trans_list="("|cat:$trans_list|cat:")"}}
+{{:assign condition=$condition|cat:" AND trans.id IN "|cat:$trans_list}}
+{{:assign condition=$condition|cat:" AND NOT (trans.status & 16)"}}
+
+{{#select
+	trans.id as trans_id,
+	trans.label AS trans_label,
+	trans.date AS trans_date,
+	SUM(line.debit) AS line_debit,
+	account.code AS account_code,
+	account.label AS account_label,
+	line.id_project as project_id
+	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
+	WHERE !condition
+	GROUP BY trans.id
+	;
+	!condition=$condition
+}}
+	{{:assign var="transactions.%s"|args:$trans_id amount=$line_debit date=$trans_date code=$account_code label=$account_label project=$project_id}}
+{{/select}}
+
+<form method="post" action="">
+	<fieldset>
+		<legend>Données de l'immobilisation</legend>
+		<dl>
+			{{:input type="select" name="id_year" label="Exercice" default=$selected_year required=true
+			default_empty="— Faire un choix —" options=$open_years}}
+			{{:input type="date" name="date_mes" label="Date de mise en service" required=true default=$now|date_short}}
+			{{:input type="text" name="designation" label="Libellé" required=true}}
+		</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>Comptes</legend>
+		<dl>
+		<table class="list transaction-lines">
+			<thead>
+				<tr>
+					<th>Compte</th>
+					<th>Débit</th>
+					<th>Crédit</th>
+					<th>Libellé ligne</th>
+					<th>Projet</th>
+				</tr>
+			</thead>
+			<tbody>
+				{{:assign total=0}}
+				{{#foreach from=$transactions key="id"}}
+					{{:assign total="%f+%f"|math:$total:$amount}}
+					{{:assign current_account=null}}
+					{{:assign var="current_account.%s"|args:$code value="%s — %s"|args:$code:$label}}
+					<tr>
+						<td>
+							{{:input
+							type="list"
+							name="credit_accounts[]"
+							required=true
+							target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$code:$selected_year
+							default=$current_account
+							}}
+						</td>
+						<td>{{:input name="credit_lines[]" type="text" class="money" size="8" default=$amount|money}}</td>
+						<td>{{:input name="debit_lines[]"  type="text" class="money" size="8" disabled=true}}</td>
+						<td>{{:input type="text" name="line_labels[]" size="40"}}</td>
+						<td>
+							{{if $projects != null}}
+								{{:input type="select" name="id_project" options=$projects default_empty="— Aucun —"}}
+							{{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+			</tbody>
+			<tfoot>
+				<tr>
+					<td>
+						{{:input
+						type="list"
+						name="debit_account"
+						label="Compte d'immobilisation amortissable"
+						required=true
+						target="!acc/charts/accounts/selector.php?codes=%s&id_year=%d"|args:$patterns:$selected_year
+						}}
+					</td>
+					<td>{{:input name="credit_lines[]" type="text" class="money" size="8" disabled=true}}</td>
+					<td>{{:input name="debit_lines[]"  type="text" class="money" size="8" default=$total|money}}</td>
+					<td>{{:input type="text" name="line_labels[]" size="40"}}</td>
+					<td>
+						{{if $projects != null}}
+							{{:input type="select" name="id_project" options=$projects default_empty="— Aucun —"}}
+						{{/if}}
+					</td>
+				</tr>
+			</tfoot>
+		</table>
+
+		<div id="donnees" class="hidden">
+			{{:input type="select" name="years_data" options=$years_data}}
+		</div>
+		</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>Amortissement</legend>
+		<dl>
+			{{:input id="amortir" type="checkbox" value=1 name="amortir" label="Amortir cette immobilisation sur une ou plusieurs années" checked="checked" help="Dé-cocher pour ne pas amortir"}}
+			<div id="div_amort">
+				{{:input type="number" name="duree" label="Durée d'amortissement" required=true min=0 default=1 suffix="année(s)"}}
+			</div>
+		</dl>
+	</fieldset>
+
+	<p class="submit">
+		{{:button type="submit" name="transfer" label="Transférer" shape="right" class="main"}}
+	</p>
+
+</form>
+{{:admin_footer}}
+
+<script type="text/javascript" src="scripts.js"></script>
+<script type="text/javascript">
+
+function changeYear(evt, f_accounts = ['credit_accounts', 'debit_account'], f_years_select = 'f_id_year') {
+	setSelectorYear(f_accounts, f_years_select);
+}
+
+function changeVisibility(evt, idcheck = 'f_amortir_1', fields = ['div_amort']) {
+	toggleVisibility(idcheck, fields);
+}
+
+(function () {
+	document.getElementById('f_id_year').onchange = changeYear;
+	document.getElementById('f_amortir_1').onclick = changeVisibility;
+})();
+</script>

write_exit.html

@@ -33,21 +33,6 @@
 {{#load type="immo" assign="info_immo" where="$$.line = :line_id" :line_id=$_GET.immo_id|intval}}
 {{/load}}
 
-{{* date de début de l'exercice *}}
-{{#select start_date FROM acc_years WHERE id = :year_id; :year_id = $_GET.year}}
-{{*
-	{{if $start_date < "2025-01-01"
-*}}
-		{{:assign vnc_code="675"}}
-		{{:assign cession_code="775"}}
-{{*
-	{{else}}
-		{{:assign vnc_code="657"}}
-		{{:assign cession_code="757"}}
-	{{/if}}
-*}}
-{{/select}}
-
 {{:assign valeur_nette="%f-%f"|math:$ligne_immo.montant:$_GET.amort_amount}}
 {{:assign amort_comp=0}}		{{* amortissement complémentaire jqà date sortie *}}
 {{:assign amort_except=0}}		{{* amortissement exceptionnel jqà date fin amortissement *}}
@@ -269,16 +254,25 @@
 {{if ! $dialog}}
 	{{:include file="_nav.html" current="index" subcurrent="balance_exit"}}
 {{/if}}
-{{:form_errors}}
 
-{{* Préparer les infos pour le formulaire *}}
+{{*
+	Préparer les infos pour le formulaire
+	déterminer les comptes pour les différentes écritures
+*}}
 
-{{* déterminer les comptes pour les différentes écritures *}}
 {{:include
 	file="./_get_amort_code.html"
 	code_immo=$ligne_immo.code
 	keep="code_amort"
 }}
+
+{{*
+	Utilisation des « anciens » numéros de comptes because conflit
+	avec les nouveaux numéros ; voir info.org
+*}}
+{{:assign vnc_code="652"}}
+{{:assign cession_code="757"}}
+
 {{:assign var="liste_codes.6811" name="comp_account"}}
 {{:assign var="liste_codes.687" name="except_account"}}
 {{:assign var="liste_codes.462" name="creance_account"}}
@@ -289,30 +283,36 @@
 {{:assign condition=$liste_codes|keys|implode:","}}
 {{:assign condition="acc.code IN ("|cat:$condition|cat:")"}}
 
+{{#select
+	chart.id
+	FROM acc_charts AS chart
+	INNER JOIN acc_years AS year ON chart.id = year.id_chart
+	WHERE year.id = :year_id;
+	:year_id = $_GET.year
+	}}
+	{{:assign chart_id=$id}}
+{{/select}}
+
 {{#select
 	acc.id,
 	acc.code as acc_code,
-	acc.label as acc_label,
-	year.label as year_label
+	acc.label as acc_label
 	FROM acc_accounts as acc
 	INNER JOIN acc_charts as chart ON chart.id = acc.id_chart
-	INNER JOIN acc_years as year ON chart.id = year.id_chart
-	WHERE year.id = 1 AND !condition;
+	WHERE chart.id = :chart_id AND !condition;
+	:chart_id = $chart_id
 	!condition=$condition
 }}
 	{{:assign var="liste_codes.%s.id"|args:$acc_code value=$id}}
 	{{:assign var="liste_codes.%s.acc_label"|args:$acc_code value=$acc_label}}
-	{{:assign var="liste_codes.%s.year_label"|args:$acc_code value=$year_label}}
 {{/select}}
 
 {{#foreach from=$liste_codes key=code}}
 	{{:assign var="%s.%s"|args:$name:$code value="%s — %s"|args:$code:$acc_label}}
 {{/foreach}}
 
-{{:read file="./defaut.json" assign="config_json"}}
-{{:assign config_defaut=$config_json|json_decode}}
-
-{{#foreach from=$config_defaut.prefixes item="code"}}
+{{:include file="_get_config.html" keep="module.config.prefixes"}}
+{{#foreach from=$module.config.prefixes item="code"}}
 	{{:assign var="pattern_array." value="%s*"|args:$code}}
 {{/foreach}}
 {{:assign patterns=$pattern_array|implode:"|"}}
@@ -385,7 +385,7 @@
 							{{:input
 							type="list"
 							name="comp_account"
-							target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"68*":$_GET.year
+							target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"68*":$chart_id
 							default=$comp_account
 							}}
 						</td>
@@ -397,7 +397,7 @@
 							{{:input
 							type="list"
 							name="amort_comp_account"
-							target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year
+							target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id
 							default=$amort_account
 							}}
 						</td>
@@ -429,7 +429,7 @@
 							{{:input
 							type="list"
 							name="except_account"
-							target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"687*":$_GET.year
+							target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"687*":$chart_id
 							default=$except_account
 							}}
 						</td>
@@ -441,7 +441,7 @@
 							{{:input
 							type="list"
 							name="amort_except_account"
-							target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year
+							target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id
 							default=$amort_account
 							}}
 						</td>
@@ -467,7 +467,7 @@
 						{{:input
 						type="list"
 						name="amort_sortie_account"
-						target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"28*":$_GET.year
+						target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"28*":$chart_id
 						default=$amort_account
 						}}
 					</td>
@@ -485,7 +485,7 @@
 							{{:input
 							type="list"
 							name="vnc_account"
-							target="!acc/charts/accounts/selector.php?codes=%s*&year=%d"|args:$vnc_code:$_GET.year
+							target="!acc/charts/accounts/selector.php?codes=%s*&id_chart=%s"|args:$vnc_code:$chart_id
 							default=$vnc_account
 							}}
 						</td>
@@ -494,11 +494,11 @@
 					</tr>
 				{{/if}}
 				<tr>
-					<td> {{* style="pointer-events: none; opacity: 0.6;">*}}
+					<td>
 						{{:input
 						type="list"
 						name="immo_account"
-						target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:$patterns:$_GET.year
+						target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:$patterns:$chart_id
 						default=$immo_account
 						}}
 					</td>
@@ -524,7 +524,7 @@
 							{{:input
 								type="list"
 								name="creance_account"
-								target="!acc/charts/accounts/selector.php?codes=%s&year=%d"|args:"462*":$_GET.year
+								target="!acc/charts/accounts/selector.php?codes=%s&id_chart=%s"|args:"462*":$chart_id
 								default=$creance_account
 							}}
 						</td>
@@ -536,7 +536,7 @@
 							{{:input
 								type="list"
 								name="cession_account"
-								target="!acc/charts/accounts/selector.php?codes=%s*&year=%d"|args:$cession_code:$_GET.year
+								target="!acc/charts/accounts/selector.php?codes=%s*&id_chart=%s"|args:$cession_code:$chart_id
 								default=$cession_account
 							}}
 						</td>
@@ -552,4 +552,5 @@
 	{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
 </p>
 </form>
+{{:form_errors}}
 {{:admin_footer}}