Merge branch 'removefedex'

Author: htochko

admin/shipping_account_list.php

@@ -25,7 +25,7 @@
 	QApplication::Authenticate();
 	// Include the classfile for ShippingAccountListFormBase
 	require(__FORMBASE_CLASSES__ . '/ShippingAccountListFormBase.class.php');
-	require_once('../shipping/fedexdc.class.php');
+
 
 	/**
 	 * This is a quick-and-dirty draft form object to do the List All functionality

css/tracmor.css

@@ -99,14 +99,6 @@ TH, TD, BODY { font: 10px verdana; text-align: left; }
 
 .disclaimer { font-size:10px;font-family:arial; }
 
-.fedex_masthead { background-color:#660099;color:#FFFFFF;padding:0;font-weight:bold;font-size:12pt;height:36px; }
-.fedex_subheader {
-	color:#FF6600;
-	font-weight:bold;
-	font-size:9pt;
-	border-top:1px solid #FF6600;
-	padding-bottom:4px;
-}
 .save_notification {
 	color: darkgreen;
 	background-color: #D0FFC3;

data_model/create-01.13.00.sql

@@ -0,0 +1,14 @@
+ALTER TABLE `fedex_shipment` DROP FOREIGN KEY `fedex_shipment_ibfk_8` , DROP FOREIGN KEY `fedex_shipment_ibfk_7` , DROP FOREIGN KEY `fedex_shipment_ibfk_6` , DROP FOREIGN KEY `fedex_shipment_ibfk_5` , DROP FOREIGN KEY `fedex_shipment_ibfk_4` , DROP FOREIGN KEY `fedex_shipment_ibfk_3` , DROP FOREIGN KEY `fedex_shipment_ibfk_2` , DROP FOREIGN KEY `fedex_shipment_ibfk_1` ;
+DROP TABLE `fedex_shipment`;
+DROP TABLE `fedex_service_type`;
+DROP TABLE `weight_unit`;
+DROP TABLE `length_unit`;
+DROP TABLE `currency_unit`;
+DROP TABLE `package_type`;
+DELETE FROM `admin_setting` WHERE `short_description`='fedex_gateway_URI';
+DELETE FROM `admin_setting` WHERE `short_description`='fedex_account_id';
+DELETE FROM `admin_setting` WHERE `short_description`='fedex_label_printer_type';
+DELETE FROM `admin_setting` WHERE `short_description`='fedex_label_format_type';
+DELETE FROM `admin_setting` WHERE `short_description`='fedex_thermal_printer_port';
+DELETE FROM `courier` WHERE `courier_id`='1';
+DELETE FROM `shipping_account` WHERE `courier_id` = '1';