Merged latest changes from stable branch.

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

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index a500eebce410064758ec3d4befdf55f73c82494b..18f26096f98c27f8fdad4536f12d5f8042fa120e 100644 (file)
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -1,16 +1,16 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 3;
-$path_to_root="..";
+$page_security = 'SA_INVENTORYADJUSTMENT';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 include_once($path_to_root . "/includes/session.inc");
@@ -25,7 +25,7 @@ if ($use_popup_windows)
        $js .= get_js_open_window(800, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_("Item Adjustments Note"), false, false, "", $js);
+page(_($help_context = "Item Adjustments Note"), false, false, "", $js);
 
 //-----------------------------------------------------------------------------------------------
 
@@ -38,7 +38,7 @@ check_db_has_movement_types(_("There are no inventory movement types defined in
 if (isset($_GET['AddedID'])) 
 {
        $trans_no = $_GET['AddedID'];
-       $trans_type = systypes::inventory_adjustment();
+       $trans_type = ST_INVADJUST;
 
        display_notification_centered(_("Items adjustment has been processed"));
        display_note(get_trans_view_str($trans_type, $trans_no, _("&View this adjustment")));
@@ -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,10 +69,8 @@ function handle_new_order()
                unset ($_SESSION['adj_items']);
        }
 
-    session_register("adj_items");
-
-    $_SESSION['adj_items'] = new items_cart(systypes::inventory_adjustment());
-       $_POST['AdjDate'] = Today();
+    $_SESSION['adj_items'] = new items_cart(ST_INVADJUST);
+       $_POST['AdjDate'] = new_doc_date();
        if (!is_date_in_fiscalyear($_POST['AdjDate']))
                $_POST['AdjDate'] = end_fiscalyear();
        $_SESSION['adj_items']->tran_date = $_POST['AdjDate'];  
@@ -80,6 +80,8 @@ function handle_new_order()
 
 function can_process()
 {
+       global $Refs;
+
        $adj = &$_SESSION['adj_items'];
 
        if (count($adj->line_items) == 0)       {
@@ -87,14 +89,14 @@ function can_process()
                set_focus('stock_id');
                return false;
        }
-       if (!references::is_valid($_POST['ref'])) 
+       if (!$Refs->is_valid($_POST['ref'])) 
        {
                display_error( _("You must enter a reference."));
                set_focus('ref');
                return false;
        }
 
-       if (!is_new_reference($_POST['ref'], systypes::inventory_adjustment())) 
+       if (!is_new_reference($_POST['ref'], ST_INVADJUST)) 
        {
                display_error( _("The entered reference is already in use."));
                set_focus('ref');
@@ -109,7 +111,7 @@ function can_process()
        } 
        elseif (!is_date_in_fiscalyear($_POST['AdjDate'])) 
        {
-               display_error(_("The entered date is not in fiscal year."));
+               display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
                set_focus('AdjDate');
                return false;
        } else {
@@ -134,7 +136,7 @@ if (isset($_POST['Process']) && can_process()){
        $trans_no = add_stock_adjustment($_SESSION['adj_items']->line_items,
                $_POST['StockLocation'], $_POST['AdjDate'],     $_POST['type'], $_POST['Increase'],
                $_POST['ref'], $_POST['memo_']);
-
+       new_doc_date($_POST['AdjDate']);
        $_SESSION['adj_items']->clear_items();
        unset($_SESSION['adj_items']);
 
@@ -217,11 +219,11 @@ if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items']))
 }
 
 //-----------------------------------------------------------------------------------------------
-start_form(false, true);
+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();
@@ -229,7 +231,7 @@ adjustment_options_controls();
 end_outer_table(1, false);
 
 submit_center_first('Update', _("Update"), '', null);
-submit_center_last('Process', _("Process Adjustment"), '', true);
+submit_center_last('Process', _("Process Adjustment"), '', 'default');
 
 end_form();
 end_page();