X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep707.php;h=0fa067a3993b667f7050bb1a7ad24cbb7233480c;hb=41aca3e0d2835b49b26656cdf64d8817a288092a;hp=5dd3ff5c4f434bf9466c43ec4441110522e90d6f;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/reporting/rep707.php b/reporting/rep707.php
index 5dd3ff5c..0fa067a3 100644
--- a/reporting/rep707.php
+++ b/reporting/rep707.php
@@ -9,10 +9,10 @@
     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
+// Creator:	Joe Hunt, Chaitanya for the recursive version 2009-02-05.
 // date_:	2005-05-19
 // Title:	Profit and Loss Statement
 // ----------------------------------------------------------------
@@ -25,6 +25,105 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
+function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $convert, &$dec, &$pdec, &$rep, $dimension, $dimension2, &$pg, $graphics)
+{
+	$code_per_balance = 0;
+	$code_acc_balance = 0;
+	$per_balance_total = 0;
+	$acc_balance_total = 0;
+	unset($totals_arr);
+	$totals_arr = array();
+
+	$printtitle = 0; //Flag for printing type name	
+	
+	//Get Accounts directly under this group/type
+	$result = get_gl_accounts(null, null, $type);	
+	while ($account=db_fetch($result))
+	{
+		$per_balance = get_gl_trans_from_to($from, $to, $account["account_code"], $dimension, $dimension2);
+
+		if ($compare == 2)
+			$acc_balance = get_budget_trans_from_to($begin, $end, $account["account_code"], $dimension, $dimension2);
+		else
+			$acc_balance = get_gl_trans_from_to($begin, $end, $account["account_code"], $dimension, $dimension2);
+		if (!$per_balance && !$acc_balance)
+			continue;
+		
+		//Print Type Title if it has atleast one non-zero account	
+		if (!$printtitle)
+		{
+			$printtitle = 1;
+			$rep->row -= 4;
+			$rep->TextCol(0, 5, $typename);
+			$rep->row -= 4;
+			$rep->Line($rep->row);
+			$rep->NewLine();		
+		}			
+
+		$rep->TextCol(0, 1,	$account['account_code']);
+		$rep->TextCol(1, 2,	$account['account_name']);
+
+		$rep->AmountCol(2, 3, $per_balance * $convert, $dec);
+		$rep->AmountCol(3, 4, $acc_balance * $convert, $dec);
+		$rep->AmountCol(4, 5, Achieve($per_balance, $acc_balance), $pdec);
+
+		$rep->NewLine();
+
+		if ($rep->row < $rep->bottomMargin + 3 * $rep->lineHeight)
+		{
+			$rep->Line($rep->row - 2);
+			$rep->Header();
+		}
+
+		$code_per_balance += $per_balance;
+		$code_acc_balance += $acc_balance;
+	}
+		
+	//Get Account groups/types under this group/type
+	$result = get_account_types(false, false, $type);
+	while ($accounttype=db_fetch($result))
+	{
+		//Print Type Title if has sub types and not previously printed
+		if (!$printtitle)
+		{
+			$printtitle = 1;
+			$rep->row -= 4;
+			$rep->TextCol(0, 5, $typename);
+			$rep->row -= 4;
+			$rep->Line($rep->row);
+			$rep->NewLine();		
+		}
+
+		$totals_arr = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end, $compare, $convert, $dec, 
+			$pdec, $rep, $dimension, $dimension2, $pg, $graphics);
+		$per_balance_total += $totals_arr[0];
+		$acc_balance_total += $totals_arr[1];
+	}
+
+	//Display Type Summary if total is != 0 OR head is printed (Needed in case of unused hierarchical COA) 
+	if (($code_per_balance + $per_balance_total + $code_acc_balance + $acc_balance_total) != 0 || $printtitle)
+	{
+		$rep->row += 6;
+		$rep->Line($rep->row);
+		$rep->NewLine();
+		$rep->TextCol(0, 2,	_('Total') . " " . $typename);
+		$rep->AmountCol(2, 3, ($code_per_balance + $per_balance_total) * $convert, $dec);
+		$rep->AmountCol(3, 4, ($code_acc_balance + $acc_balance_total) * $convert, $dec);
+		$rep->AmountCol(4, 5, Achieve(($code_per_balance + $per_balance_total), ($code_acc_balance + $acc_balance_total)), $pdec);		
+		if ($graphics)
+		{
+			$pg->x[] = $typename;
+			$pg->y[] = abs($code_per_balance + $per_balance_total);
+			$pg->z[] = abs($code_acc_balance + $acc_balance_total);
+		}
+		$rep->NewLine();
+	}
+	
+	$totals_arr[0] = $code_per_balance + $per_balance_total;
+	$totals_arr[1] = $code_acc_balance + $acc_balance_total;
+	return $totals_arr;
+}
+
 print_profit_and_loss_statement();
 
 //----------------------------------------------------------------------------------------------------
