amortization.html

@@ -41,11 +41,11 @@
 	y.id as year_id,
 	y.end_date as date_amort,
 	project.label as project_label
-	FROM acc_transactions_lines AS line
+	from acc_transactions_lines as line
-	INNER JOIN acc_transactions AS trans ON line.id_transaction = trans.id
+	inner join acc_transactions as trans on line.id_transaction = trans.id
-	INNER JOIN acc_years AS y ON trans.id_year = y.id
+	inner join acc_years as y on trans.id_year = y.id
-	LEFT JOIN acc_projects AS project ON line.id_project = project.id
+	left join acc_projects AS project ON line.id_project = project.id
-	WHERE line.id = :line_id;
+	where line.id = :line_id;
 	:line_id = $_GET.immo_id|intval
 	assign=ligne_immo
 	}}
@@ -70,9 +70,9 @@
 	trans.date as amort_date,
 	trans.label as trans_label,
 	trans.id_year as amort_year,
-	account.id as account_id,
+	acc.id as account_id,
-	account.code as account_code,
+	acc.code as account_code,
-	account.label as account_name
+	acc.label as account_name
 	FROM
 	acc_transactions_lines as l_immo
 	INNER JOIN acc_transactions as t_immo on t_immo.id = l_immo.id_transaction
@@ -84,13 +84,11 @@
 		)
 	INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction
 	INNER join acc_transactions as trans on l_amort.id_transaction = trans.id
-	INNER join acc_accounts as account on l_amort.id_account = account.id
+	INNER join acc_accounts as acc on l_amort.id_account = acc.id
 	WHERE
 		l_immo.id = :line_id
 	AND
 		l_amort.credit <> 0
-	AND
-		account.code LIKE '28%'
 	ORDER BY trans.date;
 	:line_id = $_GET.immo_id|intval
 	assign=linked_lines.
@@ -200,7 +198,7 @@
 				{{#foreach count="%d+1"|math:$nbamort key="num"}}
 					{{:assign solde_prec=$solde}}
 					{{:assign solde="%f-%d"|math:$solde:$annuite_courante}}
-					{{#select id FROM acc_years WHERE :amort_date >= start_date AND :amort_date <= end_date AND status == 0; :amort_date=$date_amort|parse_date}}
+					{{#select id from acc_years where :amort_date >= start_date and :amort_date <= end_date and status == 0; :amort_date=$date_amort|parse_date}}
 						{{:assign enregistrer=1}}
 						{{:assign current_year=$id}}
 					{{else}}
@@ -248,22 +246,22 @@
 		li.label as l_label,
 		trans.date as t_date,
 		trans.label as t_label,
-		account.code as a_code,
+		acc.code as a_code,
-		account.label as a_label,
+		acc.label as a_label,
 		y.label as y_label
-		FROM acc_transactions_lines AS li
+		from acc_transactions_lines as li
-		INNER JOIN acc_accounts AS account ON account.id = li.id_account
+		inner join acc_accounts as acc on acc.id = li.id_account
-		INNER JOIN acc_transactions AS trans ON trans.id = li.id_transaction
+		inner join acc_transactions as trans on trans.id = li.id_transaction
-		INNER JOIN acc_years AS y ON y.id = trans.id_year
+		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 acc.code like "28%" AND credit > 0 AND (NOT trans.status & 16)
-		ORDER BY trans.date, trans.label;
+		order by trans.date, trans.label;
 		assign=autre_amort
 	}}
 		{{#select
 			id_transaction,
 			id_related
-			FROM acc_transactions_links
+			from acc_transactions_links
-			WHERE id_transaction = :id_amort OR id_related = :id_amort;
+			where id_transaction = :id_amort or id_related = :id_amort;
 			:id_amort=$t_id
 		}}
 		{{else}}

immobilisations.html

@@ -90,13 +90,10 @@
 						t_immo.id = links.id_related
 					)
 					INNER JOIN acc_transactions_lines as l_amort on amort_trans_id = l_amort.id_transaction
-					INNER JOIN acc_accounts AS account ON l_amort.id_account = account.id
 					WHERE
 						l_immo.id = :line_id
 					AND
-						l_amort.credit <> 0
+						l_amort.credit <> 0;
-					AND
-						account.code LIKE '28%';
 					:line_id = $immo_id|intval
 					}}
 					{{if $amort_amount == null}}

immobilisations_non.html

@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{* Liste des immobilisations non amortissables *}}
+{{* Liste des immobilisations non amortissable *}}
 
 <section class="immobilisation">
 	<h2 class="ruler">Immobilisations non amortissables</h2>