Added edit_button_cell()

[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 28653ff0e57d6327ebff246fa2a093d19b98d284..8a6ba2f9c1c65ec251fb70a53a52d6549fb91f6f 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -5,14 +5,18 @@ $path_to_root="../..";
 
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Trial Balance"));
-
 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");
 
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
+$js = "";
+if ($use_date_picker)
+       $js = get_js_date_picker();
+
+page(_("Trial Balance"), false, false, "", $js);
+
 //----------------------------------------------------------------------------------------------------
 
 
@@ -36,9 +40,9 @@ function gl_inquiry_controls()
 function get_balance($account, $from, $to, $from_incl=true, $to_incl=true) {
 
        $sql = "SELECT SUM(amount) As TransactionSum FROM ".TB_PREF."gl_trans
-               WHERE account=$account";
+               WHERE account='$account'";
 
-       if ($from) 
+       if ($from)
        {
                $from_date = date2sql($from);
                if ($from_incl)
@@ -47,7 +51,7 @@ function get_balance($account, $from, $to, $from_incl=true, $to_incl=true) {
                        $sql .= " AND tran_date > '$from_date'";
        }
 
-       if ($to) 
+       if ($to)
        {
                $to_date = date2sql($to);
                if ($to_incl)
@@ -90,10 +94,18 @@ function display_trial_balance()
 
        $accounts = get_gl_accounts();
 
-       while ($account = db_fetch($accounts)) 
+       while ($account = db_fetch($accounts))
        {
-
-               $prev_balance = get_balance($account["account_code"], null, $_POST['TransFromDate'], false, false);
+               if (is_account_balancesheet($account["account_code"]))
+                       $begin = null;
+               else
+               {
+                       $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);
 
                $curr_balance = get_balance($account["account_code"], $_POST['TransFromDate'], $_POST['TransToDate']);
                if (check_value("NoZero") && !$prev_balance && !$curr_balance)