[0002950] Fixed false quantity on hand errors on sales delivery.

[fa-stable.git] / inventory / adjustments.php

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index 20ac09d1971bb7fcc51ec29005663fcfb0f4859b..dc14d93ef4a31edfbd3d3802c1edcda6cd29c1a6 100644 (file)
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -47,6 +47,8 @@ if (isset($_GET['AddedID']))
 
        hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Adjustment"));
 
+       hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$trans_no");
+
        display_footer_exit();
 }
 //--------------------------------------------------------------------------------------------------
@@ -67,8 +69,6 @@ function handle_new_order()
                unset ($_SESSION['adj_items']);
        }
 
-    session_register("adj_items");
-
     $_SESSION['adj_items'] = new items_cart(ST_INVADJUST);
        $_POST['AdjDate'] = new_doc_date();
        if (!is_date_in_fiscalyear($_POST['AdjDate']))
@@ -80,7 +80,7 @@ function handle_new_order()
 
 function can_process()
 {
-       global $Refs;
+       global $Refs, $SysPrefs;
 
        $adj = &$_SESSION['adj_items'];
 
@@ -114,16 +114,16 @@ function can_process()
                display_error(_("The entered date is not in fiscal year."));
                set_focus('AdjDate');
                return false;
-       } else {
-               $failed_item = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']);
-               if ($failed_item >= 0) 
+       }
+       elseif (!$SysPrefs->allow_negative_stock())
+       {
+               $low_stock = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']);
+
+               if ($low_stock)
                {
-                       $line = $adj->line_items[$failed_item];
-               display_error(_("The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :") .
-                       " " . $line->stock_id . " - " .  $line->item_description);
-                       $_POST['Edit'.$failed_item] = 1; // enter edit mode
+               display_error(_("The adjustment cannot be processed because it would cause negative inventory balance for marked items as of document date or later."));
                        unset($_POST['Process']);
-               return false;
+                       return false;
                }
        }
        return true;
@@ -141,6 +141,7 @@ if (isset($_POST['Process']) && can_process()){
        unset($_SESSION['adj_items']);
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+
 } /*end of process credit note */
 
 //-----------------------------------------------------------------------------------------------
@@ -223,7 +224,7 @@ start_form();
 
 display_order_header($_SESSION['adj_items']);
 
-start_outer_table("$table_style width=70%", 10);
+start_outer_table(TABLESTYLE, "width=70%", 10);
 
 display_adjustment_items(_("Adjustment Items"), $_SESSION['adj_items']);
 adjustment_options_controls();