X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_trans.inc;h=d7e01aa3ead3fad6d185f29e4fb8a62c9a0b4bdf;hp=d42bd73263a5baefe43cfcca0f233a850695a858;hb=0e1a4c795a5c51764b98a32942d8df36c8d8dbdf;hpb=3b431d909abc53e4a4d712cbafa39ca556409d0e

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index d42bd732..d7e01aa3 100644
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -44,7 +44,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 	}
 	if (!is_subledger_account($account) || $account==get_company_pref('grn_clearing_act'))
 		$person_id = $person_type_id = null;
-
+	
 	$sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,
 		account, dimension_id, dimension2_id, memo_, amount";
 
@@ -79,6 +79,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
 function add_gl_trans_std_cost($type, $trans_id, $date_, $account, $dimension, $dimension2,
 	$memo_,	$amount, $person_type_id=null, $person_id=null, $err_msg="")
 {
+
 	if ($amount != 0)
 		return add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension2, $memo_,
 			$amount, null, $person_type_id, $person_id, $err_msg);
@@ -103,73 +104,120 @@ function add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null,
 //--------------------------------------------------------------------------------
 
 function get_gl_transactions($from_date, $to_date, $trans_no=0,
-	$account=null, $dimension=0, $dimension2=0, $filter_type=null,
-	$amount_min=null, $amount_max=null)
+    $account=null, $dimension=0, $dimension2=0, $filter_type=null,
+        $amount_min=null, $amount_max=null, $person_type=null, $person_id=null, $memo='')
 {
-	global $SysPrefs;
-	
-	$from = date2sql($from_date);
-	$to = date2sql($to_date);
+    global $SysPrefs;
 
-	$sql = "SELECT ".TB_PREF."gl_trans.*, "
-		.TB_PREF."chart_master.account_name FROM "
-		.TB_PREF."gl_trans
-			LEFT JOIN ".TB_PREF."voided v ON "
-			.TB_PREF."gl_trans.type_no=v.id AND v.type=".TB_PREF."gl_trans.type,"
-			.TB_PREF."chart_master"
-		." WHERE ".TB_PREF."chart_master.account_code=".TB_PREF."gl_trans.account
-		AND ISNULL(v.date_)
-		AND tran_date >= '$from'
-		AND tran_date <= '$to'";
-	if (isset($SysPrefs->show_voided_gl_trans) && $SysPrefs->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);
-
-	if ($account != null)
-		$sql .= " AND ".TB_PREF."gl_trans.account = ".db_escape($account);
+    $from = date2sql($from_date);
+    $to = date2sql($to_date);
 
-	if ($dimension != 0)
-  		$sql .= " AND ".TB_PREF."gl_trans.dimension_id = ".($dimension<0?0:db_escape($dimension));
+    $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, 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, IF(ISNULL(c.memo_), gl.memo_, CONCAT(gl.memo_,' ',c.memo_)) AS memo
+             FROM "
+            .TB_PREF."gl_trans gl
+            LEFT JOIN ".TB_PREF."voided v ON gl.type_no=v.id AND v.type=gl.type
 
-	if ($dimension2 != 0)
-  		$sql .= " AND ".TB_PREF."gl_trans.dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
+            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."
+            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)
 
-	if ($filter_type != null AND is_numeric($filter_type))
-		$sql .= " AND ".TB_PREF."gl_trans.type= ".db_escape($filter_type);
-		
-	if ($amount_min != null)
-		$sql .= " AND ABS(".TB_PREF."gl_trans.amount) >= ABS(".db_escape($amount_min).")";
-	
-	if ($amount_max != null)
-		$sql .= " AND ABS(".TB_PREF."gl_trans.amount) <= ABS(".db_escape($amount_max).")";
+            LEFT JOIN ".TB_PREF."suppliers sup ON st.supplier_id=sup.supplier_id
+            LEFT JOIN ".TB_PREF."cust_branch branch ON dt.branch_code=branch.branch_code
+            LEFT JOIN ".TB_PREF."debtors_master debt ON dt.debtor_no=debt.debtor_no
 
