[freeside-commits] branch master updated. 1a7a84610a1bb67b0fda20a2eeed10e50b984178

[Mark Wells]

The branch, master has been updated
       via  1a7a84610a1bb67b0fda20a2eeed10e50b984178 (commit)
       via  25d9baac5e5ef0be9801b54f8365fc40b639a546 (commit)
      from  d7f622dc83e9050f83dd12abbaf1cd405a15aa22 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a7a84610a1bb67b0fda20a2eeed10e50b984178
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Nov 5 14:10:10 2012 -0800

    typo

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 28d5038..01fb99f 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -362,7 +362,7 @@ sub calc_usage {
                                  : 'default'
                              );
 
-  my $usage_nozero      = $self->option->('usage_nozero', 1);
+  my $usage_nozero      = $self->option('usage_nozero', 1);
 
   my $formatter = FS::detail_format->new($output_format, buffer => $details);
 

commit 25d9baac5e5ef0be9801b54f8365fc40b639a546
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Nov 5 14:09:50 2012 -0800

    fix ICS invoice spooling when service records are missing, #17620

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index dad5434..128aaf7 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2248,11 +2248,13 @@ sub print_csv {
                                    $part_svc_class->classname :
                                    '';
           }
-            
+
+          my $svc_x = $cust_svc->svc_x or 
+            warn "missing svc_x record for svc#".$cust_svc->svcnum."\n";
           push @details, sprintf('01%-9s%-20s%-47s',
             $cust_svc->svcnum,
             $svc_class{$svcpart},
-            $cust_svc->svc_x->label,
+            ($svc_x ? $svc_x->label : ''),
           );
         } #foreach $cust_svc
       } #if $cust_pkg

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_bill.pm         |    6 ++++--
 FS/FS/part_pkg/voip_cdr.pm |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)