Fixed Tax Report on Screen.

[fa-stable.git] / gl / inquiry / tax_inquiry.php

diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index 4adc57bf9524f6fc8e6b7c15158bc52de99b14f8..3aae793946984361d5e0799f667ecde2e517a840 100644 (file)
--- a/gl/inquiry/tax_inquiry.php
+++ b/gl/inquiry/tax_inquiry.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 $js = '';
 set_focus('account');
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
        $js .= get_js_date_picker();
@@ -58,7 +58,7 @@ function tax_inquiry_controls()
     start_table(TABLESTYLE_NOBORDER);
        start_row();
 
-       date_cells(_("from:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+       date_cells(_("from:"), 'TransFromDate', '', null, -user_transaction_days());
        date_cells(_("to:"), 'TransToDate');
        submit_cells('Show',_("Show"),'','', 'default');
 
@@ -73,8 +73,6 @@ function tax_inquiry_controls()
 
 function show_results()
 {
-       global $path_to_root;
-
     /*Now get the transactions  */
        div_start('trans_tbl');
        start_table(TABLESTYLE);
@@ -83,8 +81,6 @@ function show_results()
        table_header($th);
        $k = 0;
        $total = 0;
-       $bdate = date2sql($_POST['TransFromDate']);
-       $edate  = date2sql($_POST['TransToDate']);
 
        $taxes = get_tax_summary($_POST['TransFromDate'], $_POST['TransToDate']);
 
@@ -92,7 +88,7 @@ function show_results()
        {
 
                $payable = $tx['payable'];
-               $collectible = $tx['collectible'];
+               $collectible = -$tx['collectible'];
                $net = $collectible + $payable;
                $total += $net;
                alt_table_row_color($k);
@@ -105,7 +101,7 @@ function show_results()
                label_cell($tx['name'] . " " . $tx['rate'] . "%");
                label_cell(_("Paid on purchases") . " (" . _("Input Tax")."):");
                amount_cell($collectible);
-               amount_cell($tx['net_input']);
+               amount_cell(-$tx['net_input']);
                end_row();
                alt_table_row_color($k);
                label_cell("<b>".$tx['name'] . " " . $tx['rate'] . "%</b>");