Feature 5388: Print Invoices (documents) list gets too long. Fixed by default 180...

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

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 57ef24a02f99cead37e69c58b8648c10acd35b7b..fcd7348b4e9b2fd72f3fa5153db533044c48892d 100644 (file)
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -18,7 +18,7 @@ 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 (user_use_date_picker())
        $js .= get_js_date_picker();
@@ -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)
        {
@@ -181,16 +181,8 @@ function can_process()
                return false;
        }
 
-    if (!$Refs->is_valid($_POST['ref']))
-    {
-               display_error(_("You must enter a reference."));
-               set_focus('ref');
-               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;
        }
@@ -281,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, 
+               array('date' => Today(), 'supplier' => $_SESSION['PO']->supplier_id));
        copy_from_cart();
 }
 
@@ -336,5 +329,3 @@ end_form();
 
 //--------------------------------------------------------------------------------------------------
 end_page();
-?>
-