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

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

diff --git a/FS/FS/discount.pm b/FS/FS/discount.pm
index e66d78c..361e0b4 100644 (file)
--- a/FS/FS/discount.pm
+++ b/FS/FS/discount.pm
@@ -2,8 +2,6 @@ package FS::discount;
 use base qw( FS::Record );
 
 use strict;
-use FS::Record qw( qsearch qsearchs );
-use FS::discount_class;
 
 =head1 NAME
 
@@ -175,13 +173,18 @@ sub description_short {
   my $conf = new FS::Conf;
   my $money_char = $conf->config('money_char') || '$';  
 
-  my $desc = $self->name ? $self->name.': ' : '';
-  $desc .= $money_char. sprintf('%.2f/month ', $self->amount)
+  my $desc;
+  if ( $self->name ) {
+    $desc = $self->name . ': ';
+  } else {
+    $desc = 'Discount of ';
+  }
+  $desc .= $money_char. sprintf('%.2f/month', $self->amount)
     if $self->amount > 0;
 
   ( my $percent = $self->percent ) =~ s/\.0+$//;
   $percent =~ s/(\.\d*[1-9])0+$/$1/;
-  $desc .= $percent. '% '
+  $desc .= $percent. '%'
     if $self->percent > 0;
 
   $desc;
@@ -206,12 +209,6 @@ sub classname {
   $discount_class ? $discount_class->classname : '(none)';
 }
 
-sub discount_class {
-  my $self = shift;
-  qsearchs('discount_class', { 'classnum' => $self->classnum });
-}
-
-
 =back
 
 =head1 BUGS