projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
..
0561f9c
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 base qw( FS::Record );
use strict;
-use FS::Record qw( qsearch qsearchs );
-use FS::discount_class;
=head1 NAME
=head1 NAME
@@
-176,12
+174,12
@@
sub description_short {
my $money_char = $conf->config('money_char') || '$';
my $desc = $self->name ? $self->name.': ' : '';
my $money_char = $conf->config('money_char') || '$';
my $desc = $self->name ? $self->name.': ' : '';
- $desc .= $money_char. sprintf('%.2f/month
', $self->amount)
+ $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/;
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;
if $self->percent > 0;
$desc;
@@
-206,12
+204,6
@@
sub classname {
$discount_class ? $discount_class->classname : '(none)';
}
$discount_class ? $discount_class->classname : '(none)';
}
-sub discount_class {
- my $self = shift;
- qsearchs('discount_class', { 'classnum' => $self->classnum });
-}
-
-
=back
=head1 BUGS
=back
=head1 BUGS