X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=57ef24a02f99cead37e69c58b8648c10acd35b7b;hb=13367be8aaf5175295f7aab7160370458dad1824;hp=85acc0adf0da063ad701cd2de6daca0d535e5dc2;hpb=56407b2533f45b4abb75262c1816e25efd2139da;p=fa-stable.git

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 85acc0ad..57ef24a0 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -20,7 +20,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
 if ($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);
 
@@ -175,6 +175,11 @@ function can_process()
 		set_focus('DefaultReceivedDate');
 		return false;
 	}
+	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 (!$Refs->is_valid($_POST['ref']))
     {
@@ -259,6 +264,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);
 
@@ -318,7 +324,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();