X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Ftax_inquiry.php;h=d1a38637d9eb26a77f0d35a74831dffa866e43d6;hb=9988555dbed61bdf6a11a19eb6a4ec52dc0d586c;hp=df9cd14beb996f55fb34f3c2e2dc9b62d1929a4d;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index df9cd14b..d1a38637 100644
--- a/gl/inquiry/tax_inquiry.php
+++ b/gl/inquiry/tax_inquiry.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     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");
 
@@ -22,12 +22,12 @@ 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 ($use_date_picker)
+if (user_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,8 +43,9 @@ 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;
 }	
 
@@ -52,17 +53,14 @@ if (get_post('TransFromDate') == "" && get_post('TransToDate') == "")
 
 function tax_inquiry_controls()
 {
-	global $table_style2;
-
     start_form();
 
-    //start_table($table_style2);
-    start_table("class='tablestyle_noborder'");
+    start_table(TABLESTYLE_NOBORDER);
 	start_row();
 
-	date_cells(_("from:"), 'TransFromDate', '', null, -30);
+	date_cells(_("from:"), 'TransFromDate', '', null, -user_transaction_days());
 	date_cells(_("to:"), 'TransToDate');
-	submit_cells('Show',_("Show"),'','', true);
+	submit_cells('Show',_("Show"),'','', 'default');
 
     end_row();
 
@@ -75,18 +73,14 @@ function tax_inquiry_controls()
 
 function show_results()
 {
-	global $path_to_root, $table_style;
-
     /*Now get the transactions  */
 	div_start('trans_tbl');
-	start_table($table_style);
+	start_table(TABLESTYLE);
 
 	$th = array(_("Type"), _("Description"), _("Amount"), _("Outputs")."/"._("Inputs"));
 	table_header($th);
 	$k = 0;
 	$total = 0;
-	$bdate = date2sql($_POST['TransFromDate']);
-	$edate  = date2sql($_POST['TransToDate']);
 
 	$taxes = get_tax_summary($_POST['TransFromDate'], $_POST['TransToDate']);
 
@@ -137,4 +131,3 @@ show_results();
 
 end_page();
 
-?>