X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_groups_db.inc;h=fb40bf7de1dccd349c24fd98ddd727bd682d64ed;hb=26d7ae434469ae407f209ae3c0d3955b29107d95;hp=7823bcb93729cf58c6885621d9e79bf95fc31e25;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/taxes/db/tax_groups_db.inc b/taxes/db/tax_groups_db.inc
index 7823bcb9..fb40bf7d 100644
--- a/taxes/db/tax_groups_db.inc
+++ b/taxes/db/tax_groups_db.inc
@@ -1,62 +1,52 @@
 <?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 clear_shipping_tax_group() {
-	  $sql = "UPDATE ".TB_PREF."tax_groups SET tax_shipping=0 WHERE 1";
-	  db_query($sql, "could not update tax_shipping fields");	  
-}
-
-function add_tax_group($name, $tax_shipping, $taxes, $rates)
+function add_tax_group($name, $taxes, $tax_shippings)
 {
 	begin_transaction();
 
-	if($tax_shipping) 	// only one tax group for shipping
-	  clear_shipping_tax_group();
-		
-	$sql = "INSERT INTO ".TB_PREF."tax_groups (name, tax_shipping) VALUES (".db_escape($name).", $tax_shipping)";
+	$sql = "INSERT INTO ".TB_PREF."tax_groups (name) VALUES (".db_escape($name).")";
 	db_query($sql, "could not add tax group");
 	
 	$id = db_insert_id();
 	
-	add_tax_group_items($id, $taxes, $rates);	
+	add_tax_group_items($id, $taxes, $tax_shippings);	
 	
 	commit_transaction();	
 }
 
-function update_tax_group($id, $name, $tax_shipping, $taxes, $rates)
+function update_tax_group($id, $name, $taxes, $tax_shippings)
 {
 	begin_transaction();	
 
-	if($tax_shipping) 	// only one tax group for shipping
-	  clear_shipping_tax_group();
-	
-    $sql = "UPDATE ".TB_PREF."tax_groups SET name=".db_escape($name).",tax_shipping=$tax_shipping WHERE id=$id";
+    $sql = "UPDATE ".TB_PREF."tax_groups SET name=".db_escape($name)." WHERE id=".db_escape($id);
 	db_query($sql, "could not update tax group");
 	
 	delete_tax_group_items($id);
-	add_tax_group_items($id, $taxes, $rates);	
+	add_tax_group_items($id, $taxes, $tax_shippings);	
 	
 	commit_transaction();			
 }
 
