X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=a05959b81878cfca93b77e0f636a671a45424085;hb=608100dd866fdb605365dbe7011a114f0fab7eeb;hp=9c406f6e0c84ee666f8a0d990c912dd89e662b59;hpb=445329077ca217cd473426ec746279a86a6280b4;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 9c406f6e..a05959b8 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -114,8 +114,9 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 
 	$sql = "SELECT gl.*, j.event_date, j.doc_date, a.gl_seq, u.user_id, st.supp_reference, gl.person_id subcode,
 			IFNULL(IFNULL(sup.supp_name, debt.name), bt.person_id) as person_name, 
-			IFNULL(gl.person_id, IFNULL(sup.supplier_id, debt.debtor_no)) as person_id,
-                        IF(gl.person_id, gl.person_type_id, IF(sup.supplier_id,".  PT_SUPPLIER . "," .  "IF(debt.debtor_no," . PT_CUSTOMER . ", -1))) as person_type_id,
+			IFNULL(gl.person_id, IFNULL(sup.supplier_id, IFNULL(debt.debtor_no, bt.person_id))) as person_id,
+            IF(gl.person_id, gl.person_type_id, IF(sup.supplier_id,".  PT_SUPPLIER . "," .  "IF(debt.debtor_no," . PT_CUSTOMER . "," . 
+            "IF(bt.person_id != '' AND !ISNULL(bt.person_id), bt.person_type_id, -1)))) as person_type_id,
 			IFNULL(st.tran_date, IFNULL(dt.tran_date, IFNULL(bt.trans_date, IFNULL(grn.delivery_date, gl.tran_date)))) as doc_date,
 			coa.account_name, ref.reference
 			 FROM "
@@ -123,7 +124,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 			LEFT JOIN ".TB_PREF."voided v ON gl.type_no=v.id AND v.type=gl.type
 
 			LEFT JOIN ".TB_PREF."supp_trans st ON gl.type_no=st.trans_no AND st.type=gl.type AND (gl.type!=".ST_JOURNAL." OR gl.person_id=st.supplier_id)
-			LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=gl.type_no AND gl.type=".ST_SUPPRECEIVE." AND gl.person_id=grn.supplier_id
+			LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=gl.type_no AND gl.type=".ST_SUPPRECEIVE."
 			LEFT JOIN ".TB_PREF."debtor_trans dt ON gl.type_no=dt.trans_no AND dt.type=gl.type AND (gl.type!=".ST_JOURNAL." OR gl.person_id=dt.debtor_no)
 
 			LEFT JOIN ".TB_PREF."suppliers sup ON st.supplier_id=sup.supplier_id OR grn.supplier_id=sup.supplier_id
@@ -131,7 +132,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
 			LEFT JOIN ".TB_PREF."debtors_master debt ON dt.debtor_no=debt.debtor_no
 
 			LEFT JOIN ".TB_PREF."bank_trans bt ON bt.type=gl.type AND bt.trans_no=gl.type_no AND bt.amount!=0
-				 AND bt.person_type_id=gl.person_type_id AND bt.person_id=gl.person_id
+				 AND (bt.person_id != '' AND !ISNULL(bt.person_id))
 
 			LEFT JOIN ".TB_PREF."journal j ON j.type=gl.type AND j.trans_no=gl.type_no
 			LEFT JOIN ".TB_PREF."audit_trail a ON a.type=gl.type AND a.trans_no=gl.type_no AND NOT ISNULL(gl_seq)
@@ -172,7 +173,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
         if ($memo) {
                 $sql .= " AND gl.memo_ LIKE ". db_escape("%$memo%");
         }
-
+	$sql .= " GROUP BY counter";
 	$sql .= " ORDER BY tran_date, counter";
 
 	return db_query($sql, "The transactions for could not be retrieved");
@@ -475,19 +476,15 @@ function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included
 
 function get_trans_tax_details($trans_type, $trans_no)
 {
-	$sql = "SELECT tax_details.*,
-				tax_type.name AS tax_type_name,
-				tax_details.rate AS effective_rate,
-				tax_type.rate AS rate
-		FROM ".TB_PREF."trans_tax_details tax_details,
-			".TB_PREF."tax_types tax_type
-		WHERE 
-			trans_type = ".db_escape($trans_type)."
-		AND trans_no = ".db_escape($trans_no)."
-		AND (net_amount != 0 OR amount != 0)
-		AND tax_type.id = tax_details.tax_type_id";
-
-	return db_query($sql, "The transaction tax details could not be retrieved");
+    $sql = "SELECT tax_details.*, tax_type.name AS tax_type_name, tax_type.rate AS rate
+        FROM ".TB_PREF."trans_tax_details tax_details INNER JOIN 
+        ".TB_PREF."tax_types tax_type ON tax_type.id = tax_details.tax_type_id
+        WHERE 
+                trans_type = ".db_escape($trans_type)."
+            AND trans_no = ".db_escape($trans_no)."
+            AND (net_amount != 0 OR amount != 0)";
+
+    return db_query($sql, "The transaction tax details could not be retrieved");
 }
 
 //----------------------------------------------------------------------------------------