X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=e2e5066ac0f4ee1ec6952b1aef6584b3565c4285;hb=8b4c057c30499c3256cce7871bac60b45071ea01;hp=c0e9e8c9a02646b3787c8eafc0906ea383baa576;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index c0e9e8c9..e2e5066a 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -391,6 +391,9 @@ function display_customer_trans_tax_details($tax_items, $columns)
 	$first = true;
     while ($tax_item = db_fetch($tax_items))
     {
+     	if (!$tax_item['amount'])
+     		continue;
+
     	$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'];
@@ -421,6 +424,9 @@ function display_supp_trans_tax_details($tax_items, $columns)
 {
     while ($tax_item = db_fetch($tax_items))
     {
+     	if (!$tax_item['amount'])
+     		continue;
+
     	$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'] . "%) "
@@ -439,16 +445,18 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
 
     foreach ($taxes as $taxitem)
     {
-    	if ($tax_included)
-    	{
-        	label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) "
-        		. " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
-    	}
-    	else
-    	{
-        	label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)",
-        		number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
-        	$total +=  round2($taxitem['Value'], user_price_dec());
+    	if ($taxitem['Value'] != 0) {
+	    	if ($tax_included)
+    		{
+        		label_row(_("Included") . " " . $taxitem['tax_type_name']
+        			. " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
+	    	}
+    		else
+    		{
+        		label_row($taxitem['tax_type_name'],
+        			number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
+	        	$total +=  round2($taxitem['Value'], user_price_dec());
+    		}
     	}
     }
 
@@ -571,6 +579,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
 		{
 			display_error( _("No Quick Entry lines are defined."));
 			set_focus('totamount');
+			return 0;
 		}	
 		$totrate = 0;
 		while ($row = db_fetch($result))
@@ -632,7 +641,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
 					{
 						$taxgroup = $cart->tax_group_id;
 						$rates = 0;
-						$res = get_tax_group_items($cart->tax_group_id);
+						$res = get_tax_group_rates($cart->tax_group_id);
 						while ($row = db_fetch($res))
 							$rates += $row['rate'];
 						if ($rates == 0)
@@ -799,31 +808,6 @@ function reset_focus()
 	unset($_POST['_focus']);
 }
 
-function get_js_png_fix()
-{
-	$js = "function fixPNG(myImage)\n"
-		. "{\n"
-		. " var arVersion = navigator.appVersion.split(\"MSIE\")\n"
-		. " var version = parseFloat(arVersion[1])\n"
-    	. " if ((version >= 5.5) && (version < 7) && (document.body.filters))\n"
-    	. " {\n"
-       	. "  var imgID = (myImage.id) ? \"id='\" + myImage.id + \"' \" : \"\"\n"
-	   	. "  var imgClass = (myImage.className) ? \"class='\" + myImage.className + \"' \" : \"\"\n"
-	   	. "  var imgTitle = (myImage.title) ?\n"
-		. "    \"title='\" + myImage.title  + \"' \" : \"title='\" + myImage.alt + \"' \"\n"
-	   	. "  var imgStyle = \"display:inline-block;\" + myImage.style.cssText\n"
-	   	. "  var strNewHTML = \"<span \" + imgID + imgClass + imgTitle\n"
-        . "    + \" style=\\\"\" + \"width:\" + myImage.width\n"
-        . "    + \"px; height:\" + myImage.height\n"
-        . "    + \"px;\" + imgStyle + \";\"\n"
-        . "    + \"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader\"\n"
-        . "    + \"(src=\'\" + myImage.src + \"\', sizingMethod='scale');\\\"></span>\"\n"
-	   	. "  myImage.outerHTML = strNewHTML\n"
-    	. " }\n"
-		. "}\n";
-	return $js;
-}
-
 function get_js_date_picker()
 {
     global $go_debug;
@@ -1316,37 +1300,4 @@ function display_backtrace($cond=true, $msg='') {
 	}
 }
 
-function get_backtrace($html = false)
-{
-	$str = '';
-	if ($html) $str .= '<table border=0>';
-	$trace = debug_backtrace();
-
-	foreach($trace as $trn => $tr) {
-		if (!$trn) continue;
-		if ($html) $str .= '<tr><td>';
-		$str .= $tr['file'].':'.$tr['line'].': ';
-		if ($html) $str .= '</td><td>';
-		if (isset($tr['type'])) {
-	 		if($tr['type'] == '::') {
-				$str .= $tr['class'].'::';
-			} else if($tr['type'] == '->') {
-				$str .= '('.$tr['class'].' Object)'.'->';
-			}
-		}
-
-		foreach($tr['args'] as $n=>$a) {
-			if (is_object($tr['args'][$n]))
-				$tr['args'][$n] = "(".get_class($tr['args'][$n])." Object)";
-			if (is_array($tr['args'][$n]))
-				$tr['args'][$n] = "(Array[".count($tr['args'][$n])."])";
-			else
-				$tr['args'][$n] = "'".$tr['args'][$n]."'";
-		}
-		$str .= $tr['function'].'('. implode(',',$tr['args']).')</td>';
-	}
-
-	if ($html) $str .= '</tr></table>';
-	return $str;
-}
 ?>
\ No newline at end of file