[0004216] Print Work Orders: database error fixed when voided WO is in selected range.

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

diff --git a/reporting/rep707.php b/reporting/rep707.php
index a0373b52e05751e39b53c1f725ccd6fc974a2329..19a01cabbfe64952f350729c9a8839aa75d77319 100644 (file)
--- a/reporting/rep707.php
+++ b/reporting/rep707.php
@@ -169,7 +169,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);
@@ -204,7 +204,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 +221,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 +252,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');
        }
 
@@ -330,7 +332,7 @@ function print_profit_and_loss_statement()
                $pg->skin      = $SysPrefs->graph_skin;
                $pg->built_in  = false;
                $pg->latin_notation = ($SysPrefs->decseps[user_dec_sep()] != ".");
-               $filename = company_path(). "/pdf_files/". uniqid("").".png";
+               $filename = company_path(). "/pdf_files/". random_id().".png";
                $pg->display($filename, true);
                $w = $pg->width / 1.5;
                $h = $pg->height / 1.5;