X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fjournal_inquiry.php;h=2d9eaabc93e32715f000b502fe905132bf526a1c;hb=0489317205141deaecefe3a7243d11a3e38a51d0;hp=ed6f9be7328e1bc2316476357486c1f981f193d9;hpb=702a71dbe463765b5fd1892a982ede3e5f264dee;p=fa-stable.git

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index ed6f9be7..2d9eaabc 100644
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -107,13 +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 = get_sql_for_journal_inquiry();
+$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'),