[0004212] Work Order Entry: fixed error when voided WO refence is reused.

[fa-stable.git] / reporting / rep706.php

diff --git a/reporting/rep706.php b/reporting/rep706.php
index 8a0e4d459c60bdac2f50db7607a3490781c8842a..30e2520bfded355d83efc04caaa9395d3a1cea64 100644 (file)
--- 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;
@@ -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,12 +161,14 @@ 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');
        if ($graphics)
        {
                include_once($path_to_root . "/reporting/includes/class.graphic.inc");
@@ -175,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'),
@@ -193,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),
@@ -208,7 +212,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();
@@ -297,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;
@@ -320,4 +325,3 @@ function print_balance_sheet()
        $rep->End();
 }
 
-?>
\ No newline at end of file