Additional fixes in tax display/reporting

[fa-stable.git] / includes / ui / ui_view.inc

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index aaf634dd6e9de0e2b8a45c1dec2434afd44d4035..0fa04330a7478483bf9eb5e207f25562d2da6b80 100644 (file)
--- 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());
+               }
        }
     }
 
@@ -633,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)