Fixed document mailing.

[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 4f44d5b3aaef499bcc4613977b5a39dc46c8e186..27fc37df0e70b185ccf17a2f85d094e64c31fa70 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 8;
 $path_to_root="../..";
 
@@ -46,7 +55,7 @@ function gl_inquiry_controls()
 
 function get_balance($account, $from, $to, $from_incl=true, $to_incl=true) 
 {
-       $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit, SUM(IF(amount < 0, -amount, 0)) as credit, SUM(amount) as balance 
+       $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) AS debit, SUM(IF(amount < 0, -amount, 0)) AS credit, SUM(amount) AS balance 
                FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master,".TB_PREF."chart_types, ".TB_PREF."chart_class 
                WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id 
                AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid AND";
@@ -97,7 +106,7 @@ function display_trial_balance()
        $k = 0;
 
        $accounts = get_gl_accounts();
-
+       $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
        $begin = begin_fiscalyear();
        if (date1_greater_date2($begin, $_POST['TransFromDate']))
                $begin = $_POST['TransFromDate'];
@@ -121,6 +130,7 @@ function display_trial_balance()
                        display_debit_or_credit_cells($prev['balance']);
                        display_debit_or_credit_cells($curr['balance']);
                        display_debit_or_credit_cells($tot['balance']);
+                       
                }
                else
                {
@@ -130,30 +140,39 @@ function display_trial_balance()
                        amount_cell($curr['credit']);
                        amount_cell($tot['debit']);
                        amount_cell($tot['credit']);
+                       $pdeb += $prev['debit'];
+                       $pcre += $prev['credit'];
+                       $cdeb += $curr['debit'];
+                       $ccre += $curr['credit'];
+                       $tdeb += $tot['debit'];
+                       $tcre += $tot['credit'];
                }       
+               $pbal += $prev['balance'];
+               $cbal += $curr['balance'];
+               $tbal += $tot['balance'];
                end_row();
        }
 
-       $prev = get_balance(null, $begin, $_POST['TransFromDate'], false, false);
-       $curr = get_balance(null, $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
-       $tot = get_balance(null, $begin, $_POST['TransToDate'], false, true);
+       //$prev = get_balance(null, $begin, $_POST['TransFromDate'], false, false);
+       //$curr = get_balance(null, $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
+       //$tot = get_balance(null, $begin, $_POST['TransToDate'], false, true);
        if (!check_value('Balance'))
        {
                start_row("class='inquirybg' style='font-weight:bold'");
                label_cell(_("Total") ." - ".$_POST['TransToDate'], "colspan=2");
-               amount_cell($prev['debit']);
-               amount_cell($prev['credit']);
-               amount_cell($curr['debit']);
-               amount_cell($curr['credit']);
-               amount_cell($tot['debit']);
-               amount_cell($tot['credit']);
+               amount_cell($pdeb);
+               amount_cell($pcre);
+               amount_cell($cdeb);
+               amount_cell($ccre);
+               amount_cell($tdeb);
+               amount_cell($tcre);
                end_row();
        }       
        start_row("class='inquirybg' style='font-weight:bold'");
        label_cell(_("Ending Balance") ." - ".$_POST['TransToDate'], "colspan=2");
-       display_debit_or_credit_cells($prev['balance']);
-       display_debit_or_credit_cells($curr['balance']);
-       display_debit_or_credit_cells($tot['balance']);
+       display_debit_or_credit_cells($pbal);
+       display_debit_or_credit_cells($cbal);
+       display_debit_or_credit_cells($tbal);
        end_row();
 
        end_table(1);