X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=a798586e63f3c3f4b4ec0ceff04eabe5f4cac079;hb=b611def496e4942321d66f183fe0e1d95417c99f;hp=cce5b51d7cfd4c2119517cce3e2d4592a3e2f677;hpb=a2e0638b8caab0356ee8d39b5761745a5991fc2d;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index cce5b51d..a798586e 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -201,6 +201,19 @@ function get_journal_trans_view_str($type, $trans_no, $label="", $icon=false,
 	return viewer_link($label, $viewer, $class, $id,  $icon);
 }
 
+//--------------------------------------------------------------------------------------
+
+function get_package_view_str($pkg, $label="", $icon=false, $class='', $id='')
+{
+	if ($label == "")
+	{
+		$label = _("Info");
+//		$icon = ICON_GL;
+	}
+	return viewer_link($label, "includes/ui/view_package.php?id=$pkg", $class, $id, $icon);
+}
+
+
 //--------------------------------------------------------------------------------------
 
 function get_trans_view_str($type, $trans_no, $label="", $icon=false, 
@@ -394,8 +407,8 @@ function display_customer_trans_tax_details($tax_items, $columns)
         		$first = false;
         	}
         	else
-        		label_row(_("Included") . " " . $tax_type_name .
-        			_("Amount") . ": $tax", "", "colspan=$columns align=right", "align=right");
+        		label_row(_("Included") . " " . $tax_type_name
+        			. ": $tax", "", "colspan=$columns align=right", "align=right");
         }			
     	else
         	label_row($tax_type_name, $tax, "colspan=$columns align=right", "align=right");
@@ -410,8 +423,8 @@ function display_supp_trans_tax_details($tax_items, $columns)
     {
     	$tax = number_format2(abs($tax_item['amount']),user_price_dec());
     	if ($tax_item['included_in_price'])
-        	label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " .
-        		_("Amount") . ": $tax", "colspan=$columns align=right", "align=right");
+        	label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) "
+        		. ": $tax", '', "colspan=$columns align=right", "align=right");
     	else
         	label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
         		$tax, "colspan=$columns align=right", "align=right");
@@ -428,8 +441,8 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
     {
     	if ($tax_included)
     	{
-        	label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) " .
-        		_("Amount:") . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
+        	label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) "
+        		. " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
     	}
     	else
     	{