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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 19e94b3e..cce5b51d 100644
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -374,15 +374,31 @@ function display_debit_or_credit_cells($value)
 
 function display_customer_trans_tax_details($tax_items, $columns)
 {
+	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'])
-        	label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) " .
-        		_("Amount") . ": $tax", "", "colspan=$columns align=right", "align=right");
+    	{
+			if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+  			{
+  				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_type_name, $tax, "colspan=$columns align=right", "align=right");
+        		$first = false;
+        	}
+        	else
+        		label_row(_("Included") . " " . $tax_type_name .
+        			_("Amount") . ": $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");
     }
 }