X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep707.php;h=0516c17ec53e8e6250a7f438052bad2cb0950414;hb=d1b959c4b73664327c2e17d5bb3fb515aabfa449;hp=df551fc36fd1770359b7505b830e71b8c2b936df;hpb=1a5b277431e6804654cbca16aaed5ee3a5a729eb;p=fa-stable.git

diff --git a/reporting/rep707.php b/reporting/rep707.php
index df551fc3..0516c17e 100644
--- a/reporting/rep707.php
+++ b/reporting/rep707.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
@@ -156,6 +156,7 @@ function print_profit_and_loss_statement()
 
 	$closeclass = false;
 	$convert = 1;
+	$ctype = 0;
 
 	$accounts = get_gl_accounts_all(0);
 
@@ -190,7 +191,7 @@ function print_profit_and_loss_statement()
 			{
 				for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 				{
-					if ($account['parent'] == $closing[$level] || $account['parent'] < $last)
+					if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 					{
 						$rep->row += 6;
 						$rep->Line($rep->row);
@@ -242,15 +243,17 @@ function print_profit_and_loss_statement()
 				$last = $account['parent'];
 			$typename[$level] = $account['AccountTypeName'];
 			$closing[$level] = $account['parent'];
+
 			$rep->row -= 4;
 			$rep->TextCol(0, 5, $account['AccountTypeName']);
 			$rep->row -= 4;
 			$rep->Line($rep->row);
 			$rep->NewLine();
 		}
-		$convert = get_account_class_convert($account['ClassID']);
 		$classname = $account['AccountClassName'];
-
+		$ctype = $account['ClassType'];
+		$convert = get_class_type_convert($ctype); 
+		
 		if ($account['account_code'] != null)
 		{
 			//$per_balance *= -1;
@@ -292,7 +295,7 @@ function print_profit_and_loss_statement()
 		{
 			for ( ; $level >= 0, $typename[$level] != ''; $level--) 
 			{
-				if ($account['parent'] == $closing[$level] || $account['parent'] < $last)
+				if ($account['parent'] == $closing[$level] || $account['parent'] < $last || $account['parent'] <= 0 || $closeclass)
 				{
 					$rep->row += 6;
 					$rep->Line($rep->row);