[0000158] Added check for POS usage before deletion.

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

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 2e2fa35f4ac27f97f1b3d6c799137c0a50edeb9a..9664c54607c3b2695e92132180221dc0ef8f8300 100644 (file)
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    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="..";
 include_once($path_to_root . "/purchasing/includes/po_class.inc");
@@ -23,13 +33,13 @@ if (isset($_GET['AddedID']))
 
        display_notification_centered(_("Purchase Order Delivery has been processed"));
 
-       display_note(get_trans_view_str($trans_type, $grn, _("View this Delivery")));
+       display_note(get_trans_view_str($trans_type, $grn, _("&View this Delivery")));
 
        //echo "<BR>";
-       //echo get_gl_view_str(25, $grn, _("View the GL Journal Entries for this Delivery"));
+       //echo get_gl_view_str(25, $grn, _("View the GL &Journal Entries for this Delivery"));
 
 //     echo "<br>";
-       hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different purchase order for receiving items against"));
+       hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different &purchase order for receiving items against"));
 
        display_footer_exit();
 }
@@ -114,9 +124,8 @@ function check_po_changed()
        // Otherwise if you try to fullfill item quantities separately will give error.
        $sql = "SELECT item_code, quantity_ordered, quantity_received, qty_invoiced
                FROM ".TB_PREF."purch_order_details
-               WHERE order_no=" . $_SESSION['PO']->order_no . "
-               AND (quantity_ordered > quantity_received)
-               ORDER BY po_detail_item";
+               WHERE order_no=" . $_SESSION['PO']->order_no 
+               ." ORDER BY po_detail_item";
 
        $result = db_query($sql, "could not query purch order details");
     check_db_error("Could not check that the details of the purchase order had not been changed by another user ", $sql);
@@ -125,7 +134,6 @@ function check_po_changed()
        while ($myrow = db_fetch($result))
        {
                $ln_item = $_SESSION['PO']->line_items[$line_no];
-
                // only compare against items that are outstanding
                $qty_outstanding = $ln_item->quantity - $ln_item->qty_received;
                if ($qty_outstanding > 0)
@@ -138,7 +146,7 @@ function check_po_changed()
                        return true;
                }
                }
-               $line_no++;
+               $line_no++;
        } /*loop through all line items of the order to ensure none have been invoiced */
 
        return false;
@@ -224,15 +232,17 @@ function process_receive_po()
 
        if (check_po_changed())
        {
-               echo "<br> " . _("This order has been changed or invoiced since this delivery was started to be actioned. Processing halted. To enter a delivery against this purchase order, it must be re-selected and re-read again to update the changes made by the other user.") . "<BR>";
-
-               echo "<center><a href='$path_to_root/purchasing/inquiry/po_search.php?" . SID . "'>" . _("Select a different purchase order for receiving goods against") . "</a></center>";
-               echo "<center><a href='$path_to_root/po_receive_items.php?" . SID . "PONumber=" . $_SESSION['PO']->OrderNumber . "'>" . _("Re-Read the updated purchase order for receiving goods against") . "</a></center>";
+               display_error(_("This order has been changed or invoiced since this delivery was started to be actioned. Processing halted. To enter a delivery against this purchase order, it must be re-selected and re-read again to update the changes made by the other user."));
+               hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php",
+                _("Select a different purchase order for receiving goods against"));
+               hyperlink_params("$path_to_root/purchasing/po_receive_items.php", 
+                        _("Re-Read the updated purchase order for receiving goods against"),
+                        "PONumber=" . $_SESSION['PO']->order_no);
                unset($_SESSION['PO']->line_items);
                unset($_SESSION['PO']);
                unset($_POST['ProcessGoodsReceived']);
                $Ajax->activate('_page_body');
-               exit;
+               display_footer_exit();
        }
 
        $grn = add_grn($_SESSION['PO'], $_POST['DefaultReceivedDate'],
@@ -300,7 +310,7 @@ display_po_receive_items();
 
 echo '<br>';
 submit_center_first('Update', _("Update"), '', true);
-submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear all GL entry fields"), true);
+submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Process Receive Items"), true);
 
 end_form();