X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep705.php;h=c09d0a47d07af7b2609827922c9db948cae9ce1f;hb=b0c4c9777f9574e9c2805fddc2a12576d75d94ce;hp=001f91fe2d10a372ef60552263702bcd695e0edc;hpb=ee7f610a0669b4dd4a85d19c1969573a82ee1826;p=fa-stable.git diff --git a/reporting/rep705.php b/reporting/rep705.php index 001f91fe..c09d0a47 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]; @@ -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(); @@ -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