Backups/Restore: fixed compressed backup view, fixed obsolete ajax indicator during...

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

diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index 8d414a5411d40d1195b648472d50b5921e00bd0b..400885561ee29198fec0970d3bca3956195de6c4 100644 (file)
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -14,6 +14,7 @@ $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 
+include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
@@ -22,9 +23,9 @@ 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(_($help_context = "General Ledger Inquiry"), false, false, '', $js);
@@ -66,21 +67,21 @@ function gl_inquiry_controls()
 
     start_table(TABLESTYLE_NOBORDER);
        start_row();
-    gl_all_accounts_list_cells(_("Account:"), 'account', null, false, false, "All Accounts");
-       date_cells(_("from:"), 'TransFromDate', '', null, -30);
+    gl_all_accounts_list_cells(_("Account:"), 'account', null, false, false, _("All Accounts"));
+       date_cells(_("from:"), 'TransFromDate', '', null, -user_transaction_days());
        date_cells(_("to:"), 'TransToDate');
     end_row();
        end_table();
 
-       start_table();
+       start_table(TABLESTYLE_NOBORDER);
        start_row();
        if ($dim >= 1)
                dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
        if ($dim > 1)
                dimensions_list_cells(_("Dimension")." 2:", 'Dimension2', null, true, " ", false, 2);
 
-       small_amount_cells(_("Amount min:"), 'amount_min', null);
-       small_amount_cells(_("Amount max:"), 'amount_max', null);
+       small_amount_cells(_("Amount min:"), 'amount_min', null, " ");
+       small_amount_cells(_("Amount max:"), 'amount_max', null, " ");
        submit_cells('Show',_("Show"),'','', 'default');
        end_row();
        end_table();
@@ -131,7 +132,7 @@ function show_results()
        
        if ($dim == 2)
                $dim_cols = array(_("Dimension")." 1", _("Dimension")." 2");
-       else if ($dim == 1)
+       elseif ($dim == 1)
                $dim_cols = array(_("Dimension"));
        else
                $dim_cols = array();
@@ -148,7 +149,7 @@ function show_results()
                $begin = "";
        else
        {
-               $begin = begin_fiscalyear();
+               $begin = get_fiscalyear_begin_for_date($_POST['TransFromDate']);
                if (date1_greater_date2($begin, $_POST['TransFromDate']))
                        $begin = $_POST['TransFromDate'];
                $begin = add_days($begin, -1);
@@ -159,7 +160,7 @@ function show_results()
            $bfw = get_gl_balance_from_to($begin, $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
        start_row("class='inquirybg'");
        label_cell("<b>"._("Opening Balance")." - ".$_POST['TransFromDate']."</b>", "colspan=$colspan");
-       display_debit_or_credit_cells($bfw);
+       display_debit_or_credit_cells($bfw, true);
        label_cell("");
        label_cell("");
        end_row();
@@ -193,6 +194,8 @@ function show_results()
                display_debit_or_credit_cells($myrow["amount"]);
                if ($show_balances)
                    amount_cell($running_total);
+               if ($myrow['memo_'] == "")
+                       $myrow['memo_'] = get_comments_string($myrow['type'], $myrow['type_no']);
        label_cell($myrow['memo_']);
        end_row();
 
@@ -208,7 +211,7 @@ function show_results()
        if ($show_balances) {
        start_row("class='inquirybg'");
        label_cell("<b>" . _("Ending Balance") ." - ".$_POST['TransToDate']. "</b>", "colspan=$colspan");
-       display_debit_or_credit_cells($running_total);
+       display_debit_or_credit_cells($running_total, true);
        label_cell("");
        label_cell("");
        end_row();
@@ -235,4 +238,3 @@ div_end();
 
 end_page();
 
-?>