From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 18 Dec 2018 11:53:37 +0000 (+0100)
Subject: Changed Journal # to GL # in GL Trans View.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=8cd59d7d269f3608f5a19df67679402eadf185bb

Changed Journal # to GL # in GL Trans View.
---

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 8f0db537..fbd7c06a 100644
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -88,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)
diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php
index 36f3d547..75ee82a3 100644
--- a/gl/view/gl_trans_view.php
+++ b/gl/view/gl_trans_view.php
@@ -36,7 +36,7 @@ function display_gl_heading($myrow)
 
     start_table(TABLESTYLE, "width='95%'");
     $th = array(_("General Ledger Transaction Details"), _("Reference"),
-    	_("Transaction Date"), _("Journal #"));
+    	_("Transaction Date"), _("GL #"));
 
 	if ($_GET['type_id'] == ST_JOURNAL)
 		array_insert($th, 3, array(_("Document Date"), _("Event Date")));
diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 9030ca90..642b9943 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -1562,7 +1562,7 @@ function trans_editor_link($type, $trans_no)
 	//   35=> Cost Update,
 	);
 
-	return !isset($editor_url[$type]) ? '' :
+	return !isset($editor_url[$type]) ? '--' :
 		(is_closed_trans($type, $trans_no) ? set_icon(ICON_CLOSED, _('Closed')) :
 			pager_link(_("Edit"), sprintf($editor_url[$type], $trans_no, $type), ICON_EDIT));
 }