-	$sql .= " ORDER BY tran_date, counter";
+            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_id != '' AND !ISNULL(bt.person_id))
 
-	return db_query($sql, "The transactions for could not be retrieved");
-}
+            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)
+            LEFT JOIN ".TB_PREF."users u ON a.user=u.id
+            LEFT JOIN ".TB_PREF."comments c ON c.id=gl.type_no AND c.type=gl.type
+
+            LEFT JOIN ".TB_PREF."refs ref ON ref.type=gl.type AND ref.id=gl.type_no,"
+        .TB_PREF."chart_master coa
+        WHERE coa.account_code=gl.account
+        AND ISNULL(v.date_)
+        AND gl.tran_date >= '$from'
+        AND gl.tran_date <= '$to'
+        AND gl.amount <> 0"; 
+
+    if ($trans_no > 0)
+        $sql .= " AND gl.type_no LIKE ".db_escape('%'.$trans_no);
+
+    if ($account != null)
+        $sql .= " AND gl.account = ".db_escape($account);
 
+    if ($dimension != 0)
+        $sql .= " AND gl.dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
+
+    if ($dimension2 != 0)
+        $sql .= " AND gl.dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
+
+    if ($filter_type != null)
+        $sql .= " AND gl.type IN (" . $filter_type .")";
+
+    if ($amount_min != null)
+        $sql .= " AND ABS(gl.amount) >= ABS(".db_escape($amount_min).")";
+    
+    if ($amount_max != null)
+        $sql .= " AND ABS(gl.amount) <= ABS(".db_escape($amount_max).")";
+
+    if ($memo)
+        $sql .= " AND (gl.memo_ LIKE ". db_escape("%$memo%") . " OR c.memo_ LIKE " . db_escape("%$memo%") . ")";
+
+    $sql .= " GROUP BY counter";
+
+    $sql .= " HAVING TRUE";
+    if ($person_type != 0)
+            $sql .= " AND person_type_id=".db_escape($person_type); 
+    if ($person_id != 0)
+            $sql .= " AND person_id=".db_escape($person_id); 
+
+    $sql .= " ORDER BY tran_date, counter";
+
+    return db_query($sql, "The transactions for could not be retrieved");
+}
 
 //--------------------------------------------------------------------------------
 
 function get_gl_trans($type, $trans_id)
 {
-	$sql = "SELECT gl.*, cm.account_name, IF(ISNULL(refs.reference), '', refs.reference) AS reference FROM "
-		.TB_PREF."gl_trans as gl
+	$sql = "SELECT gl.*, cm.account_name, IFNULL(refs.reference, '') AS reference, user.real_name, 
+			COALESCE(st.tran_date, dt.tran_date, bt.trans_date, grn.delivery_date, gl.tran_date) as doc_date,
+			IF(ISNULL(st.supp_reference), '', st.supp_reference) AS supp_reference
+	FROM ".TB_PREF."gl_trans as gl
 		LEFT JOIN ".TB_PREF."chart_master as cm ON gl.account = cm.account_code
-		LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)"
+		LEFT JOIN ".TB_PREF."refs as refs ON (gl.type=refs.type AND gl.type_no=refs.id)
+		LEFT JOIN ".TB_PREF."audit_trail as audit ON (gl.type=audit.type AND gl.type_no=audit.trans_no AND NOT ISNULL(gl_seq))
+		LEFT JOIN ".TB_PREF."users as user ON (audit.user=user.id)
+	# all this below just to retrieve doc_date :>
+		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."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."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
+		LEFT JOIN ".TB_PREF."journal j ON j.type=gl.type AND j.trans_no=gl.type_no"
+
 		." WHERE gl.type= ".db_escape($type) 
 		." AND gl.type_no = ".db_escape($trans_id)
 		." AND gl.amount <> 0"
-		." ORDER BY counter";
+		." ORDER BY tran_date, counter";
+
 	return db_query($sql, "The gl transactions could not be retrieved");
 }
 
 //--------------------------------------------------------------------------------
 
