Added an alternative way of presenting tax included on invoices.

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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 65b6bf91f00541814f581ad3dcc62616870f6b24..55881b1d424e6e4bdb8756ce5fe6247991863823 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -283,13 +283,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=
 
 function is_voided_display($type, $id, $label)
 {
-       global $table_style;
        $void_entry = get_voided_entry($type, $id);
 
        if ($void_entry == null)
                return false;
 
-       start_table("width=50% $table_style");
+       start_table(TABLESTYLE, "width=50%");
        echo "<tr><td align=center><font color=red>$label</font><br>";
        echo "<font color=red>" . _("Date Voided:") . " " . sql2date($void_entry["date_"]) . "</font><br>";
        if (strlen($void_entry["memo_"]) > 0)
@@ -375,12 +374,26 @@ function display_debit_or_credit_cells($value)
 
 function display_customer_trans_tax_details($tax_items, $columns)
 {
+       global $alternative_tax_include_on_docs;
+       $first = true;
     while ($tax_item = db_fetch($tax_items))
     {
        $tax = number_format2($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");
+       {
+                       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_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
+                               $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");
+        }                      
        else
                label_row($tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%)",
                        $tax, "colspan=$columns align=right", "align=right");
@@ -440,14 +453,14 @@ function display_footer_exit()
 
 function display_allocations($alloc_result, $total)
 {
-       global $table_style, $systypes_array;
+       global $systypes_array;
 
        if (!$alloc_result || db_num_rows($alloc_result) == 0)
                return;
 
     display_heading2(_("Allocations"));
 
-    start_table("$table_style width=80%");
+    start_table(TABLESTYLE, "width=80%");
 
     $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
        _("Left to Allocate"), _("This Allocation"));
@@ -799,8 +812,8 @@ function get_js_png_fix()
 
 function get_js_date_picker()
 {
-    global $comp_path, $go_debug;
-    $fpath = $comp_path.'/'.user_company().'/js_cache/'.'date_picker.js';
+    global $go_debug;
+    $fpath = company_path().'/js_cache/'.'date_picker.js';
 
     if (!file_exists($fpath) || $go_debug) {
 
@@ -1266,7 +1279,7 @@ if (!function_exists('_vd'))
        $str = (!empty($title) ? ($title .':') : '') .'<pre>';
        $str .= print_r($mixed, true); //var_dump($mixed);
        $str .= "</pre>\n";
-               display_error('<table><tr><td>'.$str.'</td></tr></table>');
+               display_notification('<table><tr><td>'.$str.'</td></tr></table>');
        if ($exit)
                exit;
        }