X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep706.php;h=30e2520bfded355d83efc04caaa9395d3a1cea64;hb=df660a601cabb0afe7f3246884f16207b9a0c314;hp=ebb9cd8328416852d555f88b0dac053dc731adda;hpb=40da959b32eb27fcb0422207a284eed13cc27d7e;p=fa-stable.git diff --git a/reporting/rep706.php b/reporting/rep706.php index ebb9cd83..30e2520b 100644 --- a/reporting/rep706.php +++ b/reporting/rep706.php @@ -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; @@ -145,7 +145,7 @@ function print_balance_sheet() $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); @@ -179,7 +179,7 @@ function print_balance_sheet() 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'), @@ -197,7 +197,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), @@ -303,17 +303,16 @@ function print_balance_sheet() $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->skin = $SysPrefs->graph_skin; $pg->built_in = false; - $pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != "."); - $filename = company_path(). "/pdf_files/". uniqid("").".png"; + $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; @@ -326,4 +325,3 @@ function print_balance_sheet() $rep->End(); } -?> \ No newline at end of file