Outputs/Inputs on tax inquiry as well (why not)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ffaa6a6431ffc4e15cfe3bfda3611674d6ca8fe9..fb0877f3e8b35671e9449eda2ae1d52fd9b648a8 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+30-Jan-2009 Joe Hunt
++ Outputs/Inputs on tax inquiry as well (why not)
+$ /gl/inquiry/tax_inquiry.php
+
 29-Jan-2009 Joe Hunt
 # A few minor fixes to get the tax report and inquiry right and syncronized
 $ /gl/includes/db/gl_db_trans.inc

diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index a1bafbd989b4d1882ed50e6155ceaa34dbe7e24c..269edda90bf9480bed3fb422c15c591ddc8e38d2 100644 (file)
--- a/gl/inquiry/tax_inquiry.php
+++ b/gl/inquiry/tax_inquiry.php
@@ -87,7 +87,7 @@ function show_results()
        div_start('trans_tbl');
        start_table($table_style);
 
-       $th = array(_("Type"), _("Description"), _("Amount"));
+       $th = array(_("Type"), _("Description"), _("Amount"), _("Outputs")."/"._("Inputs"));
        table_header($th);
        $k = 0;
        $total = 0;
@@ -107,11 +107,13 @@ function show_results()
                label_cell($tx['name'] . " " . $tx['rate'] . "%");
                label_cell(_("Charged on sales") . " (" . _("Output Tax")."):");
                amount_cell($collectible);
+               amount_cell($tx['net_input']);
                end_row();
                alt_table_row_color($k);
                label_cell($tx['name'] . " " . $tx['rate'] . "%");
                label_cell(_("Paid on purchases") . " (" . _("Input Tax")."):");
                amount_cell($payable);
+               amount_cell($tx['net_output']);
                end_row();
                alt_table_row_color($k);
                label_cell("<b>".$tx['name'] . " " . $tx['rate'] . "%</b>");