X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=601e5d5f0458f83e388be565080646e0343b9c06;hb=6db1cc793fa3d760f1ebff244af2ef8e8cb5d845;hp=cec4715f05c66b0224c93e0486f47fdbd9469bac;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php index cec4715f..601e5d5f 100644 --- a/purchasing/po_receive_items.php +++ b/purchasing/po_receive_items.php @@ -29,16 +29,12 @@ page(_("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 "
"; - //echo get_gl_view_str(25, $grn, _("View the GL &Journal Entries for this Delivery")); - -// echo "
"; 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.")); } @@ -158,6 +153,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,14 +168,14 @@ 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'); 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'); @@ -200,7 +197,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 +211,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() ."%)." . "
" . _("Modify the ordered items on the purchase order if you wish to increase the quantities.")); return false;