X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=fe9599afb10d6bc804d5ff4b3d9d5c8c436494b9;hb=79e9eb93c8f4f1cde88161253494626466ba7a50;hp=fc581e088be037aaca8abc86075471ad24dc7b95;hpb=a4f5314521187b67feb7742ed1b6c51aa199a6b0;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index fc581e08..fe9599af 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -115,7 +115,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 		AND ISNULL(v.date_)
 		AND tran_date >= '$from'
 		AND tran_date <= '$to'";
-	if (isset($show_voided_gl_trans) && $show_voided_gl_trans == 1)
+	if (isset($show_voided_gl_trans) && $show_voided_gl_trans == 0)
 		$sql .= " AND ".TB_PREF."gl_trans.amount <> 0"; 
 	if ($trans_no > 0)
 		$sql .= " AND ".TB_PREF."gl_trans.type_no LIKE ".db_escape('%'.$trans_no);
@@ -154,6 +154,7 @@ function get_gl_trans($type, $trans_id)
 		LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)"
 		." WHERE gl.type= ".db_escape($type) 
 		." AND gl.type_no = ".db_escape($trans_id)
+		." AND gl.amount <> 0"
 		." ORDER BY counter";
 	return db_query($sql, "The gl transactions could not be retrieved");
 }
@@ -390,7 +391,9 @@ function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included
 function get_trans_tax_details($trans_type, $trans_no)
 {
 	$sql = "SELECT ".TB_PREF."trans_tax_details.*, "
-		.TB_PREF."tax_types.name AS tax_type_name
+		.TB_PREF."tax_types.name AS tax_type_name, "
+		.TB_PREF."trans_tax_details.rate AS effective_rate, "
+		.TB_PREF."tax_types.rate AS rate
 		FROM ".TB_PREF."trans_tax_details,".TB_PREF."tax_types
 		WHERE trans_type = ".db_escape($trans_type)."
 		AND trans_no = ".db_escape($trans_no)."
@@ -581,22 +584,6 @@ function void_gl_trans($type, $trans_id, $nested=false)
 		commit_transaction();
 }
 
-//--------------------------------------------------------------------------------------------------
-
-function clear_gl_trans($type, $trans_id, $nested=false)
-{
-	if (!$nested)
-		begin_transaction();
-
-	$sql = "DELETE FROM ".TB_PREF."gl_trans WHERE type=".db_escape($type)
-	." AND type_no=".db_escape($trans_id);
-
-	db_query($sql, "could not clear gl transactions for type=$type and trans_no=$trans_id");
-
-	if (!$nested)
-		commit_transaction();
-}
-
 //----------------------------------------------------------------------------------------
 
 function void_journal_trans($type, $type_no, $use_transaction=true)