Merged changes from main CVS up to 2.1.5

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

diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php
index dfe6f2dc2862e63b3fd98e5ac3f81e0ee7dda73c..962dd268983a8cfba5b5fb6448f42f734c4551e2 100644 (file)
--- a/inventory/reorder_level.php
+++ b/inventory/reorder_level.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       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/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 4;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -17,15 +26,16 @@ check_db_has_costable_items(_("There are no inventory items defined in the syste
 //------------------------------------------------------------------------------------
 
 if (isset($_GET['stock_id']))
-{
        $_POST['stock_id'] = $_GET['stock_id'];
-}
 
-if (isset($_POST['_stock_id_update']))
+if (list_updated('stock_id')) 
+{
+       $Ajax->activate('show_heading');
        $Ajax->activate('reorders');
+}
 //------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 if (!isset($_POST['stock_id']))
        $_POST['stock_id'] = get_global_stock_item();
@@ -35,8 +45,10 @@ stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
 
 echo "<hr></center>";
 
+div_start('show_heading');
 stock_item_heading($_POST['stock_id']);
-
+br();
+div_end();
 set_global_stock_item($_POST['stock_id']);
 
 div_start('reorders');
@@ -66,10 +78,10 @@ while ($myrow = db_fetch($result))
 
        label_cell($myrow["location_name"]);
 
-       $_POST[$myrow["loc_code"]] = qty_format($myrow["reorder_level"]);
+       $_POST[$myrow["loc_code"]] = qty_format($myrow["reorder_level"], $_POST['stock_id'], $dec);
 
-       label_cell(number_format2($qoh,user_qty_dec()), "nowrap align='right'");
-       qty_cells(null, $myrow["loc_code"]);
+       qty_cell($qoh, false, $dec);
+       qty_cells(null, $myrow["loc_code"], null, null, null, $dec);
        end_row();
        $j++;
        If ($j == 12)
@@ -81,7 +93,7 @@ while ($myrow = db_fetch($result))
 
 end_table(1);
 div_end();
-submit_center('UpdateData', _("Update"));
+submit_center('UpdateData', _("Update"), true, false, 'default');
 
 end_form();
 end_page();