From 2413a3d43808ea6567bf25215d810bf102c498fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 22 Sep 2011 21:42:31 +0000
Subject: [PATCH] random cleanups

---
 FS/FS/cust_main_county.pm |  2 +-
 FS/FS/cust_pkg_reason.pm  |  2 --
 FS/FS/m2name_Common.pm    |  4 +---
 FS/FS/option_Common.pm    |  5 ++---
 FS/FS/part_event.pm       |  6 ++----
 FS/FS/part_svc.pm         |  2 +-
 FS/FS/reason_type.pm      | 10 ----------
 FS/FS/svc_www.pm          | 18 +++++++++---------
 8 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm
index e84fa98f9..effc42881 100644
--- a/FS/FS/cust_main_county.pm
+++ b/FS/FS/cust_main_county.pm
@@ -328,7 +328,7 @@ sub taxline {
             'taxnum'     => $self->taxnum,
             'year'       => 1900+$year,
             'month'      => $mon,
-            'amount'     => sprintf("%.2f", $addl ),
+            'amount'     => sprintf('%.2f', $addl ),
           } );
           if ($cust_bill_pkg->billpkgnum) {
             $cust_tax_exempt_pkg->billpkgnum($cust_bill_pkg->billpkgnum);
diff --git a/FS/FS/cust_pkg_reason.pm b/FS/FS/cust_pkg_reason.pm
index 72a23198d..719d6dbc4 100644
--- a/FS/FS/cust_pkg_reason.pm
+++ b/FS/FS/cust_pkg_reason.pm
@@ -319,8 +319,6 @@ sub _upgrade_data { # class method
 
 =head1 BUGS
 
-Here be termites.  Don't use on wooden computers.
-
 =head1 SEE ALSO
 
 L<FS::Record>, schema.html from the base documentation.
diff --git a/FS/FS/m2name_Common.pm b/FS/FS/m2name_Common.pm
index e9dcee9b9..e08d5cbbe 100644
--- a/FS/FS/m2name_Common.pm
+++ b/FS/FS/m2name_Common.pm
@@ -16,9 +16,7 @@ FS::m2name_Common - Mixin class for tables with a related table listing names
 
 =head1 SYNOPSIS
 
-use FS::m2name_Common;
-
-@ISA = qw( FS::m2name_Common FS::Record );
+    use base qw( FS::m2name_Common FS::Record );
 
 =head1 DESCRIPTION
 
diff --git a/FS/FS/option_Common.pm b/FS/FS/option_Common.pm
index 26bb7caef..182356b3b 100644
--- a/FS/FS/option_Common.pm
+++ b/FS/FS/option_Common.pm
@@ -1,12 +1,11 @@
 package FS::option_Common;
 
 use strict;
-use vars qw( @ISA $DEBUG );
+use base qw( FS::Record );
+use vars qw( $DEBUG );
 use Scalar::Util qw( blessed );
 use FS::Record qw( qsearch qsearchs dbh );
 
-@ISA = qw( FS::Record );
-
 $DEBUG = 0;
 
 =head1 NAME
diff --git a/FS/FS/part_event.pm b/FS/FS/part_event.pm
index 8d1e7b0d6..dfbb6a5d3 100644
--- a/FS/FS/part_event.pm
+++ b/FS/FS/part_event.pm
@@ -1,18 +1,16 @@
 package FS::part_event;
 
 use strict;
-use vars qw( @ISA $DEBUG );
+use base qw( FS::m2name_Common FS::option_Common );
+use vars qw( $DEBUG );
 use Carp qw(confess);
 use FS::Record qw( dbh qsearch qsearchs );
-use FS::option_Common;
-use FS::m2name_Common;
 use FS::Conf;
 use FS::part_event_option;
 use FS::part_event_condition;
 use FS::cust_event;
 use FS::agent;
 
-@ISA = qw( FS::m2name_Common FS::option_Common ); # FS::Record );
 $DEBUG = 0;
 
 =head1 NAME
diff --git a/FS/FS/part_svc.pm b/FS/FS/part_svc.pm
index 1306d4199..4d56feef2 100644
--- a/FS/FS/part_svc.pm
+++ b/FS/FS/part_svc.pm
@@ -82,7 +82,7 @@ the part_svc_column table appropriately (see L<FS::part_svc_column>).
 
 =item I<svcdb>__I<field> - Default or fixed value for I<field> in I<svcdb>.
 
-=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null or empty (no default), `D' for default, `F' for fixed (unchangeable), `M' for manual selection from inventory, or `A' for automatic selection from inventory. 
+=item I<svcdb>__I<field>_flag - defines I<svcdb>__I<field> action: null or empty (no default), `D' for default, `F' for fixed (unchangeable), , `S' for selectable choice, `M' for manual selection from inventory, or `A' for automatic selection from inventory.  For virtual fields, can also be 'X' for excluded.
 
 =back
 
diff --git a/FS/FS/reason_type.pm b/FS/FS/reason_type.pm
index 4425c64a0..a603809e2 100644
--- a/FS/FS/reason_type.pm
+++ b/FS/FS/reason_type.pm
@@ -131,12 +131,7 @@ sub enabled_reasons {
 		     } );
 }
 
-# _populate_initial_data
-#
 # Used by FS::Setup to initialize a new database.
-#
-#
-
 sub _populate_initial_data {  # class method
   my ($self, %opts) = @_;
 
@@ -169,12 +164,7 @@ sub _populate_initial_data {  # class method
 
 }
 
-# _upgrade_data
-#
 # Used by FS::Upgrade to migrate to a new database.
-#
-#
-
 sub _upgrade_data {  # class method
   my ($self, %opts) = @_;
 
diff --git a/FS/FS/svc_www.pm b/FS/FS/svc_www.pm
index 7e02d818a..19f270063 100644
--- a/FS/FS/svc_www.pm
+++ b/FS/FS/svc_www.pm
@@ -163,15 +163,15 @@ returns the error, otherwise returns false.
 
 =cut
 
-sub replace {
-  my ( $new, $old ) = ( shift, shift );
-  my $error;
-
-  $error = $new->SUPER::replace($old, @_);
-  return $error if $error;
-
-  '';
-}
+#sub replace {
+#  my ( $new, $old ) = ( shift, shift );
+#  my $error;
+#
+#  $error = $new->SUPER::replace($old, @_);
+#  return $error if $error;
+#
+#  '';
+#}
 
 =item suspend
 
-- 
2.11.0