Report fixed according to changed headers API in FrontReport class.

[fa-stable.git] / reporting / rep708.php

diff --git a/reporting/rep708.php b/reporting/rep708.php
index 322a1247b39f0aa21166702b5c862e6216803b0a..ee490c12c8703c050b18e6bd19d1097c40214153 100644 (file)
--- a/reporting/rep708.php
+++ b/reporting/rep708.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 = 2;
+$page_security = 'SA_GLANALYTIC';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
@@ -25,39 +25,8 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_trial_balance();
 
-//----------------------------------------------------------------------------------------------------
-function get_balance($account, $dimension, $dimension2, $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 
-               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";
-               
-       if ($account != null)
-               $sql .= " account='$account' AND";
-       if ($dimension > 0)
-               $sql .= " dimension_id=$dimension AND";
-       if ($dimension2 > 0)
-               $sql .= " dimension2_id=$dimension2 AND";
-       $from_date = date2sql($from);
-       if ($from_incl)
-               $sql .= " tran_date >= '$from_date'  AND";
-       else
-               $sql .= " tran_date > IF(".TB_PREF."chart_class.balance_sheet=1, '0000-00-00', '$from_date') AND";
-       $to_date = date2sql($to);
-       if ($to_incl)
-               $sql .= " tran_date <= '$to_date' ";
-       else
-               $sql .= " tran_date < '$to_date' ";
-
-       $result = db_query($sql,"No general ledger accounts were returned");
-
-       return db_fetch($result);
-}
-
 //----------------------------------------------------------------------------------------------------
 
 function print_trial_balance()
@@ -90,15 +59,9 @@ function print_trial_balance()
                $destination = $_POST['PARAM_5'];
        }
        if ($destination)
-       {
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
-               $filename = "TrialBalance.xml";
-       }       
        else
-       {
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-               $filename = "TrialBalance.pdf";
-       }
        $dec = user_price_dec();
 
        //$cols2 = array(0, 50, 230, 330, 430, 530);
@@ -140,11 +103,11 @@ function print_trial_balance()
                                    1 => array('text' => _('Period'),'from' => $from, 'to' => $to));
     }
 
-       $rep = new FrontReport(_('Trial Balance'), $filename, user_pagesize());
+       $rep = new FrontReport(_('Trial Balance'), "TrialBalance", user_pagesize());
 
        $rep->Font();
        $rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
-       $rep->Header();
+       $rep->NewPage();
 
        $accounts = get_gl_accounts();
 
@@ -202,7 +165,7 @@ function print_trial_balance()
                if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
                {
                        $rep->Line($rep->row - 2);
-                       $rep->Header();
+                       $rep->NewPage();
                }
        }
        $rep->Line($rep->row);