X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Ftax_inquiry.php;h=db10eea01e50901aaa21b0bf1d1a378fcb8f7720;hb=e91772a2716825a6aeb358d1defba47d5f3892c1;hp=b7ca2de3f8b99602232294d9c99174c0efe26174;hpb=871bc1f187ad6e5622a80c7dd8aadc48d8ea70fd;p=fa-stable.git

diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index b7ca2de3..db10eea0 100644
--- a/gl/inquiry/tax_inquiry.php
+++ b/gl/inquiry/tax_inquiry.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 8;
 $path_to_root="../..";
@@ -50,12 +50,6 @@ if (get_post('TransFromDate') == "" && get_post('TransToDate') == "")
 
 //----------------------------------------------------------------------------------------------------
 
-function get_tax_types()
-{
-	$sql = "SELECT * FROM ".TB_PREF."tax_types ORDER BY id";
-    return db_query($sql,"No transactions were returned");
-}
-
 function tax_inquiry_controls()
 {
 	global $table_style2;
@@ -68,7 +62,7 @@ function tax_inquiry_controls()
 
 	date_cells(_("from:"), 'TransFromDate', '', null, -30);
 	date_cells(_("to:"), 'TransToDate');
-	submit_cells('Show',_("Show"),'','', true);
+	submit_cells('Show',_("Show"),'','', 'default');
 
     end_row();
 
@@ -87,7 +81,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;
@@ -101,28 +95,32 @@ function show_results()
 
 		$payable = $tx['payable'];
 		$collectible = $tx['collectible'];
-		$net = $collectible - $payable;
+		$net = $collectible + $payable;
 		$total += $net;
 		alt_table_row_color($k);
 		label_cell($tx['name'] . " " . $tx['rate'] . "%");
 		label_cell(_("Charged on sales") . " (" . _("Output Tax")."):");
-		amount_cell($collectible);
+		amount_cell($payable);
+		amount_cell($tx['net_output']);
 		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($collectible);
+		amount_cell($tx['net_input']);
 		end_row();
 		alt_table_row_color($k);
 		label_cell("<b>".$tx['name'] . " " . $tx['rate'] . "%</b>");
 		label_cell("<b>"._("Net payable or collectible") . ":</b>");
 		amount_cell($net, true);
+		label_cell("");
 		end_row();
 	}	
 	alt_table_row_color($k);
 	label_cell("");
 	label_cell("<b>"._("Total payable or refund") . ":</b>");
 	amount_cell($total, true);
+	label_cell("");
 	end_row();
 
 	end_table(2);