X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep706.php;h=cdf11df1c3aadcd6f43cb33c6fc4312c30773d4b;hb=30c04f9f87e74bd4201f56ce25f02d4c5d01f99b;hp=e2ceaf35fa87cec53ae63a538c666e4916d0eced;hpb=b506d68d066badbfee8496f31bc0219f697c6f1a;p=fa-stable.git

diff --git a/reporting/rep706.php b/reporting/rep706.php
index e2ceaf35..cdf11df1 100644
--- a/reporting/rep706.php
+++ b/reporting/rep706.php
@@ -25,7 +25,6 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_balance_sheet();
 
 
@@ -61,16 +60,10 @@ function print_balance_sheet()
 		$comments = $_POST['PARAM_3'];
 		$destination = $_POST['PARAM_4'];
 	}
-	if (isset($destination) && $destination)
-	{
+	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
-		$filename = "BalanceSheet.xml";
-	}	
 	else
-	{
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-		$filename = "BalanceSheet.pdf";
-	}
 	if ($graphics)
 	{
 		include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -107,9 +100,8 @@ function print_balance_sheet()
     	$params =   array( 	0 => $comments,
     				    1 => array('text' => _('Period'),'from' => $from, 'to' => $to));
     }
-	//display_error("Error!");
 
-	$rep = new FrontReport(_('Balance Sheet'), $filename, user_pagesize());
+	$rep = new FrontReport(_('Balance Sheet'), "BalanceSheet", user_pagesize());
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns);
 	$rep->Header();
@@ -125,6 +117,7 @@ function print_balance_sheet()
 	$assetsperiod = 0.0;
 	$assetsclose = 0.0;
 	$closeclass = false;
+	$convert = 1;
 	$rep->NewLine();
 
 	$accounts = get_gl_accounts_all(1);
@@ -137,7 +130,6 @@ function print_balance_sheet()
 
 		if (!$prev_balance && !$curr_balance)
 			continue;
-
 		if ($account['AccountClassName'] != $classname)
 		{
 			if ($classname != '')
@@ -154,9 +146,9 @@ function print_balance_sheet()
 				$rep->Line($rep->row);
 				$rep->NewLine();
 				$rep->TextCol(0, 2,	_('Total') . " " . $group);
-				$rep->AmountCol(2, 3, $totalopen, $dec);
-				$rep->AmountCol(3, 4, $totalperiod, $dec);
-				$rep->AmountCol(4, 5, $totalclose, $dec);
+				$rep->AmountCol(2, 3, $totalopen * $convert, $dec);
+				$rep->AmountCol(3, 4, $totalperiod * $convert, $dec);
+				$rep->AmountCol(4, 5, $totalclose * $convert, $dec);
 				if ($graphics)
 				{
 					$pg->x[] = $group;
@@ -171,9 +163,9 @@ function print_balance_sheet()
 					$rep->NewLine();
 					$rep->Font('bold');
 		 			$rep->TextCol(0, 2,	_('Total') . " " . $classname);
-					$rep->AmountCol(2, 3, $classopen, $dec);
-					$rep->AmountCol(3, 4, $classperiod, $dec);
-					$rep->AmountCol(4, 5, $classclose, $dec);
+					$rep->AmountCol(2, 3, $classopen * $convert, $dec);
+					$rep->AmountCol(3, 4, $classperiod * $convert, $dec);
+					$rep->AmountCol(4, 5, $classclose * $convert, $dec);
 					$rep->Font();
 					$assetsopen += $classopen;
 					$assetsperiod += $classperiod;
@@ -191,6 +183,10 @@ function print_balance_sheet()
 				$rep->NewLine();
 			}
 			$group = $account['AccountTypeName'];
+			if (get_sign_convert($account['account_type']))
+				$convert = -1;
+			else
+				$convert = 1;
 			$rep->row -= 4;
 			$rep->TextCol(0, 5, $account['AccountTypeName']);
 			$rep->row -= 4;
@@ -198,7 +194,6 @@ function print_balance_sheet()
 			$rep->NewLine();
 		}
 		$classname = $account['AccountClassName'];
-
 		$totalopen += $prev_balance;
 		$totalperiod += $curr_balance;
 		$totalclose = $totalopen + $totalperiod;
@@ -208,9 +203,9 @@ function print_balance_sheet()
 		$rep->TextCol(0, 1,	$account['account_code']);
 		$rep->TextCol(1, 2,	$account['account_name']);
 
-		$rep->AmountCol(2, 3, $prev_balance, $dec);
-		$rep->AmountCol(3, 4, $curr_balance, $dec);
-		$rep->AmountCol(4, 5, $curr_balance + $prev_balance, $dec);
+		$rep->AmountCol(2, 3, $prev_balance * $convert, $dec);
+		$rep->AmountCol(3, 4, $curr_balance * $convert, $dec);
+		$rep->AmountCol(4, 5, ($curr_balance + $prev_balance) * $convert, $dec);
 
 		$rep->NewLine();
 
@@ -235,9 +230,9 @@ function print_balance_sheet()
 			$rep->Line($rep->row);
 			$rep->NewLine();
 			$rep->TextCol(0, 2,	_('Total') . " " . $group);
-			$rep->AmountCol(2, 3, $totalopen, $dec);
-			$rep->AmountCol(3, 4, $totalperiod, $dec);
-			$rep->AmountCol(4, 5, $totalclose, $dec);
+			$rep->AmountCol(2, 3, $totalopen * $convert, $dec);
+			$rep->AmountCol(3, 4, $totalperiod * $convert, $dec);
+			$rep->AmountCol(4, 5, $totalclose * $convert, $dec);
 			if ($graphics)
 			{
 				$pg->x[] = $group;
@@ -253,9 +248,9 @@ function print_balance_sheet()
 				$rep->Line($rep->row);
 				$rep->NewLine();
 				$rep->TextCol(0, 2,	_('Calculated Return'));
-				$rep->AmountCol(2, 3, $calculateopen, $dec);
-				$rep->AmountCol(3, 4, $calculateperiod, $dec);
-				$rep->AmountCol(4, 5, $calculateclose, $dec);
+				$rep->AmountCol(2, 3, $calculateopen * $convert, $dec);
+				$rep->AmountCol(3, 4, $calculateperiod * $convert, $dec);
+				$rep->AmountCol(4, 5, $calculateclose * $convert, $dec);
 				if ($graphics)
 				{
 					$pg->x[] = _('Calculated Return');
@@ -264,9 +259,9 @@ function print_balance_sheet()
 				$rep->NewLine(2);
 				$rep->Font('bold');
 				$rep->TextCol(0, 2,	_('Total') . " " . $classname);
-				$rep->AmountCol(2, 3, -$assetsopen, $dec);
-				$rep->AmountCol(3, 4, -$assetsperiod, $dec);
-				$rep->AmountCol(4, 5, -$assetsclose, $dec);
+				$rep->AmountCol(2, 3, -$assetsopen * $convert, $dec);
+				$rep->AmountCol(3, 4, -$assetsperiod * $convert, $dec);
+				$rep->AmountCol(4, 5, -$assetsclose * $convert, $dec);
 				$rep->Font();
 				$rep->NewLine();
 			}