Merge branch 'master' of git.freeside.biz:/home/git/freeside

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

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 7993048..1215ca4 100644 (file)
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -341,7 +341,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;
@@ -351,6 +350,12 @@ if ( -e $addl_handler_use_file ) {
   use FS::vend_bill;
   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;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -421,7 +426,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') ) {
 
@@ -481,7 +486,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') ) {