[freeside-commits] freeside/FS/FS cust_bill.pm, 1.222, 1.223 cust_bill_pkg.pm, 1.25, 1.26

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv25617/FS/FS

Modified Files:
	cust_bill.pm cust_bill_pkg.pm 
Log Message:
call details in self-service

Index: cust_bill_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill_pkg.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cust_bill_pkg.pm	30 Aug 2008 21:34:42 -0000	1.25
+++ cust_bill_pkg.pm	2 Sep 2008 15:37:07 -0000	1.26
@@ -455,18 +455,6 @@
     : $self->getfield('unitrecur');
 }
 
-=item separate_cdr
-
-Returns true if this line item represents a cdr line item in its own section.
-  
-=cut
-
-# lame, but works for now
-sub separate_cdr {
-  my( $self ) = shift;
-  $self->pkgnum && $self->section ne $self->part_pkg->categoryname;
-}
-
 =item usage CLASSNUM
 
 Returns the amount of the charge associated with usage class CLASSNUM if

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -d -r1.222 -r1.223
--- cust_bill.pm	30 Aug 2008 21:34:42 -0000	1.222
+++ cust_bill.pm	2 Sep 2008 15:37:07 -0000	1.223
@@ -2392,12 +2392,17 @@
 =cut
 
 sub print_html {
-  my( $self, $today, $template, $cid ) = @_;
+  my $self = shift;
+  my %params;
+  if ( ref $_[0]  ) {
+    %params = %{ shift() }; 
+  }else{
+    $params{'time'} = shift;
+    $params{'template'} = shift;
+    $params{'cid'} = shift;
+  }
 
-  my %params = ( 'format' => 'html' );
-  $params{'time'} = $today if $today;
-  $params{'template'} = $template if $template;
-  $params{'cid'} = $cid if $cid;
+  $params{'format'} = 'html';
 
   $self->print_generic( %params );
 }
@@ -2682,9 +2687,7 @@
 
   my @b = ();
   my $last_pkgnum = '';
-  foreach my $cust_bill_pkg ( grep { $unsquelched ? 1 : ! $_->separate_cdr }
-                              @$cust_bill_pkg
-                            )
+  foreach my $cust_bill_pkg ( @$cust_bill_pkg )
   {
 
     my $cust_pkg = $cust_bill_pkg->cust_pkg;