X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep706.php;h=4a66e01dce6c384705fbf0fe41862f8b2446d4dc;hb=a0aa0951b112eb22726567ad545bcbc1ab28fb99;hp=8a0e4d459c60bdac2f50db7607a3490781c8842a;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/reporting/rep706.php b/reporting/rep706.php index 8a0e4d45..4a66e01d 100644 --- a/reporting/rep706.php +++ b/reporting/rep706.php @@ -26,7 +26,7 @@ include_once($path_to_root . "/admin/db/tags_db.inc"); //---------------------------------------------------------------------------------------------------- -function display_type ($type, $typename, $from, $to, $convert, &$dec, &$rep, $dimension, $dimension2, $tags, &$pg, $graphics) +function display_type ($type, $typename, $from, $to, $convert, &$dec, &$rep, $dimension, $dimension2, $tags, &$pg, $graphics, &$labels, &$serie1, &$serie2) { $code_open_balance = 0; $code_period_balance = 0; @@ -92,7 +92,7 @@ function display_type ($type, $typename, $from, $to, $convert, &$dec, &$rep, $di } $totals_arr = display_type($accounttype["id"], $accounttype["name"], $from, $to, $convert, $dec, - $rep, $dimension, $dimension2, $tags, $pg, $graphics); + $rep, $dimension, $dimension2, $tags, $pg, $graphics, $labels, $serie1, $serie2); $open_balance_total += $totals_arr[0]; $period_balance_total += $totals_arr[1]; } @@ -109,9 +109,9 @@ function display_type ($type, $typename, $from, $to, $convert, &$dec, &$rep, $di $rep->AmountCol(4, 5, ($code_open_balance + $open_balance_total + $code_period_balance + $period_balance_total) * $convert, $dec); if ($graphics) { - $pg->x[] = $typename; - $pg->y[] = abs($code_open_balance + $open_balance_total); - $pg->z[] = abs($code_period_balance + $period_balance_total); + $labels[] = $typename; + $serie1[] = abs(($code_period_balance + $period_balance_total) * $convert); + $serie2[] = abs(($code_open_balance + $open_balance_total + $code_period_balance + $period_balance_total) * $convert); } $rep->NewLine(); } @@ -127,7 +127,7 @@ print_balance_sheet(); function print_balance_sheet() { - global $path_to_root; + global $path_to_root, $SysPrefs; $dim = get_company_pref('use_dimension'); $dimension = $dimension2 = 0; @@ -142,16 +142,18 @@ function print_balance_sheet() $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 if ($dim == 1) + elseif ($dim == 1) { $dimension = $_POST['PARAM_2']; $tags = (isset($_POST['PARAM_3']) ? $_POST['PARAM_3'] : -1); $decimals = $_POST['PARAM_4']; $graphics = $_POST['PARAM_5']; $comments = $_POST['PARAM_6']; - $destination = $_POST['PARAM_7']; + $orientation = $_POST['PARAM_7']; + $destination = $_POST['PARAM_8']; } else { @@ -159,23 +161,28 @@ function print_balance_sheet() $decimals = $_POST['PARAM_3']; $graphics = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; - $destination = $_POST['PARAM_6']; + $orientation = $_POST['PARAM_6']; + $destination = $_POST['PARAM_7']; } 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'); + $labels = array(); + $serie1 = array(); + $serie2 = array(); if ($graphics) { include_once($path_to_root . "/reporting/includes/class.graphic.inc"); - $pg = new graph(); + $pg = new Chart($graphics); } if (!$decimals) $dec = 0; else $dec = user_price_dec(); - $cols = array(0, 50, 200, 350, 425, 500); + $cols = array(0, 60, 200, 350, 425, 500); //------------0--1---2----3----4----5-- $headers = array(_('Account'), _('Account Name'), _('Open Balance'), _('Period'), @@ -193,7 +200,7 @@ function print_balance_sheet() 'from' => get_dimension_string($dimension2), 'to' => ''), 4 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => '')); } - else if ($dim == 1) + elseif ($dim == 1) { $params = array( 0 => $comments, 1 => array('text' => _('Period'),'from' => $from, 'to' => $to), @@ -208,7 +215,9 @@ function print_balance_sheet() 2 => array('text' => _('Tags'), 'from' => get_tag_names($tags), 'to' => '')); } - $rep = new FrontReport(_('Balance Sheet'), "BalanceSheet", user_pagesize()); + $rep = new FrontReport(_('Balance Sheet'), "BalanceSheet", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); $rep->NewPage(); @@ -235,8 +244,7 @@ function print_balance_sheet() $typeresult = get_account_types(false, $class['cid'], -1); while ($accounttype=db_fetch($typeresult)) { - $classtotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, $convert, $dec, - $rep, $dimension, $dimension2, $tags, $pg, $graphics); + $classtotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, $convert, $dec, $rep, $dimension, $dimension2, $tags, $pg, $graphics, $labels, $serie1, $serie2); $class_open_total += $classtotal[0]; $class_period_total += $classtotal[1]; } @@ -294,20 +302,20 @@ function print_balance_sheet() $rep->Line($rep->row); if ($graphics) { - $pg->x[] = _('Calculated Return'); - $pg->y[] = abs($calc_open); - $pg->z[] = abs($calc_period); - global $decseps, $graph_skin; - $pg->title = $rep->title; - $pg->axis_x = _("Group"); - $pg->axis_y = _("Amount"); - $pg->graphic_1 = $headers[2]; - $pg->graphic_2 = $headers[3]; - $pg->type = $graphics; - $pg->skin = $graph_skin; - $pg->built_in = false; - $pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != "."); - $filename = company_path(). "/pdf_files/". uniqid("").".png"; + $labels[] = _('Calculated Return'); + $serie1[] = abs($calc_period); + $serie2[] = abs($calc_open + $calc_period); + $pg->setStream('png'); + $pg->setLabels($labels); + $pg->addSerie($headers[3], $serie1); + $pg->addSerie($headers[4], $serie2); + $pg->setTitle($rep->title); + $pg->setXTitle(_("Group")); + $pg->setYTitle(_("Amount")); + $pg->setDTitle(number_format2(abs($calc_open + $calc_period))); + $pg->setValues(true); + $pg->latin_notation = ($SysPrefs->decseps[user_dec_sep()] != "."); + $filename = company_path(). "/pdf_files/". random_id().".png"; $pg->display($filename, true); $w = $pg->width / 1.5; $h = $pg->height / 1.5; @@ -320,4 +328,3 @@ function print_balance_sheet() $rep->End(); } -?> \ No newline at end of file