Eliminated non-static method calls and other bulk fixes to fix php5 warnings

[fa-stable.git] / purchasing / po_receive_items.php

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index a6f12cee33b26e352950adc1e627709c7d6fca2d..5059807be0e433350209e5934cefe5c7501729c8 100644 (file)
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 11;
-$path_to_root="..";
+$page_security = 'SA_GRN';
+$path_to_root = "..";
 include_once($path_to_root . "/purchasing/includes/po_class.inc");
 
 include_once($path_to_root . "/includes/session.inc");
@@ -80,7 +80,7 @@ function display_po_receive_items()
 
                $qty_outstanding = $ln_itm->quantity - $ln_itm->qty_received;
 
-               if ($ln_itm->receive_qty == 0)
+                       if (!isset($_POST['Update']) && !isset($_POST['ProcessGoodsReceived']) && $ln_itm->receive_qty == 0)
                {   //If no quantites yet input default the balance to be received
                $ln_itm->receive_qty = $qty_outstanding;
                }
@@ -104,7 +104,7 @@ function display_po_receive_items()
                        else
                                label_cell(number_format2($ln_itm->receive_qty, $dec), "align=right");
 
-                       amount_cell($ln_itm->price);
+                       amount_decimal_cell($ln_itm->price);
                        amount_cell($line_total);
                        end_row();
                }
@@ -158,6 +158,8 @@ function check_po_changed()
 
 function can_process()
 {
+       global $SysPrefs, $Refs;
+       
        if (count($_SESSION['PO']->line_items) <= 0)
        {
         display_error(_("There is nothing to process. Please enter valid quantities greater than zero."));
@@ -171,7 +173,7 @@ function can_process()
                return false;
        }
 
-    if (!references::is_valid($_POST['ref']))
+    if (!$Refs->is_valid($_POST['ref']))
     {
                display_error(_("You must enter a reference."));
                set_focus('ref');
@@ -200,7 +202,7 @@ function can_process()
        foreach ($_SESSION['PO']->line_items as $order_line)
        {
                if ($order_line->receive_qty+$order_line->qty_received >
-                       $order_line->quantity * (1+ (sys_prefs::over_receive_allowance() / 100)))
+                       $order_line->quantity * (1+ ($SysPrefs->over_receive_allowance() / 100)))
                {
                        $delivery_qty_too_large = 1;
                        break;
@@ -214,7 +216,7 @@ function can_process()
     }
     elseif ($delivery_qty_too_large == 1)
     {
-       display_error(_("Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage") . " (" . sys_prefs::over_receive_allowance() ."%)."
+       display_error(_("Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage") . " (" . $SysPrefs->over_receive_allowance() ."%)."
                . "<br>" .
                _("Modify the ordered items on the purchase order if you wish to increase the quantities."));
        return false;