X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_accounts.inc;h=9622ebc26a837d1d4b7dd93323bec318b2260a01;hb=d13f7277c62f8231041d086da9c66f7ed22d6659;hp=920facba71f574ed6e58cd61621ae8bea719261f;hpb=97023f8706bb7149c62ca49eaec123cca3c51fa0;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 920facba..9622ebc2 100644
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -1,22 +1,29 @@
 <?php
-
-
-function add_gl_account($account_code, $account_name, $account_type, $account_code2, $tax_code)
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+function add_gl_account($account_code, $account_name, $account_type, $account_code2)
 {
 	$account_name = db_escape($account_name);
-	$sql = "INSERT INTO ".TB_PREF."chart_master (account_code, account_code2, account_name, account_type,
-		tax_code) 
-		VALUES ('$account_code', '$account_code2', '$account_name', $account_type, $tax_code)";
+	$sql = "INSERT INTO ".TB_PREF."chart_master (account_code, account_code2, account_name, account_type)
+		VALUES (".db_escape($account_code).", ".db_escape($account_code2).", $account_name, $account_type)";
 
 	db_query($sql, "could not add gl account");
 }
 
-function update_gl_account($account_code, $account_name, $account_type, $account_code2, $tax_code)
+function update_gl_account($account_code, $account_name, $account_type, $account_code2)
 {
 	$account_name = db_escape($account_name);
-    $sql = "UPDATE ".TB_PREF."chart_master SET account_name='$account_name',
-		account_type=$account_type, account_code2='$account_code2',
-		tax_code=$tax_code WHERE account_code = '$account_code'";
+    $sql = "UPDATE ".TB_PREF."chart_master SET account_name=$account_name,
+		account_type=$account_type, account_code2=".db_escape($account_code2)
+		." WHERE account_code = '$account_code'";
 
 	db_query($sql, "could not update gl account");
 }
@@ -35,10 +42,10 @@ function get_gl_accounts($from=null, $to=null)
 		WHERE ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id";
 	if ($from != null)
 		$sql .= " AND ".TB_PREF."chart_master.account_code >= '$from'";
-	if ($to != null)	
+	if ($to != null)
 		$sql .= " AND ".TB_PREF."chart_master.account_code <= '$to'";
 	$sql .= " ORDER BY account_code";
-	
+
 	return db_query($sql, "could not get gl accounts");
 }
 
@@ -48,10 +55,10 @@ function get_gl_accounts_all($balance=-1)
 		FROM ".TB_PREF."chart_master,".TB_PREF."chart_types, ".TB_PREF."chart_class
 		WHERE ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id AND
 		".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid";
-	if ($balance != -1)				
+	if ($balance != -1)
 		$sql .= " AND ".TB_PREF."chart_class.balance_sheet=$balance";
 	$sql .= " ORDER BY ".TB_PREF."chart_class.cid, ".TB_PREF."chart_types.id, ".TB_PREF."chart_master.account_code";
-	
+
 	return db_query($sql, "could not get gl accounts");
 }
 
@@ -69,12 +76,12 @@ function is_account_balancesheet($code)
 		WHERE ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id AND
 		".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid
 		AND ".TB_PREF."chart_master.account_code='$code'";
-	
+
 	$result = db_query($sql,"could not retreive the account class for $code");
 	$row = db_fetch_row($result);
 	return $row[0];
 }
-	
+
 function get_gl_account_name($code)
 {
 	$sql = "SELECT account_name from ".TB_PREF."chart_master WHERE account_code='$code'";