write_exit : correction sélecteurs comptes

_unfinished.html

@@ -23,16 +23,7 @@
 		<tbody>
 
 			{{* lister les immobilisations en cours de constitution *}}
-			{{:include file="_get_config.html" keep="config.prefixes"}}
-			{{:assign condition="("}}
-			{{#foreach from=$config.prefixes item="code"}}
-				{{if $code|substr:0:2 == "23"}}
-					{{:assign code=$code|cat:"%"|quote_sql}}
-					{{:assign condition=$condition|cat:" account.code LIKE "|cat:$code|cat:" OR "}}
-				{{/if}}
-			{{/foreach}}
-			{{:assign condition=$condition|cat:"0)"}}
-			{{:assign condition=$condition|cat:" AND debit > 0 AND NOT (trans.status & 16)"}}
+			{{:assign condition=$condition|cat:"account.code LIKE '23%' AND debit > 0 AND NOT (trans.status & 16)"}}
 			{{:assign nb_immo=0}}
 
 			{{#select

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="675"}}
+{{:assign cession_code="775"}}
+
 {{: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,20 +283,28 @@
 {{: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}}
@@ -383,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>
@@ -395,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>
@@ -427,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>
@@ -439,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>
@@ -465,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>
@@ -483,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>
@@ -492,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>
@@ -522,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>
@@ -534,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>
@@ -550,4 +552,5 @@
 	{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
 </p>
 </form>
+{{:form_errors}}
 {{:admin_footer}}