From 42c2fb5736d3ccfb9fcc942c96deefdbdda73986 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 3 May 2021 13:47:26 +0200
Subject: [PATCH] Fix sql error on new filter

---
 htdocs/accountancy/bookkeeping/balance.php    | 20 +++++++++----------
 .../accountancy/class/bookkeeping.class.php   |  3 +--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index bc0cca4cc1b..bc9de743a07 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -254,6 +254,12 @@ if ($action != 'export_csv') {
 	$moreforfilter .= '<label for="show_subgroup">'.$langs->trans('ShowSubtotalByGroup').'</label>: ';
 	$moreforfilter .= '<input type="checkbox" name="show_subgroup" id="show_subgroup" value="show_subgroup"'.($show_subgroup == 'show_subgroup' ? ' checked' : '').'>';
 
+	$moreforfilter .= '</div>';
+
+	$moreforfilter .= '<div class="divsearchfield">';
+
+	$moreforfilter .= $langs->trans("Journal");
+	$moreforfilter .= $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
 
 	$moreforfilter .= '</div>';
 
@@ -266,24 +272,16 @@ if ($action != 'export_csv') {
 		print '</div>';
 	}
 
+
 	$colspan = (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE) ? 5 : 4);
 
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
-	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre">';
-	print $langs->trans('Journals');
-	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
-	print '</td>';
-	print '</tr>';
-
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre" colspan="'.$colspan.'">';
-	print $langs->trans('From');
-	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
+	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, '', 'accounts');
 	print ' ';
-	print $langs->trans('to');
-	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
+	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, '', 'accounts');
 	print '</td>';
 	print '<td class="liste_titre center">';
 	$searchpicto = $form->showFilterButtons();
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 06ff8d9cb8c..499ace29b8b 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1103,8 +1103,7 @@ class BookKeeping extends CommonObject
 		$sql = 'SELECT';
 		$sql .= " t.numero_compte,";
 		$sql .= " SUM(t.debit) as debit,";
-		$sql .= " SUM(t.credit) as credit,";
-		$sql .= " t.code_journal";
+		$sql .= " SUM(t.credit) as credit";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
 		$sqlwhere = array();