-function get_gl_wo_cost_trans($trans_id, $cost_type=-1)
+function get_gl_wo_cost_trans($trans_id, $cost_type=-1, $all_gl=false)
 {
-	$sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_ FROM "
+	$sql = "SELECT costing.*, gl.*, chart.account_name, com.memo_
+		FROM "
 		.TB_PREF."wo_costing costing, "
 		.TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type	AND gl.type_no=com.id,"
 		.TB_PREF."chart_master chart
@@ -180,7 +228,44 @@ function get_gl_wo_cost_trans($trans_id, $cost_type=-1)
 			AND gl.type_no=costing.trans_no";
 	if ($cost_type != -1)
 		$sql .= " AND costing.cost_type=".db_escape($cost_type);
-	$sql .= " AND amount < 0";
+	$sql .= $all_gl ? " AND amount != 0" : " AND amount < 0";
+
+	return db_query($sql, "The gl transactions could not be retrieved");
+}
+
+function get_gl_wo_issue_trans($trans_id, $person_id=-1, $all_gl=false)
+{
+	$sql = "SELECT issue.*, gl.*, chart.account_name, com.memo_
+		FROM "
+			.TB_PREF."wo_issues issue,"
+			.TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type	AND gl.type_no=com.id,"
+			.TB_PREF."chart_master chart
+		WHERE issue.workorder_id=".db_escape($trans_id)
+		 ." AND chart.account_code=gl.account
+			AND gl.type=".ST_MANUISSUE." AND gl.type_no=issue.issue_no";
+//			." AND gl.person_type_id=".PT_WORKORDER;
+	if ($person_id != -1)
+		$sql .= " AND gl.person_id=".db_escape($person_id);
+	$sql .= $all_gl ? " AND amount != 0" : " AND amount < 0";
+	$sql .= " ORDER BY type, type_no";
+	return db_query($sql, "The gl transactions could not be retrieved");
+}
+
+function get_gl_wo_productions($trans_id, $all_gl=false)
+{
+	$sql = "SELECT rcv.*, gl.*, chart.account_name, com.memo_
+		FROM "
+		.TB_PREF."wo_manufacture rcv, "
+		.TB_PREF."gl_trans gl LEFT JOIN ".TB_PREF."comments com ON gl.type=com.type	AND gl.type_no=com.id,"
+		.TB_PREF."chart_master chart
+		WHERE 
+			rcv.workorder_id=".db_escape($trans_id)
+		."	AND chart.account_code=gl.account
+			AND gl.type=".ST_MANURECEIVE."
+			AND gl.type_no=rcv.id
+			AND amount != 0 "
+		.($all_gl ? " AND amount != 0" : " AND amount < 0")
+		." ORDER BY type, type_no";
 
 	return db_query($sql, "The gl transactions could not be retrieved");
 }
