X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep707.php;h=5dd3ff5c4f434bf9466c43ec4441110522e90d6f;hb=499e0e615d1a845c6c519754b3a213fdda0513ba;hp=7101a73ab829fd20744bbfe434cabac6d56c840a;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/reporting/rep707.php b/reporting/rep707.php
index 7101a73a..5dd3ff5c 100644
--- a/reporting/rep707.php
+++ b/reporting/rep707.php
@@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_profit_and_loss_statement();
 
 //----------------------------------------------------------------------------------------------------
@@ -48,7 +47,6 @@ function print_profit_and_loss_statement()
 {
 	global $comp_path, $path_to_root;
 
-	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 	$dim = get_company_pref('use_dimension');
 	$dimension = $dimension2 = 0;
 
@@ -61,18 +59,25 @@ function print_profit_and_loss_statement()
 		$dimension2 = $_POST['PARAM_4'];
 		$graphics = $_POST['PARAM_5'];
 		$comments = $_POST['PARAM_6'];
+		$destination = $_POST['PARAM_7'];
 	}
 	else if ($dim == 1)
 	{
 		$dimension = $_POST['PARAM_3'];
 		$graphics = $_POST['PARAM_4'];
 		$comments = $_POST['PARAM_5'];
+		$destination = $_POST['PARAM_6'];
 	}
 	else
 	{
 		$graphics = $_POST['PARAM_3'];
 		$comments = $_POST['PARAM_4'];
+		$destination = $_POST['PARAM_5'];
 	}
+	if ($destination)
+		include_once($path_to_root . "/reporting/includes/excel_report.inc");
+	else
+		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 	if ($graphics)
 	{
 		include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -129,7 +134,7 @@ function print_profit_and_loss_statement()
 		$headers[3] = _('Period Y-1');
 	}
 
-	$rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss.pdf", user_pagesize());
+	$rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss", user_pagesize());
 
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns);
@@ -169,12 +174,13 @@ function print_profit_and_loss_statement()
 		{
 			if ($group != '')
 			{
-				$rep->Line($rep->row + 6);
-				$rep->row -= 6;
+				$rep->row += 6;
+				$rep->Line($rep->row);
+				$rep->NewLine();
 				$rep->TextCol(0, 2,	_('Total') . " " . $group);
-				$rep->TextCol(2, 3,	number_format2($totalper, $dec));
-				$rep->TextCol(3, 4,	number_format2($totalacc, $dec));
-				$rep->TextCol(4, 5,	number_format2(Achieve($totalper, $totalacc), $pdec));
+				$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;
@@ -182,21 +188,22 @@ function print_profit_and_loss_statement()
 					$pg->z[] = abs($totalacc);
 				}
 				$totalper = $totalacc = 0.0;
-				$rep->row -= ($rep->lineHeight + 4);
+				$rep->NewLine();
 				if ($closeclass)
 				{
-					$rep->Line($rep->row + 6);
-					$rep->row -= 6;
+					$rep->row += 6;
+					$rep->Line($rep->row);
+					$rep->NewLine();
 					$rep->Font('bold');
 					$rep->TextCol(0, 2,	_('Total') . " " . $classname);
-					$rep->TextCol(2, 3,	number_format2($classper, $dec));
-					$rep->TextCol(3, 4,	number_format2($classacc, $dec));
-					$rep->TextCol(4, 5,	number_format2(Achieve($classper, $classacc), $pdec));
+					$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(3);
+					$rep->NewLine(2);
 					$closeclass = false;
 				}
 			}
@@ -205,12 +212,14 @@ function print_profit_and_loss_statement()
 				$rep->Font('bold');
 				$rep->TextCol(0, 5, $account['AccountClassName']);
 				$rep->Font();
-				$rep->row -= ($rep->lineHeight + 4);
+				$rep->NewLine();
 			}
 			$group = $account['AccountTypeName'];
+			$rep->row -= 4;
 			$rep->TextCol(0, 5, $account['AccountTypeName']);
-			$rep->Line($rep->row - 4);
-			$rep->row -= ($rep->lineHeight + 4);
+			$rep->row -= 4;
+			$rep->Line($rep->row);
+			$rep->NewLine();
 		}
 		$classname = $account['AccountClassName'];
 
@@ -223,9 +232,9 @@ function print_profit_and_loss_statement()
 		$rep->TextCol(0, 1,	$account['account_code']);
 		$rep->TextCol(1, 2,	$account['account_name']);
 
-		$rep->TextCol(2, 3,	number_format2($per_balance, $dec));
-		$rep->TextCol(3, 4,	number_format2($acc_balance, $dec));
-		$rep->TextCol(4, 5,	number_format2(Achieve($per_balance, $acc_balance), $pdec));
+		$rep->AmountCol(2, 3, $per_balance, $dec);
+		$rep->AmountCol(3, 4, $acc_balance, $dec);
+		$rep->AmountCol(4, 5, Achieve($per_balance, $acc_balance), $pdec);
 
 		$rep->NewLine();
 
@@ -246,37 +255,40 @@ function print_profit_and_loss_statement()
 	{
 		if ($group != '')
 		{
-			$rep->Line($rep->row + 6);
-			$rep->row -= 6;
+			$rep->row += 6;
+			$rep->Line($rep->row);
+			$rep->NewLine();
 			$rep->TextCol(0, 2,	_('Total') . " " . $group);
-			$rep->TextCol(2, 3,	number_format2($totalper, $dec));
-			$rep->TextCol(3, 4,	number_format2($totalacc, $dec));
-			$rep->TextCol(4, 5,	number_format2(Achieve($totalper, $totalacc), $pdec));
+			$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->row -= ($rep->lineHeight + 4);
+			$rep->NewLine();
 			if ($closeclass)
 			{
 				$rep->Line($rep->row + 6);
 				$calculateper = $salesper + $classper;
 				$calculateacc = $salesacc + $classacc;
-				$rep->row -= 6;
+				$rep->row += 6;
+				$rep->Line($rep->row);
+				$rep->NewLine();
 
 				$rep->Font('bold');
 				$rep->TextCol(0, 2,	_('Total') . " " . $classname);
-				$rep->TextCol(2, 3,	number_format2($classper, $dec));
-				$rep->TextCol(3, 4,	number_format2($classacc, $dec));
-				$rep->TextCol(4, 5,	number_format2(Achieve($classper, $classacc), $pdec));
+				$rep->AmountCol(2, 3, $classper, $dec);
+				$rep->AmountCol(3, 4, $classacc, $dec);
+				$rep->AmountCol(4, 5, Achieve($classper, $classacc), $pdec);
 
-				$rep->row -= ($rep->lineHeight + 8);
+				$rep->NewLine(2);
 				$rep->TextCol(0, 2,	_('Calculated Return'));
-				$rep->TextCol(2, 3,	number_format2($calculateper, $dec));
-				$rep->TextCol(3, 4,	number_format2($calculateacc, $dec));
-				$rep->TextCol(4, 5,	number_format2(Achieve($calculateper, $calculateacc), $pdec));
+				$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');