X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fjournal_inquiry.php;h=04092b75e47d8a46d4ed5cd517613c4e0a5a197b;hb=76addbf42e148553411cf37bf1284d2cf6082b84;hp=31037434d2f1b33eb3e986ba5a38d1d1014cc500;hpb=1d3cf13fe8d61a0e5703e57e2ca640c1e39adb53;p=fa-stable.git

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 31037434..04092b75 100644
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -10,7 +10,7 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 
-$page_security = 8;
+$page_security = 'SA_GLANALYTIC';
 $path_to_root="../..";
 
 include($path_to_root . "/includes/db_pager.inc");
@@ -55,8 +55,6 @@ submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 end_table();
 
-end_form();
-
 function journal_pos($row)
 {
 	return $row['gl_seq'] ? $row['gl_seq'] : '-';
@@ -64,7 +62,9 @@ function journal_pos($row)
 
 function systype_name($dummy, $type)
 {
-	return systypes::name($type);
+	global $systypes_array;
+	
+	return $systypes_array[$type];
 }
 
 function view_link($row) 
@@ -82,14 +82,14 @@ $editors = array(
 //	1=> Bank Payment,
 //	2=> Bank Deposit,
 //	4=> Funds Transfer,
-   10=> "/sales/customer_invoice.php?ModifyInvoice=%d",
+   ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d",
 //   11=>
 // free hand (debtors_trans.order_==0)
 //	"/sales/credit_note_entry.php?ModifyCredit=%d"
 // credit invoice
 //	"/sales/customer_credit_invoice.php?ModifyCredit=%d"
 //	 12=> Customer Payment,
-   13=> "/sales/customer_delivery.php?ModifyDelivery=%d",
+   ST_CUSTDELIVERY => "/sales/customer_delivery.php?ModifyDelivery=%d",
 //   16=> Location Transfer,
 //   17=> Inventory Adjustment,
 //   20=> Supplier Invoice,
@@ -105,37 +105,41 @@ function edit_link($row)
 {
 	global $editors;
 
-	return isset($editors[$row["type"]]) ? 
+	return isset($editors[$row["type"]]) && !is_closed_trans($row["type"], $row["type_no"]) ? 
 		pager_link(_("Edit"), 
 			sprintf($editors[$row["type"]], $row["type_no"], $row["type"]),
 			ICON_EDIT) : '';
 }
 
-$sql = "SELECT	a.gl_seq,
-				gl.tran_date,
-				gl.type,
-				gl.type_no,
-				refs.reference,
-				SUM(IF(gl.amount>0, gl.amount,0)) as amount,"
-				."com.memo_"
-		." 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 
-			(gl.type=com.type AND gl.type_no=com.id)"
-		." LEFT JOIN ". TB_PREF."refs as refs ON 
-			(gl.type=refs.type AND gl.type_no=refs.id)
-		WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
+$sql = "SELECT	IF(ISNULL(a.gl_seq),0,a.gl_seq) 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
+	 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 
+		(gl.type=com.type AND gl.type_no=com.id)
+	 LEFT JOIN ".TB_PREF."refs as refs ON 
+		(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($_POST['FromDate']) . "'
 	AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
-	AND gl.amount!=0 AND !ISNULL(a.gl_seq)";
-
+	AND gl.amount!=0";
 if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
 	$sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
-}
+}	
 if (get_post('filterType') != -1) {
 	$sql .= " AND gl.type=".get_post('filterType');
+}	
+if (!check_value('AlsoClosed')) {
+	$sql .= " AND gl_seq=0";
 }
-
 $sql .= " GROUP BY gl.type, gl.type_no";
 
 $cols = array(
@@ -146,6 +150,7 @@ $cols = array(
 	_("Reference"), 
 	_("Amount") => array('type'=>'amount'),
 	_("Memo"),
+	_("User"),
 	_("View") => array('insert'=>true, 'fun'=>'gl_link'),
 	array('insert'=>true, 'fun'=>'edit_link')
 );
@@ -156,12 +161,7 @@ if (!check_value('AlsoClosed')) {
 
 $table =& new_db_pager('journal_tbl', $sql, $cols);
 
-if (get_post('Search')) {
-	$table->set_sql($sql);
-	$table->set_columns($cols);
-}
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);