@@ -197,9 +282,9 @@ function get_gl_balance_from_to($from_date, $to_date, $account, $dimension=0, $d
 	if ($to_date != "")
 		$sql .= "  AND tran_date < '$to'";
 	if ($dimension != 0)
-  		$sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+  		$sql .= " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
 	if ($dimension2 != 0)
-  		$sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
+  		$sql .= " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
 
 	$result = db_query($sql, "The starting balance for account $account could not be calculated");
 
@@ -221,9 +306,9 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
 	if ($to_date != "")
 		$sql .= " AND tran_date <= '$to'";
 	if ($dimension != 0)
-  		$sql .= " AND dimension_id = ".($dimension<0?0:db_escape($dimension));
+  		$sql .= " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
 	if ($dimension2 != 0)
-  		$sql .= " AND dimension2_id = ".($dimension2<0?0:db_escape($dimension2));
+  		$sql .= " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
 
 	$result = db_query($sql, "Transactions for account $account could not be calculated");
 
@@ -234,30 +319,24 @@ function get_gl_trans_from_to($from_date, $to_date, $account, $dimension=0, $dim
 //----------------------------------------------------------------------------------------------------
 function get_balance($account, $dimension, $dimension2, $from, $to, $from_incl=true, $to_incl=true) 
 {
-	$sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit, 
-		SUM(IF(amount < 0, -amount, 0)) as credit, SUM(amount) as balance 
-		FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master,"
-			.TB_PREF."chart_types, ".TB_PREF."chart_class 
-		WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND "
-		.TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id 
-		AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid AND";
-		
-	if ($account != null)
-		$sql .= " account=".db_escape($account)." AND";
-	if ($dimension != 0)
-  		$sql .= " dimension_id = ".($dimension<0?0:db_escape($dimension))." AND";
-	if ($dimension2 != 0)
-  		$sql .= " dimension2_id = ".($dimension2<0?0:db_escape($dimension2))." AND";
 	$from_date = date2sql($from);
-	if ($from_incl)
-		$sql .= " tran_date >= '$from_date'  AND";
-	else
-		$sql .= " tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date') AND";
 	$to_date = date2sql($to);
-	if ($to_incl)
-		$sql .= " tran_date <= '$to_date' ";
-	else
-		$sql .= " tran_date < '$to_date' ";
+
+	$sql = "SELECT	SUM(IF(amount >= 0, amount, 0)) as debit, 
+					SUM(IF(amount < 0, -amount, 0)) as credit,
+					SUM(amount) as balance 
+		FROM ".TB_PREF."gl_trans trans,"
+			.TB_PREF."chart_master coa,"
+			.TB_PREF."chart_types act_type, "
+			.TB_PREF."chart_class act_class
+		WHERE trans.account=coa.account_code
+			AND coa.account_type=act_type.id 
+		AND act_type.class_id=act_class.cid"
+		." AND ".($from_incl ? "tran_date >= '$from_date'" : "tran_date > IF(ctype>0 AND ctype<".CL_INCOME.", '0000-00-00', '$from_date')")
+		." AND ".($to_incl ? "tran_date <= '$to_date'" : "tran_date < '$to_date'")
+		.($account == null ? '' : " AND account=".db_escape($account))
+		.($dimension == 0 ? ''  : " AND dimension_id = ".($dimension<0 ? 0 : db_escape($dimension)))
+		.($dimension2 == 0 ? '' : " AND dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2)));
 
 	$result = db_query($sql,"No general ledger accounts were returned");
 
@@ -272,7 +351,8 @@ function get_budget_trans_from_to($from_date, $to_date, $account, $dimension=0,
 	$from = date2sql($from_date);
 	$to = date2sql($to_date);
 
-	$sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans
+	$sql = "SELECT SUM(amount)
+		FROM ".TB_PREF."budget_trans
 		WHERE account=".db_escape($account);
 	if ($from_date != "")
 		$sql .= " AND tran_date >= '$from' ";
@@ -355,14 +435,11 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate,
 	if(!$tax_type) return;	// $gl_code is not tax account
 	
 	$tax = get_tax_type($tax_type);
-	//if ($gl_code == $tax['sales_gl_code'])
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTDELIVERY || $trans_type == ST_CUSTCREDIT)
 		$amount = -$amount;
 	// we have to restore net amount as we cannot know the base amount
 	if ($net_amount===null) {
 		if ($tax['rate'] == 0) {
-//			display_warning(_("You should not post gl transactions  
-//				to tax account with	zero tax rate."));
 			$net_amount = 0;
 		} else { 
 			// calculate net amount
@@ -370,7 +447,7 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate,
 		}
 	}
 	add_trans_tax_details($trans_type, $trans_no, $tax['id'], $tax['rate'], $included, 
-		$amount, $net_amount, $ex_rate, $date, $memo);
+		$amount, $net_amount, $ex_rate, $date, $memo, null);
 
 }
 
@@ -380,17 +457,21 @@ function add_gl_tax_details($gl_code, $trans_type, $trans_no, $amount, $ex_rate,
 //	actual tax type rate.
 //
 function add_trans_tax_details($trans_type, $trans_no, $tax_id, $rate, $included,
-	$amount, $net_amount, $ex_rate, $tran_date, $memo)
+	$amount, $net_amount, $ex_rate, $tran_date, $memo, $reg_type=null)
 {
+	// guess tax register if not set
+	if (!isset($reg_type))
+		$reg_type = in_array($trans_type, array(ST_SUPPINVOICE, ST_SUPPCREDIT)) ? TR_OUTPUT
+				: in_array($trans_type, array(ST_SALESINVOICE, ST_CUSTCREDIT)) ? TR_INPUT : null;
 
 	$sql = "INSERT INTO ".TB_PREF."trans_tax_details 
 		(trans_type, trans_no, tran_date, tax_type_id, rate, ex_rate,
-			included_in_price, net_amount, amount, memo)
+			included_in_price, net_amount, amount, memo, reg_type)
 		VALUES (".db_escape($trans_type)."," . db_escape($trans_no).",'"
 				.date2sql($tran_date)."',".db_escape($tax_id).","
 				.db_escape($rate).",".db_escape($ex_rate).",".($included ? 1:0).","
 				.db_escape($net_amount).","
-				.db_escape($amount).",".db_escape($memo).")";
+				.db_escape($amount).",".db_escape($memo).",".db_escape($reg_type, true).")";
 
 	db_query($sql, "Cannot save trans tax details");
 
@@ -399,17 +480,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 ".TB_PREF."trans_tax_details.*, "
-		.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)."
-		AND (net_amount != 0 OR amount != 0)
-		AND ".TB_PREF."tax_types.id = ".TB_PREF."trans_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");
 }
 
 //----------------------------------------------------------------------------------------
@@ -434,44 +513,43 @@ function clear_trans_tax_details($type, $type_no)
 	db_query($sql, "The transaction tax details could not be cleared");
 }
 
