X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep705.php;h=c9b3fd1ac201d9e77aa58c52bef63098354e4038;hb=33dfc21a26f08e9ac19048bbcf80cce2351a6cfe;hp=001f91fe2d10a372ef60552263702bcd695e0edc;hpb=ee7f610a0669b4dd4a85d19c1969573a82ee1826;p=fa-stable.git

diff --git a/reporting/rep705.php b/reporting/rep705.php
index 001f91fe..c9b3fd1a 100644
--- a/reporting/rep705.php
+++ b/reporting/rep705.php
@@ -136,7 +136,7 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
 			$rep->NewLine();
 		}
 
-		$totals_arr = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep, $dimension, $dimension2);
+		$totals_arr = display_type($accounttype["id"], $accounttype["name"], $yr, $mo, $convert, $dec, $rep, $dimension, $dimension2, $tags);
 		for ($i = 1; $i <= 12; $i++)
 		{
 			$total[$i] += $totals_arr[$i];
@@ -163,7 +163,7 @@ function display_type ($type, $typename, $yr, $mo, $convert, &$dec, &$rep, $dime
 
 function print_annual_expense_breakdown()
 {
-	global $path_to_root, $date_system;
+	global $path_to_root, $SysPrefs;
 
 	$dim = get_company_pref('use_dimension');
 	$dimension = $dimension2 = 0;
@@ -175,7 +175,8 @@ function print_annual_expense_breakdown()
 		$dimension2 = $_POST['PARAM_2'];
 		$tags = (isset($_POST['PARAM_3']) ? $_POST['PARAM_3'] : -1);
 		$comments = $_POST['PARAM_4'];
-		$destination = $_POST['PARAM_5'];
+		$orientation = $_POST['PARAM_5'];
+		$destination = $_POST['PARAM_6'];
 	}
 	else if ($dim == 1)
 	{
@@ -183,20 +184,23 @@ function print_annual_expense_breakdown()
 		$dimension = $_POST['PARAM_1'];
 		$tags = (isset($_POST['PARAM_2']) ? $_POST['PARAM_2'] : -1);
 		$comments = $_POST['PARAM_3'];
-		$destination = $_POST['PARAM_4'];
+		$orientation = $_POST['PARAM_4'];
+		$destination = $_POST['PARAM_5'];
 	}
 	else
 	{
 		$year = $_POST['PARAM_0'];
 		$tags = (isset($_POST['PARAM_1']) ? $_POST['PARAM_1'] : -1);
 		$comments = $_POST['PARAM_2'];
-		$destination = $_POST['PARAM_3'];
+		$orientation = $_POST['PARAM_3'];
+		$destination = $_POST['PARAM_4'];
 	}
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = 1;
 	//$pdec = user_percent_dec();
 
@@ -214,9 +218,9 @@ function print_annual_expense_breakdown()
 	$yr = $row['yr'];
 	$mo = $row['mo'];
 	$da = 1;
-	if ($date_system == 1)
+	if ($SysPrefs->date_system == 1)
 		list($yr, $mo, $da) = jalali_to_gregorian($yr, $mo, $da);
-	elseif ($date_system == 2)
+	elseif ($SysPrefs->date_system == 2)
 		list($yr, $mo, $da) = islamic_to_gregorian($yr, $mo, $da);
 	$per12 = strftime('%b',mktime(0,0,0,$mo,$da,$yr));
 	$per11 = strftime('%b',mktime(0,0,0,$mo-1,$da,$yr));
@@ -271,7 +275,9 @@ function print_annual_expense_breakdown()
                     		'to' => ''));
     }
 
-	$rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize());
+	$rep = new FrontReport(_('Annual Expense Breakdown'), "AnnualBreakDown", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns);
@@ -326,4 +332,3 @@ function print_annual_expense_breakdown()
 	$rep->End();
 }
 
-?>
\ No newline at end of file