Version changed to 2.0. Final release

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

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 4ab7a46512a99684cee31b522d1f5ec4ca5cdb3a..b3dee997d722db482fe18f4b376840f60d91a780 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -18,6 +18,12 @@ if ($use_date_picker)
 page(_("Trial Balance"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------------------
+// Ajax updates
+//
+if (get_post('Show')) 
+{
+       $Ajax->activate('balance_tbl');
+}
 
 
 function gl_inquiry_controls()
@@ -26,11 +32,11 @@ function gl_inquiry_controls()
 
     start_table("class='tablestyle_noborder'");
 
-    date_cells(_("From:"), 'TransFromDate', null, -30);
+    date_cells(_("From:"), 'TransFromDate', '', null, -30);
        date_cells(_("To:"), 'TransToDate');
        check_cells(_("No zero values"), 'NoZero', null);
 
-    submit_cells('Show',_("Show"));
+       submit_cells('Show',_("Show"),'','', true);
     end_table();
     end_form();
 }
@@ -72,6 +78,7 @@ function display_trial_balance()
 {
        global $table_style, $path_to_root;
 
+       div_start('balance_tbl');
        start_table($table_style);
        $tableheader =  "<tr>
         <td rowspan=2 class='tableheader'>" . _("Account") . "</td>
@@ -100,10 +107,10 @@ function display_trial_balance()
                        $begin = null;
                else
                {
-                       if ($from < $begin)
-                               $begin = add_days($_POST['TransFromDate'], -1);
-                       else
-                               $begin = add_days(begin_fiscalyear(), -1);
+                       $begin = begin_fiscalyear();
+                       if ($_POST['TransFromDate'] < $begin)
+                               $begin = $_POST['TransFromDate'];
+                       $begin = add_days($begin, -1);
                }
                $prev_balance = get_balance($account["account_code"], $begin, $_POST['TransFromDate'], false, false);
 
@@ -124,7 +131,7 @@ function display_trial_balance()
        }
 
        end_table(1);
-
+       div_end();
 }
 
 //----------------------------------------------------------------------------------------------------