@@ -140,168 +239,63 @@ function print_profit_and_loss_statement()
 	$rep->Info($params, $cols, $headers, $aligns);
 	$rep->Header();
 
-	$classname = '';
-	$group = '';
-	$totalper = 0.0;
-	$totalacc = 0.0;
 	$classper = 0.0;
 	$classacc = 0.0;
 	$salesper = 0.0;
-	$salesacc = 0.0;
-
-	$accounts = get_gl_accounts_all(0);
+	$salesacc = 0.0;	
 
-	while ($account=db_fetch($accounts))
+	$classresult = get_account_classes(false, 0);
+	while ($class = db_fetch($classresult))
 	{
-		$per_balance = get_gl_trans_from_to($from, $to, $account["account_code"], $dimension, $dimension2);
-
-		if ($compare == 2)
-			$acc_balance = get_budget_trans_from_to($begin, $end, $account["account_code"], $dimension, $dimension2);
-		else
-			$acc_balance = get_gl_trans_from_to($begin, $end, $account["account_code"], $dimension, $dimension2);
-		if (!$per_balance && !$acc_balance)
-			continue;
-
-		if ($account['AccountClassName'] != $classname)
-		{
-			if ($classname != '')
-			{
-				$closeclass = true;
-			}
-		}
-
-		if ($account['AccountTypeName'] != $group)
-		{
-			if ($group != '')
-			{
-				$rep->row += 6;
-				$rep->Line($rep->row);
-				$rep->NewLine();
-				$rep->TextCol(0, 2,	_('Total') . " " . $group);
-				$rep->AmountCol(2, 3, $totalper, $dec);
-				$rep->AmountCol(3, 4, $totalacc, $dec);
-				$rep->AmountCol(4, 5, Achieve($totalper, $totalacc), $pdec);
-				if ($graphics)
-				{
-					$pg->x[] = $group;
-					$pg->y[] = abs($totalper);
-					$pg->z[] = abs($totalacc);
-				}
-				$totalper = $totalacc = 0.0;
-				$rep->NewLine();
-				if ($closeclass)
-				{
-					$rep->row += 6;
-					$rep->Line($rep->row);
-					$rep->NewLine();
-					$rep->Font('bold');
-					$rep->TextCol(0, 2,	_('Total') . " " . $classname);
-					$rep->AmountCol(2, 3, $classper, $dec);
-					$rep->AmountCol(3, 4, $classacc, $dec);
-					$rep->AmountCol(4, 5, Achieve($classper, $classacc), $pdec);
-					$rep->Font();
-					$salesper += $classper;
-					$salesacc += $classacc;
-					$classper = $classacc = 0.0;
-					$rep->NewLine(2);
-					$closeclass = false;
-				}
-			}
-			if ($account['AccountClassName'] != $classname)
-			{
-				$rep->Font('bold');
-				$rep->TextCol(0, 5, $account['AccountClassName']);
-				$rep->Font();
-				$rep->NewLine();
-			}
-			$group = $account['AccountTypeName'];
-			$rep->row -= 4;
-			$rep->TextCol(0, 5, $account['AccountTypeName']);
-			$rep->row -= 4;
-			$rep->Line($rep->row);
-			$rep->NewLine();
-		}
-		$classname = $account['AccountClassName'];
-
-		$per_balance *= -1;
-		$acc_balance *= -1;
-		$totalper += $per_balance;
-		$totalacc += $acc_balance;
-		$classper += $per_balance;
-		$classacc += $acc_balance;
-		$rep->TextCol(0, 1,	$account['account_code']);
-		$rep->TextCol(1, 2,	$account['account_name']);
-
-		$rep->AmountCol(2, 3, $per_balance, $dec);
-		$rep->AmountCol(3, 4, $acc_balance, $dec);
-		$rep->AmountCol(4, 5, Achieve($per_balance, $acc_balance), $pdec);
-
+		$class_per_total = 0;
+		$class_acc_total = 0;
+		$convert = get_class_type_convert($class["ctype"]); 		
+		
+		//Print Class Name	
+		$rep->Font('bold');
+		$rep->TextCol(0, 5, $class["class_name"]);
+		$rep->Font();
 		$rep->NewLine();
-
-		if ($rep->row < $rep->bottomMargin + 3 * $rep->lineHeight)
-		{
-			$rep->Line($rep->row - 2);
-			$rep->Header();
-		}
-	}
-	if ($account['AccountClassName'] != $classname)
-	{
-		if ($classname != '')
+		
+		//Get Account groups/types under this group/type with no parents
+		$typeresult = get_account_types(false, $class['cid'], -1);
+		while ($accounttype=db_fetch($typeresult))
 		{
-			$closeclass = true;
+			$classtotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end, $compare, $convert, $dec, 
+				$pdec, $rep, $dimension, $dimension2, $pg, $graphics);
+			$class_per_total += $classtotal[0];
+			$class_acc_total += $classtotal[1];			
 		}
