Forgot to delete the deliveries.

[fa-stable.git] / inventory / manage / locations.php

diff --git a/inventory/manage/locations.php b/inventory/manage/locations.php
index b39a6062fc3a388f2c86fad13f1a39e0cfb4bfc9..4fdef13119df1bddd13d34c46a42d6da300603ca 100644 (file)
--- a/inventory/manage/locations.php
+++ b/inventory/manage/locations.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 = 11;
 $path_to_root="../..";
@@ -117,39 +117,41 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
        $selected_id = -1;
+       $sav = get_post('show_inactive');
        unset($_POST);
+       $_POST['show_inactive'] = $sav;
 }
 
 $sql = "SELECT * FROM ".TB_PREF."locations";
+if (!check_value('show_inactive')) $sql .= " WHERE !inactive";
 $result = db_query($sql, "could not query locations");;
 
 start_form();
 start_table("$table_style width=30%");
-$th = array(_("Location Code"), _("Location Name"), "", "");
+$th = array(_("Location Code"), _("Location Name"), _("Address"), _("Phone"), "", "");
+inactive_control_column($th);
 table_header($th);
 $k = 0; //row colour counter
-while ($myrow = db_fetch_row($result)) 
+while ($myrow = db_fetch($result)) 
 {
 
        alt_table_row_color($k);
        
-       label_cell($myrow[0]);
-       label_cell($myrow[1]);
-       edit_button_cell("Edit".$myrow[0], _("Edit"));
-       delete_button_cell("Delete".$myrow[0], _("Delete"));
+       label_cell($myrow["loc_code"]);
+       label_cell($myrow["location_name"]);
+       label_cell($myrow["delivery_address"]);
+       label_cell($myrow["phone"]);
+       inactive_control_cell($myrow["loc_code"], $myrow["inactive"], 'locations', 'loc_code');
+       edit_button_cell("Edit".$myrow["loc_code"], _("Edit"));
+       delete_button_cell("Delete".$myrow["loc_code"], _("Delete"));
        end_row();
 }
        //END WHILE LIST LOOP
-
-//end of ifs and buts!
-
+inactive_control_row($th);
 end_table();
 
-end_form();
 echo '<br>';
 
-start_form();
-
 start_table($table_style2);
 
 $_POST['email'] = "";
@@ -187,7 +189,7 @@ text_row_ex(_("Facsimile No:"), 'fax', 30, 30);
 email_row_ex(_("E-mail:"), 'email', 30);
 
 end_table(1);
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();