Merge branch 'master' of https://github.com/jgoodman/Freeside

[freeside.git] / FS / FS / Mason.pm

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 5cecefd..caa2e60 100644 (file)
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -78,8 +78,6 @@ if ( -e $addl_handler_use_file ) {
   use HTML::FormatText;
   use HTML::Defang;
   use JSON::XS;
-#  use XMLRPC::Transport::HTTP;
-#  use XMLRPC::Lite; # for XMLRPC::Serializer
   use MIME::Base64;
   use IO::Handle;
   use IO::File;
@@ -165,6 +163,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::h_cust_main;
   use FS::cust_main::Search qw(smart_search);
   use FS::cust_main::Import;
+  use FS::cust_main::Import_Charges;
   use FS::cust_main_county;
   use FS::cust_location;
   use FS::cust_pay;
@@ -214,7 +213,6 @@ if ( -e $addl_handler_use_file ) {
   use FS::usage_class;
   use FS::payment_gateway;
   use FS::agent_payment_gateway;
-  use FS::XMLRPC;
   use FS::payby;
   use FS::cdr;
   use FS::cdr_batch;
@@ -341,7 +339,6 @@ if ( -e $addl_handler_use_file ) {
   use FS::cdr_cust_pkg_usage;
   use FS::part_pkg_msgcat;
   use FS::svc_cable;
-  use FS::cable_device;
   use FS::agent_currency;
   use FS::currency_exchange;
   use FS::part_pkg_currency;
@@ -352,6 +349,32 @@ if ( -e $addl_handler_use_file ) {
   use FS::vend_pay;
   use FS::vend_bill_pay;
   use FS::sales_pkg_class;
+  use FS::svc_alarm;
+  use FS::cable_model;
+  use FS::invoice_mode;
+  use FS::invoice_conf;
+  use FS::cable_provider;
+  use FS::cust_credit_void;
+  use FS::discount_class;
+  use FS::alarm_system;
+  use FS::alarm_type;
+  use FS::alarm_station;
+  use FS::addr_range;
+  use FS::svc_conferencing;
+  use FS::conferencing_type;
+  use FS::conferencing_quality;
+  use FS::svc_video;
+  use FS::part_pkg_usageprice;
+  use FS::cust_pkg_usageprice;
+  use FS::pbx_extension;
+  use FS::pbx_device;
+  use FS::extension_device;
+  use FS::cust_main_credit_limit;
+  use FS::cust_event_fee;
+  use FS::part_fee;
+  use FS::cust_bill_pkg_fee;
+  use FS::part_fee_msgcat;
+  use FS::part_fee_usage;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -422,7 +445,7 @@ if ( -e $addl_handler_use_file ) {
     use vars qw($m);
 
     # false laziness w/below
-    if ( defined(@DBIx::Profile::ISA) ) {
+    if ( @DBIx::Profile::ISA ) {
 
       if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
 
@@ -482,7 +505,7 @@ if ( -e $addl_handler_use_file ) {
     use vars qw($m);
     $m->clear_buffer;
     #false laziness w/above
-    if ( defined(@DBIx::Profile::ISA) ) {
+    if ( @DBIx::Profile::ISA ) {
 
       if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {