Changed hardcoded trans days in inquiries (30) to be a user preference.

[fa-stable.git] / gl / inquiry / tax_inquiry.php

diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index db10eea01e50901aaa21b0bf1d1a378fcb8f7720..e1e7c853070f02c3eaa5f779c59f35c591a1364e 100644 (file)
--- 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");
 
@@ -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,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,15 +53,12 @@ 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, -$_SESSION["wa_current_user"]->prefs->transaction_days());
        date_cells(_("to:"), 'TransToDate');
        submit_cells('Show',_("Show"),'','', 'default');
 
@@ -75,11 +73,11 @@ function tax_inquiry_controls()
 
 function show_results()
 {
-       global $path_to_root, $table_style;
+       global $path_to_root;
 
     /*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);