X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Ftax_inquiry.php;h=394963abe42e037e0d2f8a63a726f322209af3bb;hb=edbff365515fbb3a2899ff0b9717c1596496aff0;hp=9c8b7a3725ee78e2f7564d2a41149e34c57887e2;hpb=ffb77b26d201f54cde952743014359035eb3114f;p=fa-stable.git

diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index 9c8b7a37..394963ab 100644
--- a/gl/inquiry/tax_inquiry.php
+++ b/gl/inquiry/tax_inquiry.php
@@ -1,15 +1,15 @@
 <?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;
+$page_security = 'SA_TAXREP';
 $path_to_root="../..";
 include_once($path_to_root . "/includes/session.inc");
 
@@ -27,7 +27,7 @@ if ($use_popup_windows)
 if ($use_date_picker)
 	$js .= get_js_date_picker();
 
-page(_("Tax Inquiry"), false, false, '', $js);
+page(_($help_context = "Tax Inquiry"), false, false, '', $js);
 
 //----------------------------------------------------------------------------------------------------
 // Ajax updates
@@ -43,19 +43,14 @@ if (get_post('TransFromDate') == "" && get_post('TransToDate') == "")
 	$row = get_company_prefs();
 	$edate = add_months($date, -$row['tax_last']);
 	$edate = end_month($edate);
-	$bdate = add_months($edate, -$row['tax_prd'] + 1);
-	$_POST["TransFromDate"] = begin_month($bdate);
+	$bdate = begin_month($edate);
+	$bdate = add_months($bdate, -$row['tax_prd'] + 1);
+	$_POST["TransFromDate"] = $bdate;
 	$_POST["TransToDate"] = $edate;
 }	
 
 //----------------------------------------------------------------------------------------------------
 
-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 +63,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();
 
@@ -119,12 +114,14 @@ function show_results()
 		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);