X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=90a9ffe53536c92bee7bbc79a8d4c612bd71db5a;hb=a0a0a0e1318042034fe5652caa69b034200c8a90;hp=e0a584280be3dcf3860b7f63fec817754b997776;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git
diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index e0a58428..90a9ffe5 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");
@@ -12,32 +22,29 @@ 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']))
+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")));
+ 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"));
+ hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different &purchase order for receiving items against"));
display_footer_exit();
}
//--------------------------------------------------------------------------------------------------
-if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['PO']))
-//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."));
}
@@ -46,11 +53,11 @@ if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['P
function display_po_receive_items()
{
- global $table_style;
- start_table("colspan=7 $table_style width=90%");
+ div_start('grn_items');
+ start_table(TABLESTYLE, "colspan=7 width=90%");
$th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"),
_("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
- table_header($th);
+ table_header($th);
/*show the line items on the order with the quantity being received for modification */
@@ -59,14 +66,14 @@ function display_po_receive_items()
if (count($_SESSION['PO']->line_items)> 0 )
{
- foreach ($_SESSION['PO']->line_items as $ln_itm)
+ foreach ($_SESSION['PO']->line_items as $ln_itm)
{
alt_table_row_color($k);
$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;
}
@@ -79,18 +86,18 @@ function display_po_receive_items()
text_cells(null, $ln_itm->stock_id . "Desc", $ln_itm->item_description, 30, 50);
else
label_cell($ln_itm->item_description);
- qty_cell($ln_itm->quantity);
+ $dec = get_qty_dec($ln_itm->stock_id);
+ qty_cell($ln_itm->quantity, false, $dec);
label_cell($ln_itm->units);
- qty_cell($ln_itm->qty_received);
- qty_cell($qty_outstanding);
+ qty_cell($ln_itm->qty_received, false, $dec);
+ qty_cell($qty_outstanding, false, $dec);
if ($qty_outstanding > 0)
- qty_cells(null, $ln_itm->line_no, qty_format($ln_itm->receive_qty), "align=right");
+ 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, qty_format($ln_itm->receive_qty), "align=right",
- "disabled");
+ 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();
}
@@ -100,42 +107,36 @@ function display_po_receive_items()
label_row(_("Total value of items received"), $display_total, "colspan=8 align=right",
"nowrap align=right");
end_table();
+ div_end();
}
//--------------------------------------------------------------------------------------------------
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 . "
- AND (quantity_ordered > quantity_received)
- 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;
- while ($myrow = db_fetch($result))
+ 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)
+ if ($qty_outstanding > 0)
{
- if ($ln_item->qty_inv != $myrow["qty_invoiced"] ||
- $ln_item->stock_id != $myrow["item_code"] ||
- $ln_item->quantity != $myrow["quantity_ordered"] ||
- $ln_item->qty_received != $myrow["quantity_received"])
+ if ($ln_item->qty_inv != $myrow["qty_invoiced"] ||
+ $ln_item->stock_id != $myrow["item_code"] ||
+ $ln_item->quantity != $myrow["quantity_ordered"] ||
+ $ln_item->qty_received != $myrow["quantity_received"])
{
return true;
}
}
- $line_no++;
+ $line_no++;
} /*loop through all line items of the order to ensure none have been invoiced */
return false;
@@ -145,27 +146,29 @@ 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."));
return false;
}
- if (!is_date($_POST['DefaultReceivedDate']))
+ if (!is_date($_POST['DefaultReceivedDate']))
{
display_error(_("The entered date is invalid."));
set_focus('DefaultReceivedDate');
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');
@@ -173,9 +176,9 @@ function can_process()
}
$something_received = 0;
- foreach ($_SESSION['PO']->line_items as $order_line)
+ foreach ($_SESSION['PO']->line_items as $order_line)
{
- if ($order_line->receive_qty > 0)
+ if ($order_line->receive_qty > 0)
{
$something_received = 1;
break;
@@ -184,10 +187,10 @@ function can_process()
// Check whether trying to deliver more items than are recorded on the actual purchase order (+ overreceive allowance)
$delivery_qty_too_large = 0;
- foreach ($_SESSION['PO']->line_items as $order_line)
+ 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)))
+ if ($order_line->receive_qty+$order_line->qty_received >
+ $order_line->quantity * (1+ ($SysPrefs->over_receive_allowance() / 100)))
{
$delivery_qty_too_large = 1;
break;
@@ -198,10 +201,10 @@ function can_process()
{ /*Then dont bother proceeding cos nothing to do ! */
display_error(_("There is nothing to process. Please enter valid quantities greater than zero."));
return false;
- }
+ }
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;
@@ -214,67 +217,79 @@ function can_process()
function process_receive_po()
{
- global $path_to_root;
+ global $path_to_root, $Ajax;
if (!can_process())
return;
- if (check_po_changed())
+ 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.") . "
";
+ 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);
- echo "