+		
+		//Print Class Summary	
+		$rep->row += 6;
+		$rep->Line($rep->row);
+		$rep->NewLine();
+		$rep->Font('bold');
+		$rep->TextCol(0, 2,	_('Total') . " " . $class["class_name"]);
+		$rep->AmountCol(2, 3, $class_per_total * $convert, $dec);
+		$rep->AmountCol(3, 4, $class_acc_total * $convert, $dec);
+		$rep->AmountCol(4, 5, Achieve($class_per_total, $class_acc_total), $pdec);
+		$rep->Font();
+		$rep->NewLine(2);	
+
+		$salesper += $class_per_total;
+		$salesacc += $class_acc_total;
 	}
-	if ($account['AccountTypeName'] != $group)
+	
+	$rep->Font('bold');	
+	$rep->TextCol(0, 2,	_('Calculated Return'));
+	$rep->AmountCol(2, 3, $salesper *-1, $dec); // always convert
+	$rep->AmountCol(3, 4, $salesacc * -1, $dec);
+	$rep->AmountCol(4, 5, Achieve($salesper, $salesacc), $pdec);
+	if ($graphics)
 	{
-		if ($group != '')
-		{
-			$rep->row += 6;
-			$rep->Line($rep->row);
-			$rep->NewLine();
-			$rep->TextCol(0, 2,	_('Total') . " " . $group);
-			$rep->AmountCol(2, 3, $totalper, $dec);
-			$rep->AmountCol(3, 4, $totalacc, $dec);
-			$rep->AmountCol(4, 5, Achieve($totalper, $totalacc), $pdec);
-			if ($graphics)
-			{
-				$pg->x[] = $group;
-				$pg->y[] = abs($totalper);
-				$pg->z[] = abs($totalacc);
-			}
-			$rep->NewLine();
-			if ($closeclass)
-			{
-				$rep->Line($rep->row + 6);
-				$calculateper = $salesper + $classper;
-				$calculateacc = $salesacc + $classacc;
-				$rep->row += 6;
-				$rep->Line($rep->row);
-				$rep->NewLine();
-
-				$rep->Font('bold');
-				$rep->TextCol(0, 2,	_('Total') . " " . $classname);
-				$rep->AmountCol(2, 3, $classper, $dec);
-				$rep->AmountCol(3, 4, $classacc, $dec);
-				$rep->AmountCol(4, 5, Achieve($classper, $classacc), $pdec);
-
-				$rep->NewLine(2);
-				$rep->TextCol(0, 2,	_('Calculated Return'));
-				$rep->AmountCol(2, 3, $calculateper, $dec);
-				$rep->AmountCol(3, 4, $calculateacc, $dec);
-				$rep->AmountCol(4, 5, Achieve($calculateper, $calculateacc), $pdec);
-				if ($graphics)
-				{
-					$pg->x[] = _('Calculated Return');
-					$pg->y[] = abs($calculateper);
-					$pg->z[] = abs($calculateacc);
-				}
-
-				$rep->Font();
-
-				$rep->NewLine();
-			}
-		}
+		$pg->x[] = _('Calculated Return');
+		$pg->y[] = abs($salesper);
+		$pg->z[] = abs($salesacc);
 	}
+	$rep->Font();
+	$rep->NewLine();
 	$rep->Line($rep->row);
 	if ($graphics)
 	{
@@ -326,6 +320,7 @@ function print_profit_and_loss_statement()
 			$rep->Header();
 		$rep->AddImage($filename, $x, $rep->row - $h, $w, $h);
 	}
+		
 	$rep->End();
 }