X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fpo_receive_items.php;h=1c6e6d627a0280aff0a50deafff18578e7160f5b;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=d58e2aabfaca8a6e6972b44693709d4d2e1fb132;hpb=68372f2a08f5a862375c04862c8ccb56df830b4b;p=fa-stable.git
diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index d58e2aab..1c6e6d62 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -1,6 +1,16 @@
.
+***********************************************************************/
+$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");
@@ -19,16 +29,14 @@ 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"));
+ hyperlink_params("$path_to_root/purchasing/supplier_invoice.php", _("Entry purchase &invoice for this receival"), "New=1");
-// echo "
";
hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different &purchase order for receiving items against"));
display_footer_exit();
@@ -37,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."));
}
@@ -68,7 +75,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;
}
@@ -90,10 +97,9 @@ function display_po_receive_items()
if ($qty_outstanding > 0)
qty_cells(null, $ln_itm->line_no, number_format2($ln_itm->receive_qty, $dec), "align=right", null, $dec);
else
- qty_cells(null, $ln_itm->line_no, number_format2($ln_itm->receive_qty, $dec), "align=right",
- "disabled", $dec);
+ 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();
}
@@ -115,9 +121,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=".db_escape($_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);
@@ -126,7 +131,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)
@@ -139,7 +143,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;
@@ -149,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."));
@@ -162,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');
@@ -191,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;
@@ -205,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;
@@ -225,20 +231,23 @@ function process_receive_po()
if (check_po_changed())
{
- echo "
" . _("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.") . "
";
-
- echo "