X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=69810222a0ea2f6489c5748126404a5f08c2c5d4;hb=5a96d27422f2eb4b45738ad54894a032e0495cb4;hp=55881b1d424e6e4bdb8756ce5fe6247991863823;hpb=99d5647a5dd083073d39603792fd78c49bfb5ccb;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 55881b1d..69810222 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, 
@@ -355,18 +368,18 @@ function view_stock_status_cell($stock_id, $description=null)
 
 //--------------------------------------------------------------------------------------
 
-function display_debit_or_credit_cells($value)
+function display_debit_or_credit_cells($value, $bold=false)
 {
 	$value = round2($value, user_price_dec());
 	if ($value >= 0)
 	{
-		amount_cell($value);
+		amount_cell($value, $bold);
 		label_cell("");
 	}
 	elseif ($value < 0)
 	{
 		label_cell("");
-		amount_cell(abs($value));
+		amount_cell(abs($value), $bold);
 	}
 }
 
@@ -374,11 +387,15 @@ function display_debit_or_credit_cells($value)
 
 function display_customer_trans_tax_details($tax_items, $columns)
 {
-	global $alternative_tax_include_on_docs;
+	global $alternative_tax_include_on_docs, $suppress_tax_rates;
 	$first = true;
     while ($tax_item = db_fetch($tax_items))
     {
     	$tax = number_format2($tax_item['amount'],user_price_dec());
+		if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+			$tax_type_name = $tax_item['tax_type_name'];
+		else
+			$tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
     	if ($tax_item['included_in_price'])
     	{
 			if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
@@ -386,17 +403,15 @@ function display_customer_trans_tax_details($tax_items, $columns)
   				if ($first)
   					label_row(_("Total Tax Excluded"), number_format2($tax_item['net_amount'], user_price_dec()),
   						"colspan=$columns align=right", "align=right");
-        		label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
-        			$tax, "colspan=$columns align=right", "align=right");
+        		label_row($tax_type_name, $tax, "colspan=$columns align=right", "align=right");
         		$first = false;
         	}
         	else
-        		label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " .
-        			_("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_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
-        		$tax, "colspan=$columns align=right", "align=right");
+        	label_row($tax_type_name, $tax, "colspan=$columns align=right", "align=right");
     }
 }
 
@@ -408,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");
@@ -426,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
     	{
@@ -719,12 +734,11 @@ function _number_to_words($number)
 
 function price_in_words($amount, $document=0)
 {
-	global $Hooks;
 	// use local price_in_words() if the hook is defined
-	if (method_exists($Hooks, 'price_in_words'))
-	{
-		return $Hooks->price_in_words($amount, $document);
-	}
+	$price = hook_price_in_words($amount, $document);
+	if ($price) 
+		return $price;
+
 	// Only usefor Remittance and Receipts as default
 	if (!($document == ST_SUPPAYMENT || $document == ST_CUSTPAYMENT || $document == ST_CHEQUE))
 		return "";
@@ -1275,7 +1289,6 @@ if (!function_exists('_vd'))
 {
   	function _vd($mixed, $title = '', $exit = false)
   	{
-    	// Only the site admin is able to proceed here.
     	$str = (!empty($title) ? ($title .':') : '') .'<pre>';
     	$str .= print_r($mixed, true); //var_dump($mixed);
     	$str .= "</pre>\n";
@@ -1285,6 +1298,13 @@ if (!function_exists('_vd'))
   	}
 }
 
+function _vl($mixed, $title = '', $exit = false)
+{
+	error_log((!empty($title) ? ($title .':') : '') . var_export($mixed, true));
+	if ($exit)
+		exit;
+}
+
 function display_backtrace($cond=true, $msg='') {
 
 	if ($cond) {