X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Frep706.php;h=91261cf8dab5a04b9a9cced5f3062ea71173e814;hb=1a5b277431e6804654cbca16aaed5ee3a5a729eb;hp=b7b67e896ab33f25dd3dbae71de5db6f47e8b269;hpb=4c8d5d3aeb037fc4c9fb5f1fdd2adef73f61b0b6;p=fa-stable.git

diff --git a/reporting/rep706.php b/reporting/rep706.php
index b7b67e89..91261cf8 100644
--- a/reporting/rep706.php
+++ b/reporting/rep706.php
@@ -118,11 +118,12 @@ function print_balance_sheet()
 	$typeclose = array(0,0,0,0,0,0,0,0,0,0);
 	$typename = array('','','','','','','','','','');
 	$closing = array(-1,-1,-1,-1,-1,-1,-1,-1,-1,-1);
-	$parent = array(-1,-1,-1,-1,-1,-1,-1,-1,-1,-1);
+	//$parent = array(-1,-1,-1,-1,-1,-1,-1,-1,-1,-1);
 	$level = 0;
 	$last = -1;
 	
 	$closeclass = false;
+	$convert = 1;
 	$rep->NewLine();
 
 	$accounts = get_gl_accounts_all(1);
@@ -147,7 +148,6 @@ function print_balance_sheet()
 				$closeclass = true;
 			}
 		}
-
 		if ($account['AccountTypeName'] != $typename[$level])
 		{
 			//$rep->NewLine();
@@ -163,9 +163,9 @@ function print_balance_sheet()
 						$rep->Line($rep->row);
 						$rep->NewLine();
 						$rep->TextCol(0, 2,	_('Total') . " " . $typename[$level]);
-						$rep->AmountCol(2, 3, $typeopen[$level], $dec);
-						$rep->AmountCol(3, 4, $typeperiod[$level], $dec);
-						$rep->AmountCol(4, 5, $typeclose[$level], $dec);
+						$rep->AmountCol(2, 3, $typeopen[$level] * $convert, $dec);
+						$rep->AmountCol(3, 4, $typeperiod[$level] * $convert, $dec);
+						$rep->AmountCol(4, 5, $typeclose[$level] * $convert, $dec);
 						if ($graphics)
 						{
 							$pg->x[] = $typename[$level];
@@ -185,9 +185,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;
@@ -215,6 +215,7 @@ function print_balance_sheet()
 			$rep->Line($rep->row);
 			$rep->NewLine();
 		}
+		$convert = get_account_class_convert($account['ClassID']);
 		$classname = $account['AccountClassName'];
 
 		if ($account['account_code'] != null)
@@ -231,9 +232,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();
 
@@ -263,9 +264,9 @@ function print_balance_sheet()
 					$rep->Line($rep->row);
 					$rep->NewLine();
 					$rep->TextCol(0, 2,	_('Total') . " " . $typename[$level]);
-					$rep->AmountCol(2, 3, $typeopen[$level], $dec);
-					$rep->AmountCol(3, 4, $typeperiod[$level], $dec);
-					$rep->AmountCol(4, 5, $typeclose[$level], $dec);
+					$rep->AmountCol(2, 3, $typeopen[$level] * $convert, $dec);
+					$rep->AmountCol(3, 4, $typeperiod[$level] * $convert, $dec);
+					$rep->AmountCol(4, 5, $typeclose[$level] * $convert, $dec);
 					if ($graphics)
 					{
 						$pg->x[] = $typename[$level];
@@ -287,9 +288,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');
@@ -298,9 +299,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();
 			}