projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[freeside.git]
/
FS
/
FS
/
cust_bill_pkg.pm
diff --git
a/FS/FS/cust_bill_pkg.pm
b/FS/FS/cust_bill_pkg.pm
index
f196a0a
..
e866a3f
100644
(file)
--- a/
FS/FS/cust_bill_pkg.pm
+++ b/
FS/FS/cust_bill_pkg.pm
@@
-955,8
+955,6
@@
sub cust_bill_pkg_display {
my $default =
new FS::cust_bill_pkg_display { billpkgnum =>$self->billpkgnum };
my $default =
new FS::cust_bill_pkg_display { billpkgnum =>$self->billpkgnum };
- return ( $default ) unless defined dbdef->table('cust_bill_pkg_display');#hmmm
-
my $type = $opt{type} if exists $opt{type};
my @result;
my $type = $opt{type} if exists $opt{type};
my @result;
@@
-1043,19
+1041,8
@@
sub cust_bill_pkg_discount {
=cut
=cut
-sub recur_show_zero {
- #my $self = shift;
- # $self->recur == 0
- #&& $self->pkgnum
- #&& $self->cust_pkg->part_pkg->recur_show_zero;
-
- shift->_X_show_zero('recur');
-
-}
-
-sub setup_show_zero {
- shift->_X_show_zero('setup');
-}
+sub recur_show_zero { shift->_X_show_zero('recur'); }
+sub setup_show_zero { shift->_X_show_zero('setup'); }
sub _X_show_zero {
my( $self, $what ) = @_;
sub _X_show_zero {
my( $self, $what ) = @_;
@@
-1082,9
+1069,9
@@
and 'setuprecur' (set to "setup" or "recur" to limit to one or the other).
sub owed_sql {
my ($class, $start, $end, %opt) = @_;
my $charged =
sub owed_sql {
my ($class, $start, $end, %opt) = @_;
my $charged =
- $opt{setuprecur} =~ /^s/ ? 'setup' :
- $opt{setuprecur} =~ /^r/ ? 'recur' :
- '
setup +
recur';
+ $opt{setuprecur} =~ /^s/ ? '
cust_bill_pkg.
setup' :
+ $opt{setuprecur} =~ /^r/ ? '
cust_bill_pkg.
recur' :
+ '
cust_bill_pkg.setup + cust_bill_pkg.
recur';
if ( $opt{no_usage} ) {
$charged .= ' - ' . $class->usage_sql;
if ( $opt{no_usage} ) {
$charged .= ' - ' . $class->usage_sql;