X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=purchasing%2Fpo_receive_items.php;h=14a017be94d95278fee23d703bb623e8682e1a26;hb=2aab14aed5938bc674997cff83c319bdf40490d6;hp=d79a5af7cc2c1a2c0f4705b4753d2cda2dfae094;hpb=c16b7a0f7aa17722568a0695e2fd03a362998372;p=fa-stable.git
diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index d79a5af7..14a017be 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -23,13 +23,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 "
";
- //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 "
";
- 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();
}
@@ -90,8 +90,7 @@ 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_cell($line_total);
@@ -115,9 +114,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);
@@ -126,7 +124,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 +136,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;
@@ -225,15 +222,17 @@ 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 "