X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fshipping_companies.php;h=720c526476affa2efaa25b48e671a591836e9371;hb=f1e793b356fd4d526eafc66073302e584ede78a7;hp=e01ad9eff7312f849c72c0999ad9cd00fe6b4691;hpb=8259c324f645a39cb847d5a4346b70e225e1b02c;p=fa-stable.git

diff --git a/admin/shipping_companies.php b/admin/shipping_companies.php
index e01ad9ef..720c5264 100644
--- a/admin/shipping_companies.php
+++ b/admin/shipping_companies.php
@@ -1,6 +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 = 14;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
@@ -83,24 +91,29 @@ if ($Mode == 'Delete')
 			$sql="DELETE FROM ".TB_PREF."shippers WHERE shipper_id=$selected_id";
 			db_query($sql,"could not delete shipper");
 			display_notification(_('Selected shipping company has been deleted'));
- 			$Mode = 'RESET';
 		}
 	}
+	$Mode = 'RESET';
 }
 
 if ($Mode == 'RESET')
 {
 	$selected_id = -1;
+	$sav = get_post('show_inactive');
 	unset($_POST);
+	$_POST['show_inactive'] = $sav;
 }
 //----------------------------------------------------------------------------------------------
 
-$sql = "SELECT * FROM ".TB_PREF."shippers ORDER BY shipper_id";
+$sql = "SELECT * FROM ".TB_PREF."shippers";
+if (!check_value('show_inactive')) $sql .= " WHERE !inactive";
+$sql .= " ORDER BY shipper_id";
 $result = db_query($sql,"could not get shippers");
 
 start_form();
 start_table($table_style);
 $th = array(_("Name"), _("Contact Person"), _("Phone Number"), _("Address"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0; //row colour counter
@@ -112,19 +125,17 @@ while ($myrow = db_fetch($result))
 	label_cell($myrow["contact"]);
 	label_cell($myrow["phone"]);
 	label_cell($myrow["address"]);
- 	edit_button_cell("Edit".$myrow[0], _("Edit"));
- 	edit_button_cell("Delete".$myrow[0], _("Delete"));
+	inactive_control_cell($myrow["shipper_id"], $myrow["inactive"], 'shippers', 'shipper_id');
+ 	edit_button_cell("Edit".$myrow["shipper_id"], _("Edit"));
+ 	delete_button_cell("Delete".$myrow["shipper_id"], _("Delete"));
 	end_row();
 }
 
-end_table();
-end_form();
-echo '<br>';
+inactive_control_row($th);
+end_table(1);
 
 //----------------------------------------------------------------------------------------------
 
-start_form();
-
 start_table($table_style2);
 
 if ($selected_id != -1) 
@@ -155,7 +166,7 @@ text_row_ex(_("Address:"), 'address', 50);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();
 end_page();