X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep707.php;h=2acafb07fcd787461a65a6abc6f87f5805f1d379;hb=46c5dc49d75f51084402491bfddbd69c306fce2d;hp=fe3efeddb8d8cc64d5e6bd19276307f29ca0111a;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git diff --git a/reporting/rep707.php b/reporting/rep707.php index fe3efedd..2acafb07 100644 --- a/reporting/rep707.php +++ b/reporting/rep707.php @@ -26,8 +26,7 @@ include_once($path_to_root . "/admin/db/tags_db.inc"); //---------------------------------------------------------------------------------------------------- -function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $convert, &$dec, &$pdec, &$rep, $dimension, $dimension2, - $tags, &$pg, $graphics) +function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $convert, &$dec, &$pdec, &$rep, $dimension, $dimension2, $tags, &$pg, $graphics, &$labels, &$serie1, &$serie2) { $code_per_balance = 0; $code_acc_balance = 0; @@ -101,7 +100,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, $tags, $pg, $graphics); + $pdec, $rep, $dimension, $dimension2, $tags, $pg, $graphics, $labels, $serie1, $serie2); $per_balance_total += $totals_arr[0]; $acc_balance_total += $totals_arr[1]; } @@ -118,9 +117,9 @@ function display_type ($type, $typename, $from, $to, $begin, $end, $compare, $co $rep->AmountCol(4, 5, Achieve(($code_per_balance + $per_balance_total), ($code_acc_balance + $acc_balance_total)), $pdec); if ($graphics) { - $pg->x[] = $typename; - $pg->y[] = abs($code_per_balance + $per_balance_total); - $pg->z[] = abs($code_acc_balance + $acc_balance_total); + $labels[] = $typename; + $serie1[] = abs($code_per_balance + $per_balance_total); + $serie2[] = abs($code_acc_balance + $acc_balance_total); } $rep->NewLine(); } @@ -150,7 +149,7 @@ function Achieve($d1, $d2) function print_profit_and_loss_statement() { - global $path_to_root; + global $path_to_root, $SysPrefs; $dim = get_company_pref('use_dimension'); $dimension = $dimension2 = 0; @@ -169,7 +168,7 @@ function print_profit_and_loss_statement() $orientation = $_POST['PARAM_9']; $destination = $_POST['PARAM_10']; } - else if ($dim == 1) + elseif ($dim == 1) { $dimension = $_POST['PARAM_3']; $tags = (isset($_POST['PARAM_4']) ? $_POST['PARAM_4'] : -1); @@ -193,10 +192,13 @@ function print_profit_and_loss_statement() 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; @@ -204,7 +206,7 @@ function print_profit_and_loss_statement() $dec = user_price_dec(); $pdec = user_percent_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'), _('Period'), _('Accumulated'), _('Achieved %')); @@ -221,7 +223,7 @@ function print_profit_and_loss_statement() '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), @@ -252,6 +254,8 @@ function print_profit_and_loss_statement() { $begin = add_months($from, -12); $end = add_months($to, -12); + if (date_comp($to, end_month($to)) == 0) // compensate for leap years. If to-date equal end month + $end = end_month($end); // then the year-1 should also be end month $headers[3] = _('Period Y-1'); } @@ -283,8 +287,7 @@ function print_profit_and_loss_statement() $typeresult = get_account_types(false, $class['cid'], -1); while ($accounttype=db_fetch($typeresult)) { - $classtotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end, $compare, $convert, $dec, - $pdec, $rep, $dimension, $dimension2, $tags, $pg, $graphics); + $classtotal = display_type($accounttype["id"], $accounttype["name"], $from, $to, $begin, $end, $compare, $convert, $dec, $pdec, $rep, $dimension, $dimension2, $tags, $pg, $graphics, $labels, $serie1, $serie2); $class_per_total += $classtotal[0]; $class_acc_total += $classtotal[1]; } @@ -310,28 +313,25 @@ function print_profit_and_loss_statement() $rep->AmountCol(2, 3, $salesper *-1, $dec); // always convert $rep->AmountCol(3, 4, $salesacc * -1, $dec); $rep->AmountCol(4, 5, Achieve($salesper, $salesacc), $pdec); - if ($graphics) - { - $pg->x[] = _('Calculated Return'); - $pg->y[] = abs($salesper); - $pg->z[] = abs($salesacc); - } $rep->Font(); $rep->NewLine(); $rep->Line($rep->row); if ($graphics) { - 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($salesper); + $serie2[] = abs($salesacc); + $pg->setStream('png'); + $pg->setLabels($labels); + $pg->addSerie($headers[2], $serie1); + $pg->addSerie($headers[3], $serie2); + $pg->setTitle($rep->title); + $pg->setXTitle(_("Group")); + $pg->setYTitle(_("Amount")); + $pg->setDTitle(number_format2(abs($salesper))); + $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;