-function get_all_tax_groups()
+function get_all_tax_groups($all=false)
 {
 	$sql = "SELECT * FROM ".TB_PREF."tax_groups";
+	if (!$all) $sql .= " WHERE !inactive";
 	
 	return db_query($sql, "could not get all tax group");
 } 
 
 function get_tax_group($type_id)
 {
-	$sql = "SELECT * FROM ".TB_PREF."tax_groups WHERE id=$type_id";
+	$sql = "SELECT * FROM ".TB_PREF."tax_groups WHERE id=".db_escape($type_id);
 	
 	$result = db_query($sql, "could not get tax group");
 	
@@ -67,7 +57,7 @@ function delete_tax_group($id)
 {
 	begin_transaction();
 		
-	$sql = "DELETE FROM ".TB_PREF."tax_groups WHERE id=$id";
+	$sql = "DELETE FROM ".TB_PREF."tax_groups WHERE id=".db_escape($id);
 		
 	db_query($sql, "could not delete tax group");
 	
@@ -76,84 +66,76 @@ function delete_tax_group($id)
 	commit_transaction();
 }
 
-function add_tax_group_items($id, $items, $rates)
+function add_tax_group_items($id, $items, $tax_shippings)
 {
 	for ($i=0; $i < count($items); $i++) 
 	{
-		$sql = "INSERT INTO ".TB_PREF."tax_group_items (tax_group_id, tax_type_id, rate)
-			VALUES ($id,  " . $items[$i] . ", " . $rates[$i] .")";
+		$sql = "INSERT INTO ".TB_PREF."tax_group_items (tax_group_id, tax_type_id, tax_shipping)
+			VALUES (".db_escape($id).",  ".db_escape($items[$i]).", " . $tax_shippings[$i] .")";
 		db_query($sql, "could not add item tax group item");					
 	}		
 }
 
 function delete_tax_group_items($id)
 {
-	$sql = "DELETE FROM ".TB_PREF."tax_group_items WHERE tax_group_id=$id";
+	$sql = "DELETE FROM ".TB_PREF."tax_group_items WHERE tax_group_id=".db_escape($id);
 	
 	db_query($sql, "could not delete item tax group items");					
 }
 
-function get_tax_group_items($id)
+//
+//	Return all tax types with rate value updated according to tax group selected
+//	Call the function without arg to find shipment group taxes.
+//
+function get_tax_group_rates($group_id=null, $tax_shipping=false)
 {
-	$sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, 
-		".TB_PREF."tax_types.sales_gl_code, ".TB_PREF."tax_types.purchasing_gl_code  
-		FROM ".TB_PREF."tax_group_items, ".TB_PREF."tax_types 
-		WHERE tax_group_id=$id
-			AND ".TB_PREF."tax_types.id=tax_type_id";
-	
-	return db_query($sql, "could not get item tax type group items");
+	global $SysPrefs;
+
+	$sql = 
+	"SELECT t.id as tax_type_id,"
+		.($SysPrefs->suppress_tax_rates() == 1 ? "t.name as tax_type_name,"
+			: "CONCAT(t.name, ' (', t.rate, '%)') as tax_type_name,")
+		."t.sales_gl_code,
+		  t.purchasing_gl_code,
+		  IF(g.tax_type_id, t.rate, NULL) as rate,
+		  g.tax_shipping
+		FROM ".TB_PREF."tax_types t 
+		  LEFT JOIN ".TB_PREF."tax_group_items g ON t.id=g.tax_type_id
+	AND g.tax_group_id=". ($group_id ? db_escape($group_id) : "(SELECT MIN(id) FROM ".TB_PREF."tax_groups)")		  
+	. " WHERE !t.inactive";
+	if ($tax_shipping)
+		$sql .= " AND g.tax_shipping=1";
+
+	return db_query($sql, "cannot get tax types as array");
 }
 
 function get_tax_group_items_as_array($id)
 {
 	$ret_tax_array = array();
 	
-	$tax_group_items = get_tax_group_items($id);
+	$tax_group_items = get_tax_group_rates($id);
 	
 	while ($tax_group_item = db_fetch($tax_group_items)) 
 	{
-		$index = $tax_group_item['tax_type_id'];
-		$ret_tax_array[$index]['tax_type_id'] = $tax_group_item['tax_type_id'];
-		$ret_tax_array[$index]['tax_type_name'] = $tax_group_item['tax_type_name'];
-		$ret_tax_array[$index]['sales_gl_code'] = $tax_group_item['sales_gl_code'];
-		$ret_tax_array[$index]['purchasing_gl_code'] = $tax_group_item['purchasing_gl_code'];
-		$ret_tax_array[$index]['rate'] = $tax_group_item['rate'];
-		$ret_tax_array[$index]['Value'] = 0;
+		$tax_group_item['Value'] = 0;
+		$ret_tax_array[$tax_group_item['tax_type_id']] = $tax_group_item;
+
 	}
 	
 	return $ret_tax_array;
 }
 
-function get_shipping_tax_group_items()
-{
-
-	$sql = "SELECT ".TB_PREF."tax_group_items.*, ".TB_PREF."tax_types.name AS tax_type_name, 
-		".TB_PREF."tax_types.sales_gl_code, ".TB_PREF."tax_types.purchasing_gl_code  
-		FROM " .TB_PREF."tax_group_items, ".TB_PREF."tax_types, ".TB_PREF."tax_groups
-		WHERE " .TB_PREF."tax_groups.tax_shipping=1
-		AND " .TB_PREF."tax_groups.id=tax_group_id
-		AND ".TB_PREF."tax_types.id=tax_type_id";
-	return db_query($sql, "could not get shipping tax group items");
-}
-
-function get_shipping_tax_as_array()
+function get_shipping_tax_as_array($id=null)
 {
 	$ret_tax_array = array();
 
-	
-	$tax_group_items = get_shipping_tax_group_items();
+	$tax_group_items = get_tax_group_rates($id, true);
 
 	while ($tax_group_item = db_fetch($tax_group_items)) 
 	{
-		$index = $tax_group_item['tax_type_id'];
-		$ret_tax_array[$index]['tax_type_id'] = $tax_group_item['tax_type_id'];
-		$ret_tax_array[$index]['tax_type_name'] = $tax_group_item['tax_type_name'];
-		$ret_tax_array[$index]['sales_gl_code'] = $tax_group_item['sales_gl_code'];
-		$ret_tax_array[$index]['purchasing_gl_code'] = $tax_group_item['purchasing_gl_code'];
-		$ret_tax_array[$index]['rate'] = $tax_group_item['rate'];
-		$ret_tax_array[$index]['Value'] = 0;
+		$tax_group_item['Value'] = 0;
+		$ret_tax_array[$tax_group_item['tax_type_id']] = $tax_group_item;
 	}
 	
 	return $ret_tax_array;
 }
-?>
\ No newline at end of file