Removed obsolete complete parameter.
[fa-stable.git] / purchasing / po_receive_items.php
index 5059807be0e433350209e5934cefe5c7501729c8..b536ba82b1a2e8a4bc265ae7c93f5a879976cc74 100644 (file)
@@ -22,23 +22,19 @@ if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_("Receive Purchase Order Items"), false, false, "", $js);
+page(_($help_context = "Receive Purchase Order Items"), false, false, "", $js);
 
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID']))
 {
        $grn = $_GET['AddedID'];
-       $trans_type = 25;
+       $trans_type = ST_SUPPRECEIVE;
 
        display_notification_centered(_("Purchase Order Delivery has been processed"));
 
        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 "<br>";
        hyperlink_params("$path_to_root/purchasing/supplier_invoice.php", _("Entry purchase &invoice for this receival"), "New=1");
 
        hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different &purchase order for receiving items against"));
@@ -49,7 +45,6 @@ if (isset($_GET['AddedID']))
 //--------------------------------------------------------------------------------------------------
 
 if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['PO']))
-//if (isset($_GET['PONumber']) && !$_GET['PONumber'] > 0 && !isset($_SESSION['PO']))
 {
        die (_("This page can only be opened if a purchase order has been selected. Please select a purchase order first."));
 }
@@ -58,10 +53,8 @@ if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['P
 
 function display_po_receive_items()
 {
-       global $table_style;
-
        div_start('grn_items');
-    start_table("colspan=7 $table_style width=90%");
+    start_table(TABLESTYLE, "colspan=7 width=90%");
     $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"),
        _("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
     table_header($th);
@@ -121,18 +114,13 @@ function display_po_receive_items()
 
 function check_po_changed()
 {
-       /*Now need to check that the order details are the same as they were when they were read into the Items array. If they've changed then someone else must have altered them */
+       /*Now need to check that the order details are the same as they were when they were read
+       into the Items array. If they've changed then someone else must have altered them */
        // Sherifoz 22.06.03 Compare against COMPLETED items only !!
        // 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 
-               ." 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);
+       $result = get_po_items($_SESSION['PO']->order_no);
 
-       $line_no = 1;
+       $line_no = 0;
        while ($myrow = db_fetch($result))
        {
                $ln_item = $_SESSION['PO']->line_items[$line_no];
@@ -180,7 +168,7 @@ function can_process()
                return false;
        }
 
-       if (!is_new_reference($_POST['ref'], 25))
+       if (!is_new_reference($_POST['ref'], ST_SUPPRECEIVE))
        {
                display_error(_("The entered reference is already in use."));
                set_focus('ref');
@@ -237,37 +225,43 @@ function process_receive_po()
        if (check_po_changed())
        {
                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');
                display_footer_exit();
        }
+       
+       $grn = &$_SESSION['PO'];
+       $grn->orig_order_date = $_POST['DefaultReceivedDate'];
+       $grn->reference = $_POST['ref'];
+       $grn->Location = $_POST['Location'];
 
-       $grn = add_grn($_SESSION['PO'], $_POST['DefaultReceivedDate'],
-               $_POST['ref'], $_POST['Location']);
+       $grn_no = add_grn($grn);
 
        new_doc_date($_POST['DefaultReceivedDate']);
        unset($_SESSION['PO']->line_items);
        unset($_SESSION['PO']);
 
-       meta_forward($_SERVER['PHP_SELF'], "AddedID=$grn");
+       meta_forward($_SERVER['PHP_SELF'], "AddedID=$grn_no");
 }
 
 //--------------------------------------------------------------------------------------------------
 
 if (isset($_GET['PONumber']) && $_GET['PONumber'] > 0 && !isset($_POST['Update']))
 {
-
-       create_new_po();
-
-       /*read in all the selected order into the Items cart  */
-       read_po($_GET['PONumber'], $_SESSION['PO']);
+       create_new_po(ST_PURCHORDER, $_GET['PONumber']);
+       $_SESSION['PO']->trans_type = ST_SUPPRECEIVE;
+       $_SESSION['PO']->reference = $Refs->get_next(ST_SUPPRECEIVE);
+       copy_from_cart();
 }
 
 //--------------------------------------------------------------------------------------------------