X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_lists.inc;h=3a0ec674006721ad622286ae2348a4f765bcf6a1;hb=69cb44aa7570e2ce26f540014cd682bc21c2ad1c;hp=6b9d714d504787d877bbf5ba0a7e25bdf1857bfc;hpb=ec3b5ef00ee07bdf7559c8bdb6f857b7464c3fbe;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 6b9d714d..3a0ec674 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1137,7 +1137,7 @@ function movement_types_list_row($label, $name, $selected_id=null)
 }
 
 //-----------------------------------------------------------------------------------------------
-
+/*
 function bank_trans_types_list($name, $selected_id=null)
 {
 	$sql = "SELECT id, name FROM ".TB_PREF."bank_trans_types";
@@ -1159,7 +1159,7 @@ function bank_trans_types_list_row($label, $name, $selected_id=null)
 	bank_trans_types_list_cells($label, $name, $selected_id);
 	echo "</tr>\n";
 }
-
+*/
 //-----------------------------------------------------------------------------------------------
 
 function workcenter_list($name, $selected_id=null, $all_option=false)
@@ -1196,11 +1196,12 @@ function workcenter_list_row($label, $name, $selected_id=null, $all_option=false
 
 function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
 {
-	$sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
-		FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
-		WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
+	$sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+		FROM ".TB_PREF."bank_accounts";
+//		, ".TB_PREF."chart_master
+//		WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
 
-	return combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name',
+	return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
 	array(
 		'format' => '_format_add_curr',
 		'select_submit'=> $submit_on_change,
@@ -1229,15 +1230,14 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 
 function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
-	$sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
-		FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
-		WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code"
-		. " AND ".TB_PREF."bank_accounts.account_type=3";
+	$sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code
+		FROM ".TB_PREF."bank_accounts
+		WHERE ".TB_PREF."bank_accounts.account_type=3";
 
 	if ($label != null)
 		echo "<tr><td>$label</td>\n";
 	echo "<td>";
-	$str = combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name',
+	$str = combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
 	array(
 		'format' => '_format_add_curr',
 		'select_submit'=> $submit_on_change,
@@ -1381,7 +1381,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
 			FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
 			."LEFT JOIN ".TB_PREF."bank_accounts acc "
 			."ON chart.account_code=acc.account_code
-				WHERE acc.account_code IS NULL
+				WHERE acc.account_code  IS NULL
 			AND chart.account_type=type.id";
 	else
 		$sql = "SELECT chart.account_code, chart.account_name, type.name
@@ -1562,13 +1562,17 @@ function payment_person_types_list_row($label, $name, $selected_id=null, $relate
 
 //------------------------------------------------------------------------------------------------
 
-function quick_entries_list($name, $selected_id=null, $expense=true, $submit_on_change=false)
+function quick_entries_list($name, $selected_id=null, $expense=true, $bank_only=true, $submit_on_change=false)
 {
-	$sql = "SELECT * FROM ".TB_PREF."quick_entries";
+	$sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
 	if ($expense)
 		$sql .= " WHERE deposit=0";
 	else
 		$sql .= " WHERE deposit=1";
+	if ($bank_only)
+		$sql .= " AND bank_only=1";
+	else
+		$sql .= " AND bank_only=0";
 	combo_input($name, $selected_id, $sql, 'id', 'description',
 		array(
 			'spec_id' => '',
@@ -1579,10 +1583,10 @@ function quick_entries_list($name, $selected_id=null, $expense=true, $submit_on_
 
 }
 
-function quick_entries_list_row($label, $name, $selected_id=null, $expense=true, $submit_on_change=false)
+function quick_entries_list_row($label, $name, $selected_id=null, $expense=true, $bank_only=true, $submit_on_change=false)
 {
 	echo "<tr><td>$label</td><td>\n";
-	quick_entries_list($name, $selected_id, $expense, $submit_on_change);
+	quick_entries_list($name, $selected_id, $expense, $bank_only, $submit_on_change);
 	echo "</td></tr>\n";
 }