From a3790162d17c2d1ea7b265c05a5217cada048859 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Fri, 30 Jan 2009 08:36:47 +0000 Subject: [PATCH] Outputs/Inputs on tax inquiry as well (why not) --- CHANGELOG.txt | 4 ++++ gl/inquiry/tax_inquiry.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ffaa6a64..fb0877f3 100644 --- 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 a1bafbd9..269edda9 100644 --- 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("".$tx['name'] . " " . $tx['rate'] . "%"); -- 2.30.2