Merged changes from main CVS up to 2.1.5

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

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index a500eebce410064758ec3d4befdf55f73c82494b..5a9f95d6c2dc54005b637a31f7095efaa66b9cd4 100644 (file)
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -1,13 +1,13 @@
 <?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="..";
@@ -70,7 +70,7 @@ function handle_new_order()
     session_register("adj_items");
 
     $_SESSION['adj_items'] = new items_cart(systypes::inventory_adjustment());
-       $_POST['AdjDate'] = Today();
+       $_POST['AdjDate'] = new_doc_date();
        if (!is_date_in_fiscalyear($_POST['AdjDate']))
                $_POST['AdjDate'] = end_fiscalyear();
        $_SESSION['adj_items']->tran_date = $_POST['AdjDate'];  
@@ -134,7 +134,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,7 +217,7 @@ if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items']))
 }
 
 //-----------------------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
 
 display_order_header($_SESSION['adj_items']);
 
@@ -229,7 +229,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();