X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep708.php;h=2095602919aaf7e4ed3b9df4bdf75ba591dde530;hb=55bddc51260dc87dba6e3217e2117cc760346306;hp=6f3086b534c49c517e724a229cbc06bae9b694ae;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/reporting/rep708.php b/reporting/rep708.php
index 6f3086b5..20956029 100644
--- 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
@@ -19,6 +19,7 @@ $page_security = 2;
 $path_to_root="..";
 
 include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
@@ -27,36 +28,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 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()
@@ -137,7 +108,7 @@ function print_trial_balance()
 
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
-	$rep->Header();
+	$rep->NewPage();
 
 	$accounts = get_gl_accounts();
 
@@ -195,7 +166,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);
@@ -232,9 +203,14 @@ function print_trial_balance()
 	else
 		$rep->AmountCol(7, 8, abs($tbal), $dec);
 	$rep->NewLine();
-	
+		
 	$rep->Line($rep->row);
-	
+	if (($pbal = round2($pbal, $dec)) != 0.0)
+	{
+		$rep->NewLine(2);
+		$rep->Font();
+		$rep->TextCol(0, 8, _("The Opening Balance is not in balance, probably due to a non closed Previous Fiscalyear."));
+	}	
 	$rep->End();
 }