X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill_pkg.pm;h=77cdd11230fccf6f4e241e6842323fb13eaf3b86;hb=5f7fe6b10990eee2d1e8a9608cfd2bb656912477;hp=aee2a5429e6c47a9dacbd813b1a5a243ed5febd8;hpb=26e91d6afcd21b7113cdc6aebb37ad5acd3d5de8;p=freeside.git

diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm
index aee2a5429..77cdd1123 100644
--- a/FS/FS/cust_bill_pkg.pm
+++ b/FS/FS/cust_bill_pkg.pm
@@ -898,12 +898,25 @@ sub cust_bill_pkg_discount {
 =cut
 
 sub recur_show_zero {
-  my $self = shift;
+  #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 _X_show_zero {
+  my( $self, $what ) = @_;
 
-     $self->recur == 0
-  && $self->pkgnum
-  && $self->cust_pkg->part_pkg->recur_show_zero;
+  return 0 unless $self->$what() == 0 && $self->pkgnum;
 
+  $self->cust_pkg->_X_show_zero($what);
 }
 
 =back