X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_accounts.inc;h=2bb39707cce6b3de985b47603cacb4d2175fd44a;hb=b17df731b4bb055c2fdd568bc4be9e5caa0ee07b;hp=15d524e734a83d4f45867364e6c53b76fc0d7db9;hpb=4301c9cda0f510cc52335408380b368e51c2a663;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_bank_accounts.inc b/gl/includes/db/gl_db_bank_accounts.inc
index 15d524e7..2bb39707 100644
--- a/gl/includes/db/gl_db_bank_accounts.inc
+++ b/gl/includes/db/gl_db_bank_accounts.inc
@@ -14,38 +14,51 @@ function add_bank_account($account_code, $account_type, $bank_account_name, $ban
 
 //---------------------------------------------------------------------------------------------
 
-function update_bank_account($account_code, $account_type, $bank_account_name, $bank_name, $bank_account_number,
+function update_bank_account($id, $account_code, $account_type, $bank_account_name, $bank_name, $bank_account_number,
 	$bank_address, $bank_curr_code)
 {
 	$sql = "UPDATE ".TB_PREF."bank_accounts	SET account_type = $account_type,
+		account_code=".db_escape($account_code).",
 		bank_account_name=".db_escape($bank_account_name).", bank_name=".db_escape($bank_name).",
 		bank_account_number=".db_escape($bank_account_number).", bank_curr_code='$bank_curr_code',
-		bank_address=".db_escape($bank_address)." WHERE account_code = '$account_code'";
+		bank_address=".db_escape($bank_address)." WHERE id = '$id'";
 
 	db_query($sql, "could not update bank account for $account_code");
 }
 
 //---------------------------------------------------------------------------------------------
 
-function delete_bank_account($account_code)
+function delete_bank_account($id)
 {
-	$sql = "DELETE FROM ".TB_PREF."bank_accounts WHERE account_code='$account_code'";
+	$sql = "DELETE FROM ".TB_PREF."bank_accounts WHERE id='$id'";
 
-	db_query($sql,"could not delete bank account for $account_code");
+	db_query($sql,"could not delete bank account for $id");
 }
 
 
 //---------------------------------------------------------------------------------------------
 
-function get_bank_account($account_code)
+function get_bank_account($id)
 {
-	$sql = "SELECT * FROM ".TB_PREF."bank_accounts WHERE account_code='$account_code'";
+	$sql = "SELECT * FROM ".TB_PREF."bank_accounts WHERE id='$id'";
 
-	$result = db_query($sql, "could not retreive bank account for $account_code");
+	$result = db_query($sql, "could not retreive bank account for $id");
 
 	return db_fetch($result);
 }
 
+//---------------------------------------------------------------------------------------------
+function get_bank_gl_account($id)
+{
+	$sql = "SELECT account_code FROM ".TB_PREF."bank_accounts WHERE id='$id'";
+
+	$result = db_query($sql, "could not retreive bank account for $id");
+
+	$bank_account = db_fetch($result);
+
+	return $bank_account['account_code'];
+}
+
 //---------------------------------------------------------------------------------------------
 
 function add_quick_entry($description, $deposit, $bank_only)
@@ -106,16 +119,38 @@ function delete_quick_entry_line($selected_id)
 }
 //---------------------------------------------------------------------------------------------
 
-function get_quick_entries($deposit=null, $bank_only=null)
+
+function has_quick_entries($deposit=-1, $bank_only=-1)
+{
+	$where = false;
+	$sql = "SELECT id FROM ".TB_PREF."quick_entries";
+	if ($deposit != -1)
+	{
+		$sql .= " WHERE deposit=$deposit";
+		$where = true;
+	}		
+	if ($bank_only != -1)
+	{
+		if ($where)
+			$sql .= " AND bank_only=$bank_only";
+		else	
+			$sql .= " WHERE bank_only=$bank_only";
+	}		
+
+	$result = db_query($sql, "could not retreive quick entries");
+	return db_num_rows($result) > 0;
+}
+
+function get_quick_entries($deposit=-1, $bank_only=-1)
 {
 	$where = false;
 	$sql = "SELECT * FROM ".TB_PREF."quick_entries";
-	if ($deposit != null)
+	if ($deposit != -1)
 	{
 		$sql .= " WHERE deposit=$deposit";
 		$where = true;
 	}		
-	if ($bank_only != null)
+	if ($bank_only != -1)
 	{
 		if ($where)
 			$sql .= " AND bank_only=$bank_only";