X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=d58e2aabfaca8a6e6972b44693709d4d2e1fb132;hb=425942b6c30c1722da6d7e5bf99462e07249bc45;hp=f8aa583fa6b0c8a7d90473f99ffd3dec41401e05;hpb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;p=fa-stable.git

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index f8aa583f..d58e2aab 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 "<BR>";
-	//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 "<br>";
-	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();
 }
@@ -47,6 +47,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%");
     $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"),
     	_("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
@@ -86,9 +88,9 @@ function display_po_receive_items()
 			qty_cell($qty_outstanding, false, $dec);
 
 			if ($qty_outstanding > 0)
-				qty_cells(null, $ln_itm->line_no, qty_format($ln_itm->receive_qty, $ln_itm->stock_id, $dec), "align=right", null, $dec);
+				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, $ln_itm->stock_id, $dec), "align=right",
+				qty_cells(null, $ln_itm->line_no, number_format2($ln_itm->receive_qty, $dec), "align=right",
 					"disabled", $dec);
 
 			amount_cell($ln_itm->price);
@@ -101,6 +103,7 @@ 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();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -215,7 +218,7 @@ function can_process()
 
 function process_receive_po()
 {
-	global $path_to_root;
+	global $path_to_root, $Ajax;
 
 	if (!can_process())
 		return;
@@ -229,6 +232,7 @@ function process_receive_po()
 		unset($_SESSION['PO']->line_items);
 		unset($_SESSION['PO']);
 		unset($_POST['ProcessGoodsReceived']);
+		$Ajax->activate('_page_body');
 		exit;
 	}
 
@@ -264,7 +268,7 @@ if (isset($_POST['Update']) || isset($_POST['ProcessGoodsReceived']))
 
 		$_POST[$line->line_no] = max($_POST[$line->line_no], 0);
 		if (!check_num($line->line_no))
-			$_POST[$line->line_no] = qty_format(0, $line->stock_id);
+			$_POST[$line->line_no] = number_format2(0, get_qty_dec($line->stock_id));
 
 		if (!isset($_POST['DefaultReceivedDate']) || $_POST['DefaultReceivedDate'] == "")
 			$_POST['DefaultReceivedDate'] = Today();
@@ -276,6 +280,7 @@ if (isset($_POST['Update']) || isset($_POST['ProcessGoodsReceived']))
 			$_SESSION['PO']->line_items[$line->line_no]->item_description = $_POST[$line->stock_id . "Desc"];
 		}
 	}
+	$Ajax->activate('grn_items');
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -293,11 +298,9 @@ display_grn_summary($_SESSION['PO'], true);
 display_heading(_("Items to Receive"));
 display_po_receive_items();
 
-echo "<br><center>";
-submit('Update', _("Update"));
-echo "&nbsp";
-submit('ProcessGoodsReceived', _("Process Receive Items"));
-echo "</center>";
+echo '<br>';
+submit_center_first('Update', _("Update"), '', true);
+submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear all GL entry fields"), true);
 
 end_form();