X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=72affe2728153e28e274f5e1a463112a3ea22b8c;hb=f3a1386748cd9250419b5ad03b95c56af2bb5f92;hp=85acc0adf0da063ad701cd2de6daca0d535e5dc2;hpb=4e4ce8577f8582967995919860c66aa94d633afd;p=fa-stable.git

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 85acc0ad..72affe27 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -18,9 +18,9 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 page(_($help_context = "Receive Purchase Order Items"), false, false, "", $js);
 
@@ -58,7 +58,7 @@ if ((!isset($_GET['PONumber']) || $_GET['PONumber'] == 0) && !isset($_SESSION['P
 function display_po_receive_items()
 {
 	div_start('grn_items');
-    start_table(TABLESTYLE, "colspan=7 width=90%");
+    start_table(TABLESTYLE, "colspan=7 width='90%'");
     $th = array(_("Item Code"), _("Description"), _("Ordered"), _("Units"), _("Received"),
     	_("Outstanding"), _("This Delivery"), _("Price"), _("Total"));
     table_header($th);
@@ -131,7 +131,7 @@ 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 */
-	// Sherifoz 22.06.03 Compare against COMPLETED items only !!
+	// Compare against COMPLETED items only !!
 	// Otherwise if you try to fullfill item quantities separately will give error.
 	$result = get_po_items($_SESSION['PO']->order_no);
 
@@ -161,7 +161,7 @@ function check_po_changed()
 
 function can_process()
 {
-	global $SysPrefs, $Refs;
+	global $SysPrefs;
 	
 	if (count($_SESSION['PO']->line_items) <= 0)
 	{
@@ -175,17 +175,14 @@ function can_process()
 		set_focus('DefaultReceivedDate');
 		return false;
 	}
-
-    if (!$Refs->is_valid($_POST['ref']))
-    {
-		display_error(_("You must enter a reference."));
-		set_focus('ref');
+	if (!is_date_in_fiscalyear($_POST['DefaultReceivedDate'])) {
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
+		set_focus('DefaultReceivedDate');
 		return false;
 	}
 
-	if (!is_new_reference($_POST['ref'], ST_SUPPRECEIVE))
+	if (!check_reference($_POST['ref'], ST_SUPPRECEIVE))
 	{
-		display_error(_("The entered reference is already in use."));
 		set_focus('ref');
 		return false;
 	}
@@ -259,6 +256,7 @@ function process_receive_po()
 	$grn->orig_order_date = $_POST['DefaultReceivedDate'];
 	$grn->reference = $_POST['ref'];
 	$grn->Location = $_POST['Location'];
+	$grn->ex_rate = input_num('_ex_rate', null);
 
 	$grn_no = add_grn($grn);
 
@@ -275,7 +273,8 @@ if (isset($_GET['PONumber']) && $_GET['PONumber'] > 0 && !isset($_POST['Update']
 {
 	create_new_po(ST_PURCHORDER, $_GET['PONumber']);
 	$_SESSION['PO']->trans_type = ST_SUPPRECEIVE;
-	$_SESSION['PO']->reference = $Refs->get_next(ST_SUPPRECEIVE);
+	$_SESSION['PO']->reference = $Refs->get_next(ST_SUPPRECEIVE, null,
+		array('date' => Today(), 'supplier' => $_SESSION['PO']->supplier_id));
 	copy_from_cart();
 }
 
@@ -318,7 +317,7 @@ if (isset($_POST['ProcessGoodsReceived']))
 
 start_form();
 
-display_grn_summary($_SESSION['PO'], true);
+edit_grn_summary($_SESSION['PO'], true);
 display_heading(_("Items to Receive"));
 display_po_receive_items();
 
@@ -330,5 +329,3 @@ end_form();
 
 //--------------------------------------------------------------------------------------------------
 end_page();
-?>
-