[freeside-commits] freeside/FS/FS cust_pkg.pm, 1.179.2.16, 1.179.2.17

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_pkg.pm 
Log Message:
add more debug tracing to invoice generation, RT#11452

Index: cust_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg.pm,v
retrieving revision 1.179.2.16
retrieving revision 1.179.2.17
diff -u -w -d -r1.179.2.16 -r1.179.2.17
--- cust_pkg.pm	5 Feb 2011 05:18:44 -0000	1.179.2.16
+++ cust_pkg.pm	5 Feb 2011 05:45:41 -0000	1.179.2.17
@@ -1767,7 +1767,7 @@
 sub h_cust_svc {
   my $self = shift;
   warn "$me _h_cust_svc called on $self\n"
-    if $DEBUG > 1;
+    if $DEBUG;
 
   my ($end, $start, $mode) = @_;
   my @cust_svc = $self->_sort_cust_svc(
@@ -2122,7 +2122,7 @@
 sub h_labels {
   my $self = shift;
   warn "$me _h_labels called on $self\n"
-    if $DEBUG > 1;
+    if $DEBUG;
   map { [ $_->label(@_) ] } $self->h_cust_svc(@_);
 }
 
@@ -2156,13 +2156,13 @@
   my( $self, $method ) = ( shift, shift );
 
   warn "$me _labels_short called on $self with $method method\n"
-    if $DEBUG > 1;
+    if $DEBUG;
 
   my $conf = new FS::Conf;
   my $max_same_services = $conf->config('cust_bill-max_same_services') || 5;
 
   warn "$me _labels_short populating \%labels\n"
-    if $DEBUG > 1;
+    if $DEBUG;
 
   my %labels;
   #tie %labels, 'Tie::IxHash';
@@ -2170,17 +2170,24 @@
     foreach $self->$method(@_);
 
   warn "$me _labels_short populating \@labels\n"
-    if $DEBUG > 1;
+    if $DEBUG;
 
   my @labels;
   foreach my $label ( keys %labels ) {
     my %seen = ();
     my @values = grep { ! $seen{$_}++ } @{ $labels{$label} };
     my $num = scalar(@values);
+    warn "$me _labels_short $num items for $label\n"
+      if $DEBUG;
+
     if ( $num > $max_same_services ) {
+      warn "$me _labels_short   more than $max_same_services, so summarizing\n"
+        if $DEBUG;
       push @labels, "$label ($num)";
     } else {
       if ( $conf->exists('cust_bill-consolidate_services') ) {
+        warn "$me _labels_short   consolidating services\n"
+          if $DEBUG;
         # push @labels, "$label: ". join(', ', @values);
         while ( @values ) {
           my $detail = "$label: ";
@@ -2190,6 +2197,8 @@
           push @labels, $detail;
         }
       } else {
+        warn "$me _labels_short   adding service data\n"
+          if $DEBUG;
         push @labels, map { "$label: $_" } @values;
       }
     }