X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=gl%2Finquiry%2Fjournal_inquiry.php;h=fbd7c06a2efe4a221253774d20732485f9b3cce4;hb=97c5e11dd178b2b10edd2b99276b3347470fafc8;hp=999ae232cd23145de5073d23a85e266e862f1d80;hpb=92101d528a49ac3dda0a0f06960313b9a2794fd6;p=fa-stable.git

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 999ae232..fbd7c06a 100644
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -48,15 +48,14 @@ journal_types_list_cells(_("Type:"), "filterType");
 date_cells(_("From:"), 'FromDate', '', null, 0, -1, 0);
 date_cells(_("To:"), 'ToDate');
 
-submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 start_row();
 ref_cells(_("Memo:"), 'Memo', '',null, _('Enter memo fragment or leave empty'));
 users_list_cells(_("User:"), 'userid', null, false);
 if (get_company_pref('use_dimension') && isset($_POST['dimension'])) // display dimension only, when started in dimension mode
 	dimensions_list_cells(_('Dimension:'), 'dimension', null, true, null, true);
-users_list_cells(_("User:"), 'userid', null, false);
 check_cells( _("Show closed:"), 'AlsoClosed', null);
+submit_cells('Search', _("Search"), '', '', 'default');
 end_row();
 end_table();
 
@@ -89,10 +88,11 @@ function edit_link($row)
 	if ($row['trans_type'] == ST_SALESINVOICE)
 	{
 		$myrow = get_customer_trans($row["trans_no"], $row["trans_type"]);
-		if ($myrow['alloc'] != 0 || get_voided_entry(ST_SALESINVOICE, $row["trans_no"]) !== false)
+		if ($myrow['alloc'] != $myrow['Total'] || get_voided_entry(ST_SALESINVOICE, $row["trans_no"]) !== false)
 			$ok = false;
 	}
-	return $ok ? trans_editor_link( $row["trans_type"], $row["trans_no"]) : '';
+	
+	return $ok ? trans_editor_link( $row["trans_type"], $row["trans_no"]) : '--';
 }
 
 function invoice_supp_reference($row)
@@ -101,7 +101,7 @@ function invoice_supp_reference($row)
 }
 
 $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'));
+	get_post('ToDate'), get_post('Ref'), get_post('Memo'), check_value('AlsoClosed'), get_post('userid'));
 
 $cols = array(
 	_("#") => array('fun'=>'journal_pos', 'align'=>'center'),