-function get_tax_summary($from, $to)
+function get_tax_summary($from, $to, $also_zero_purchases=false)
 {
 	$fromdate = date2sql($from);
 	$todate = date2sql($to);
 
 	$sql = "SELECT 
-				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.", net_amount*ex_rate,0)) net_output,
-
-				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.", amount*ex_rate,0)) payable,
-
-				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." || 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,
+				SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
+				IF((reg_type=".TR_OUTPUT.")"
+					." || ((trans_type IN(".ST_SALESINVOICE.",".ST_CUSTCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+					), net_amount*ex_rate,0)
+				) net_output,
+
+				SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
+				IF((reg_type=".TR_OUTPUT.")"
+					." || ((trans_type IN(".ST_SALESINVOICE.",".ST_CUSTCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+					), amount*ex_rate,0)) payable,
+
+				SUM(IF(trans_type IN(".ST_SUPPCREDIT."),-1,1)*
+				IF(reg_type=".TR_INPUT
+					. ($also_zero_purchases ? '': " AND tax_type_id AND taxrec.rate")
+					.", net_amount*ex_rate, 0)) net_input,
+
+				SUM(IF(trans_type IN(".ST_SUPPCREDIT."),-1,1)*
+				IF(reg_type=".TR_INPUT
+					. ($also_zero_purchases ? '': " AND tax_type_id AND taxrec.rate ") 
+					.", amount*ex_rate, 0)) collectible,
 				taxrec.rate,
 				ttype.id,
 				ttype.name
-		FROM ".TB_PREF."tax_types ttype,
-			 ".TB_PREF."trans_tax_details taxrec
-		WHERE taxrec.tax_type_id=ttype.id
-			AND taxrec.trans_type != ".ST_CUSTDELIVERY."
+		FROM ".TB_PREF."trans_tax_details taxrec LEFT JOIN ".TB_PREF."tax_types ttype ON taxrec.tax_type_id=ttype.id
+		WHERE taxrec.trans_type IN (".implode(',',
+			array(ST_SALESINVOICE, ST_CUSTCREDIT, ST_SUPPINVOICE, ST_SUPPCREDIT, ST_JOURNAL)).")
 			AND taxrec.tran_date >= '$fromdate'
 			AND taxrec.tran_date <= '$todate'
 		GROUP BY ttype.id";
-//display_error($sql);
+
+		// display_error($sql);
     return db_query($sql,"Cannot retrieve tax summary");
 }
 
@@ -518,18 +596,26 @@ function clear_gl_trans($type, $trans_id, $nested=false)
 		commit_transaction();
 }
 
-function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false)
+function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false,
+		 $user_id=null, $contractor_id=null, $dimension=null)
 {
 
-	$sql = "SELECT	IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
+	$sql = "SELECT	IFNULL(a.gl_seq,0) as gl_seq,
 		gl.tran_date,
-		gl.type,
-		gl.type_no,
-		refs.reference,
-		SUM(IF(gl.amount>0, gl.amount,0)) as amount,
-		com.memo_,
-		IF(ISNULL(u.user_id),'',u.user_id) as user_id
-		FROM ".TB_PREF."gl_trans as gl
+		gl.type as trans_type,
+		gl.type_no as trans_no,
+		IFNULL(MAX(supp.supp_name), MAX(cust.name)) as name,
+		IF(ISNULL(st.supp_reference), '', st.supp_reference) AS supp_reference,
+		refs.reference,"
+		.($dimension ? " -SUM(IF(dim.dimension in(gl.dimension_id,gl.dimension2_id), gl.amount, 0)) as amount,":" SUM(IF(gl.amount>0, gl.amount,0)) as amount,")
+		."com.memo_,
+		IF(ISNULL(u.user_id),'',u.user_id) as user_id";
+
+	if ($contractor_id > 0) {
+		$sql.= ", st.supplier_id, dt.debtor_no ";
+	}
+
+	$sql.= " FROM ".TB_PREF."gl_trans as gl
 		 LEFT JOIN ".TB_PREF."audit_trail as a ON
 			(gl.type=a.type AND gl.type_no=a.trans_no)
 		 LEFT JOIN ".TB_PREF."comments as com ON
@@ -538,11 +624,18 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
 			(gl.type=refs.type AND gl.type_no=refs.id)
 		 LEFT JOIN ".TB_PREF."users as u ON
 			a.user=u.id
-		WHERE gl.tran_date >= '" . date2sql($from) . "'
+	 	 LEFT JOIN ".TB_PREF."debtor_trans dt ON dt.type=gl.type AND gl.type_no=dt.trans_no
+	 	 LEFT JOIN ".TB_PREF."debtors_master cust ON gl.person_type_id=2 AND gl.person_id=cust.debtor_no
+	 	 LEFT JOIN ".TB_PREF."supp_trans st ON st.type=gl.type AND gl.type_no=st.trans_no
+	 	 LEFT JOIN ".TB_PREF."suppliers supp ON gl.person_type_id=3 AND gl.person_id=supp.supplier_id"
+	 	 .($dimension ? 
+		 " LEFT JOIN (SELECT type, type_no, MAX(IFNULL(dimension_id, dimension2_id)) dimension FROM ".TB_PREF."gl_trans GROUP BY type, type_no) dim 
+		 		ON gl.type=dim.type AND gl.type_no=dim.type_no" : '')
+		." WHERE gl.tran_date >= '" . date2sql($from) . "'
 		AND gl.tran_date <= '" . date2sql($to) . "'
 		AND gl.amount!=0";
 	if ($ref) {
-		$sql .= " AND reference LIKE ". db_escape("%$ref%");
+		$sql .= " AND refs.reference LIKE ". db_escape("%$ref%");
 	}
 	if ($memo) {
 		$sql .= " AND com.memo_ LIKE ". db_escape("%$memo%");
@@ -553,9 +646,21 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
 	if (!$alsoclosed) {
 		$sql .= " AND gl_seq=0";
 	}
-	else
-		$sql .= " AND NOT ISNULL(a.gl_seq)";
+ 	else
+ 		$sql .= " AND NOT ISNULL(a.gl_seq)";
+
+	if ($user_id != null)
+		$sql .= " AND user_id = ".db_escape($user_id);
+
+	if ($contractor_id > 0) {
+		$sql.= " AND (dt.debtor_no =".$contractor_id;
+		$sql.= " OR st.supplier_id =".$contractor_id.") ";
+	}	
+
+	if ($dimension != null)
+		$sql .= " AND dim.dimension = ".db_escape($dimension);
 
 	$sql .= " GROUP BY gl.tran_date, a.gl_seq, gl.type, gl.type_no";
+
 	return $sql;
 }