X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=0134776b39de6a5dc32f19c786a8f1e5dc80f5af;hb=50339ff6ffe3cbb2a6237cc6a922a98481c7a41f;hp=80663e0bcbf42afdc47ec22add83f73579613638;hpb=275c4751c146ec40b4afd2e119f968b290f21517;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 80663e0b..0134776b 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -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");
 }
@@ -442,12 +443,12 @@ function get_tax_summary($from, $to)
 					." || (trans_type=".ST_JOURNAL ." AND amount<0)"
 					." || trans_type=".ST_CUSTCREDIT.", amount*ex_rate,0)) payable,
 
-				SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
+				SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
 				IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
 					." || (trans_type=".ST_JOURNAL ." AND amount<0)"
 					." || trans_type=".ST_CUSTCREDIT.", 0, net_amount*ex_rate)) net_input,
 
-				SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE.",-1,1)*
+				SUM(IF(trans_type=".ST_CUSTCREDIT." || trans_type=".ST_SUPPINVOICE." || trans_type=".ST_JOURNAL.",-1,1)*
 				IF(trans_type=".ST_BANKDEPOSIT." || trans_type=".ST_SALESINVOICE
 					." || (trans_type=".ST_JOURNAL ." AND amount<0)"
 					." || trans_type=".ST_CUSTCREDIT.", 0, amount*ex_rate)) collectible,
@@ -583,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)
@@ -649,7 +634,7 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
 	if (!$alsoclosed) {
 		$sql .= " AND gl_seq=0";
 	}
-	$sql .= " GROUP BY gl.type, gl.type_no";
+	$sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
 	return $sql;
 }
 ?>
\ No newline at end of file