X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fdb%2Ftax_types_db.inc;h=850b1f5b1372ac6a281d64ed58217bf64f7e7252;hb=fabc8d3e9dbd0ebeb28cefcdf85c5abf90a3496f;hp=71096f32743c72be92210ab39b03247a4aa344b1;hpb=e29ab37ef51f39c200c3772e07eeceef0ce39214;p=fa-stable.git

diff --git a/taxes/db/tax_types_db.inc b/taxes/db/tax_types_db.inc
index 71096f32..850b1f5b 100644
--- a/taxes/db/tax_types_db.inc
+++ b/taxes/db/tax_types_db.inc
@@ -11,15 +11,18 @@
 ***********************************************************************/
 function add_tax_type($name, $sales_gl_code, $purchasing_gl_code, $rate)
 {
+	begin_transaction(__FUNCTION__, func_get_args());
 	$sql = "INSERT INTO ".TB_PREF."tax_types (name, sales_gl_code, purchasing_gl_code, rate)
 		VALUES (".db_escape($name).", ".db_escape($sales_gl_code)
 		.", ".db_escape($purchasing_gl_code).", $rate)";
 
 	db_query($sql, "could not add tax type");
+	commit_transaction();
 }
 
 function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $rate)
 {
+	begin_transaction(__FUNCTION__, func_get_args());
 	$sql = "UPDATE ".TB_PREF."tax_types SET name=".db_escape($name).",
 		sales_gl_code=".db_escape($sales_gl_code).",
 		purchasing_gl_code=".db_escape($purchasing_gl_code).",
@@ -27,43 +30,47 @@ function update_tax_type($type_id, $name, $sales_gl_code, $purchasing_gl_code, $
 		WHERE id=".db_escape($type_id);
 
 	db_query($sql, "could not update tax type");
+	commit_transaction();
 }
 
-function get_all_tax_types()
+function get_all_tax_types($all=false)
 {
-	$sql = "SELECT ".TB_PREF."tax_types.*,
-		Chart1.account_name AS SalesAccountName,
-		Chart2.account_name AS PurchasingAccountName
-		FROM ".TB_PREF."tax_types, ".TB_PREF."chart_master AS Chart1,
-		".TB_PREF."chart_master AS Chart2
-		WHERE ".TB_PREF."tax_types.sales_gl_code = Chart1.account_code
-		AND ".TB_PREF."tax_types.purchasing_gl_code = Chart2.account_code";
-
+	$sql = "SELECT tax_type.*,
+				Chart1.account_name AS SalesAccountName,
+				Chart2.account_name AS PurchasingAccountName
+			FROM ".TB_PREF."tax_types tax_type,"
+				.TB_PREF."chart_master AS Chart1,"
+				.TB_PREF."chart_master AS Chart2
+			WHERE tax_type.sales_gl_code = Chart1.account_code
+				AND tax_type.purchasing_gl_code = Chart2.account_code";
+
+	if (!$all) $sql .= " AND !tax_type.inactive";
 	return db_query($sql, "could not get all tax types");
 }
 
 function get_all_tax_types_simple()
 {
-	$sql = "SELECT * FROM ".TB_PREF."tax_types";
+	$sql = "SELECT * FROM ".TB_PREF."tax_types WHERE !inactive";
 
 	return db_query($sql, "could not get all tax types");
 }
 
 function get_tax_type($type_id)
 {
-	$sql = "SELECT ".TB_PREF."tax_types.*,
-		Chart1.account_name AS SalesAccountName,
-		Chart2.account_name AS PurchasingAccountName
-		FROM ".TB_PREF."tax_types, ".TB_PREF."chart_master AS Chart1,
-		".TB_PREF."chart_master AS Chart2
-		WHERE ".TB_PREF."tax_types.sales_gl_code = Chart1.account_code
-		AND ".TB_PREF."tax_types.purchasing_gl_code = Chart2.account_code AND id=".db_escape($type_id);
+	$sql = "SELECT tax_type.*,
+				Chart1.account_name AS SalesAccountName,
+				Chart2.account_name AS PurchasingAccountName
+			FROM ".TB_PREF."tax_types tax_type,"
+				.TB_PREF."chart_master AS Chart1,"
+				.TB_PREF."chart_master AS Chart2
+			WHERE tax_type.sales_gl_code = Chart1.account_code
+		AND tax_type.purchasing_gl_code = Chart2.account_code AND id=".db_escape($type_id);
 
 	$result = db_query($sql, "could not get tax type");
 	return db_fetch($result);
 }
 
-function get_tax_type_default_rate($type_id)
+function get_tax_type_rate($type_id)
 {
 	$sql = "SELECT rate FROM ".TB_PREF."tax_types WHERE id=".db_escape($type_id);
 
@@ -75,14 +82,14 @@ function get_tax_type_default_rate($type_id)
 
 function delete_tax_type($type_id)
 {
-	begin_transaction();
+	begin_transaction(__FUNCTION__, func_get_args());
 
 	$sql = "DELETE FROM ".TB_PREF."tax_types WHERE id=".db_escape($type_id);
 
 	db_query($sql, "could not delete tax type");
 
 	// also delete any item tax exemptions associated with this type
-	$sql = "DELETE FROM ".TB_PREF."item_tax_type_exemptions WHERE tax_type_id=$type_id";
+	$sql = "DELETE FROM ".TB_PREF."item_tax_type_exemptions WHERE tax_type_id=".db_escape($type_id);
 
 	db_query($sql, "could not delete item tax type exemptions");
 
@@ -100,9 +107,9 @@ function is_tax_gl_unique($gl_code, $gl_code2=-1, $selected_id=-1) {
 	$purch_code = $gl_code2== -1 ? $gl_code : $gl_code2;
 
 	$sql = "SELECT count(*) FROM "
-		.TB_PREF."tax_types	
+			.TB_PREF."tax_types	
 		WHERE (sales_gl_code=" .db_escape($gl_code)
-		." OR purchasing_gl_code=" .db_escape($purch_code). ")";
+			." OR purchasing_gl_code=" .db_escape($purch_code). ")";
 
 	if ($selected_id != -1)
 		$sql .= " AND id!=".db_escape($selected_id);
@@ -112,4 +119,17 @@ function is_tax_gl_unique($gl_code, $gl_code2=-1, $selected_id=-1) {
 
 	return $gl_code2 == -1 ? ($row[0] <= 1) : ($row[0] == 0);
 }
-?>
\ No newline at end of file
+
+function is_tax_account($account_code)
+{
+	$sql= "SELECT id FROM ".TB_PREF."tax_types WHERE 
+		sales_gl_code=".db_escape($account_code)." OR purchasing_gl_code=".db_escape($account_code);
+	$result = db_query($sql, "checking account is tax account");
+	if (db_num_rows($result) > 0) {
+		$acct = db_fetch($result);
+		return $acct['id'];
+	} else
+		return false;
+}
+
+