X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fjournal_inquiry.php;h=2d9eaabc93e32715f000b502fe905132bf526a1c;hb=90b3d069d96b99671af51726e2953352738abb75;hp=1c1405137dee9df5e0c806d08c9adc65cbc5fbf5;hpb=f0f460043b9bcb6153c0f6f82d4a74433efe4ad8;p=fa-stable.git

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 1c140513..2d9eaabc 100644
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -24,7 +24,7 @@ if ($use_popup_windows)
 if ($use_date_picker)
 	$js .= get_js_date_picker();
 
-page(_("Journal Inquiry"), false, false, "", $js);
+page(_($help_context = "Journal Inquiry"), false, false, "", $js);
 
 //-----------------------------------------------------------------------------------
 // Ajax updates
@@ -39,24 +39,24 @@ if (!isset($_POST['filterType']))
 
 start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 
 ref_cells(_("Reference:"), 'Ref', '',null, _('Enter reference fragment or leave empty'));
 
 journal_types_list_cells(_("Type:"), "filterType");
-date_cells(_("From:"), 'FromDate', '', null, 0, 0, -1);
+date_cells(_("From:"), 'FromDate', '', null, 0, -1, 0);
 date_cells(_("To:"), 'ToDate');
 
 check_cells( _("Show closed:"), 'AlsoClosed', null);
 
 submit_cells('Search', _("Search"), '', '', 'default');
-
+end_row();
+start_row();
+ref_cells(_("Memo:"), 'Memo', '',null, _('Enter memo fragment or leave empty'));
 end_row();
 end_table();
 
-end_form();
-
 function journal_pos($row)
 {
 	return $row['gl_seq'] ? $row['gl_seq'] : '-';
@@ -80,9 +80,9 @@ function gl_link($row)
 }
 
 $editors = array(
-	0 => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
-//	1=> Bank Payment,
-//	2=> Bank Deposit,
+	ST_JOURNAL => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
+	ST_BANKPAYMENT => "/gl/gl_bank.php?ModifyPayment=Yes&trans_no=%d&trans_type=%d",
+	ST_BANKDEPOSIT => "/gl/gl_bank.php?ModifyDeposit=Yes&trans_no=%d&trans_type=%d",
 //	4=> Funds Transfer,
    ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d",
 //   11=>
@@ -107,44 +107,21 @@ function edit_link($row)
 {
 	global $editors;
 
-	return isset($editors[$row["type"]]) && !is_closed_trans($row["type"], $row["type_no"]) ? 
+	$ok = true;
+	if ($row['type'] == ST_SALESINVOICE)
+	{
+		$myrow = get_customer_trans($row["type_no"], $row["type"]);
+		if ($myrow['alloc'] != 0 || get_voided_entry(ST_SALESINVOICE, $row["type_no"]) !== false)
+			$ok = false;
+	}		
+	return isset($editors[$row["type"]]) && !is_closed_trans($row["type"], $row["type_no"]) && $ok ? 
 		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_,"
-				."u.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)";
-
-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 a.gl_seq=0";
-}
-
-$sql .= " GROUP BY gl.type, gl.type_no";
+$sql = get_sql_for_journal_inquiry(get_post('filterType', -1), get_post('FromDate'),
+	get_post('ToDate'), get_post('Ref'), get_post('Memo'), check_value('AlsoClosed'));
 
 $cols = array(
 	_("#") => array('fun'=>'journal_pos', 'align'=>'center'), 
@@ -166,7 +143,6 @@ if (!check_value('AlsoClosed')) {
 $table =& new_db_pager('journal_tbl', $sql, $cols);
 
 $table->width = "80%";
-start_form();
 
 display_db_pager($table);