Merged changes from stable branch up to 2.3.23.

[fa-stable.git] / purchasing / po_receive_items.php

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 85acc0adf0da063ad701cd2de6daca0d535e5dc2..da277b2743366586c44f922f6342098004200ceb 100644 (file)
--- 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);
@@ -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();
 
@@ -330,5 +336,3 @@ end_form();
 
 //--------------------------------------------------------------------------------------------------
 end_page();
-?>
-