X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_accounts.inc;h=eb61b1c743c9e286d09af40d1df6777e0970a9db;hb=29bfc95a3b218ab90694535a0e94acd380b738b5;hp=7e4aaf59e2f9e4777b05c2137aa53410ac35fa30;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 7e4aaf59..eb61b1c7 100644
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -1,30 +1,29 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    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, $tax_code)
+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 (".db_escape($account_code).", ".db_escape($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=".db_escape($account_code2).",
-		tax_code=$tax_code WHERE account_code = '$account_code'";
+		account_type=$account_type, account_code2=".db_escape($account_code2)
+		." WHERE account_code = '$account_code'";
 
 	db_query($sql, "could not update gl account");
 }
@@ -52,13 +51,19 @@ function get_gl_accounts($from=null, $to=null)
 
 function get_gl_accounts_all($balance=-1)
 {
-	$sql = "SELECT ".TB_PREF."chart_master.*,".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_class.class_name AS AccountClassName
-		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)
+		$where ="WHERE ctype>0 AND ctype<".CL_INCOME;
+	elseif ($balance == 0)	
+		$where ="WHERE ctype>".CL_EQUITY." OR ctype=0"; // backwards compatibility
+ 	$sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_types.id AS AccountType,
+	 	".TB_PREF."chart_types.parent, ".TB_PREF."chart_class.class_name AS AccountClassName, ".TB_PREF."chart_class.cid AS ClassID, 
+	 	".TB_PREF."chart_class.ctype AS ClassType
+	 	FROM ".TB_PREF."chart_types INNER JOIN ".TB_PREF."chart_class ON ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid
+	 	LEFT JOIN ".TB_PREF."chart_master ON ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id ";
 	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";
+		$sql .= $where; 	 	 		
+	 $sql .= " ORDER BY ".TB_PREF."chart_class.cid, IF(parent > 0,parent,".TB_PREF."chart_types.id), 
+	 	IF(parent > 0,".TB_PREF."chart_types.id, parent), ".TB_PREF."chart_master.account_code";
 
 	return db_query($sql, "could not get gl accounts");
 }
@@ -73,14 +78,14 @@ function get_gl_account($code)
 
 function is_account_balancesheet($code)
 {
-	$sql = "SELECT ".TB_PREF."chart_class.balance_sheet FROM ".TB_PREF."chart_class, ".TB_PREF."chart_types, ".TB_PREF."chart_master
+	$sql = "SELECT ".TB_PREF."chart_class.ctype FROM ".TB_PREF."chart_class, ".TB_PREF."chart_types, ".TB_PREF."chart_master
 		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];
+	return $row[0] > 0 && $row[0] < CL_INCOME;
 }
 
 function get_gl_account_name($code)