X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep707.php;h=64dea035bcb8ea83522bbd47fb88e158a5d916c6;hb=a53ada1fa7eac32d429456e08f5ac7fb753ebc0d;hp=85ef695ffe260cbe9b5f75da0c3fac8975e51d3d;hpb=ee7f610a0669b4dd4a85d19c1969573a82ee1826;p=fa-stable.git diff --git a/reporting/rep707.php b/reporting/rep707.php index 85ef695f..64dea035 100644 --- a/reporting/rep707.php +++ b/reporting/rep707.php @@ -101,7 +101,7 @@ function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $co } $totals_arr = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end, $compare, $convert, $dec, - $pdec, $rep, $dimension, $dimension2, $pg, $graphics); + $pdec, $rep, $dimension, $dimension2, $tags, $pg, $graphics); $per_balance_total += $totals_arr[0]; $acc_balance_total += $totals_arr[1]; } @@ -166,7 +166,8 @@ function print_profit_and_loss_statement() $decimals = $_POST['PARAM_6']; $graphics = $_POST['PARAM_7']; $comments = $_POST['PARAM_8']; - $destination = $_POST['PARAM_9']; + $orientation = $_POST['PARAM_9']; + $destination = $_POST['PARAM_10']; } else if ($dim == 1) { @@ -175,7 +176,8 @@ function print_profit_and_loss_statement() $decimals = $_POST['PARAM_5']; $graphics = $_POST['PARAM_6']; $comments = $_POST['PARAM_7']; - $destination = $_POST['PARAM_8']; + $orientation = $_POST['PARAM_8']; + $destination = $_POST['PARAM_9']; } else { @@ -183,12 +185,14 @@ function print_profit_and_loss_statement() $decimals = $_POST['PARAM_4']; $graphics = $_POST['PARAM_5']; $comments = $_POST['PARAM_6']; - $destination = $_POST['PARAM_7']; + $orientation = $_POST['PARAM_7']; + $destination = $_POST['PARAM_8']; } 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'); if ($graphics) { include_once($path_to_root . "/reporting/includes/class.graphic.inc"); @@ -251,7 +255,9 @@ function print_profit_and_loss_statement() $headers[3] = _('Period Y-1'); } - $rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss", user_pagesize()); + $rep = new FrontReport(_('Profit and Loss Statement'), "ProfitAndLoss", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -324,9 +330,8 @@ function print_profit_and_loss_statement() $pg->type = $graphics; $pg->skin = $graph_skin; $pg->built_in = false; - $pg->fontfile = $path_to_root . "/reporting/fonts/Vera.ttf"; $pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != "."); - $filename = company_path(). "/pdf_files/test.png"; + $filename = company_path(). "/pdf_files/". uniqid("").".png"; $pg->display($filename, true); $w = $pg->width / 1.5; $h = $pg->height / 1.5;