[freeside-commits] branch master updated. dd02aa5b102c66726401b3b69d2d91f2b6918d25

[Ivan]

The branch, master has been updated
       via  dd02aa5b102c66726401b3b69d2d91f2b6918d25 (commit)
       via  2f3853d914dc965c3a398edf105a9524a1d67456 (commit)
       via  89a387874554b561f87d7ad5958f915f4feb95d6 (commit)
      from  7ca9326e9367cc930df0fb15283cab480b24f279 (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 dd02aa5b102c66726401b3b69d2d91f2b6918d25
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 21 00:30:38 2014 -0700

    better error

diff --git a/FS/FS/part_pkg/bulk_Common.pm b/FS/FS/part_pkg/bulk_Common.pm
index 3477c44..67f2caf 100644
--- a/FS/FS/part_pkg/bulk_Common.pm
+++ b/FS/FS/part_pkg/bulk_Common.pm
@@ -70,7 +70,8 @@ sub calc_recur {
     next if $pkg_svc->bulk_skip;
 
     my @label = $cust_svc->label_long( $$sdate, $last_bill );
-    die "fatal: no label found, wtf?" unless scalar(@label); #?
+    die "fatal: no label found for svcnum ". $cust_svc->svcnum
+      unless scalar(@label); #?
     my $svc_details = $label[0]. ': '. $label[1]. ': ';
     $part_svc_label{$cust_svc->svcpart} ||= $label[0];
 

commit 2f3853d914dc965c3a398edf105a9524a1d67456
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 21 00:29:13 2014 -0700

    full backtrace

diff --git a/FS/FS/option_Common.pm b/FS/FS/option_Common.pm
index 74adbed..8c69089 100644
--- a/FS/FS/option_Common.pm
+++ b/FS/FS/option_Common.pm
@@ -3,6 +3,7 @@ package FS::option_Common;
 use strict;
 use base qw( FS::Record );
 use vars qw( $DEBUG );
+use Carp qw( cluck );
 use Scalar::Util qw( blessed );
 use FS::Record qw( qsearch qsearchs dbh );
 
@@ -344,7 +345,7 @@ sub option {
       $pkey    => $self->get($pkey),
       $namecol => shift,
   };
-  warn "$self -> option: searching for ".
+  cluck "$self -> option: searching for ".
          join(' / ', map { "$_ => ". $hashref->{$_} } keys %$hashref )
     if $DEBUG;
   my $obj = qsearchs($option_table, $hashref);

commit 89a387874554b561f87d7ad5958f915f4feb95d6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 21 00:28:36 2014 -0700

    extraneous example comments

diff --git a/FS/FS/cdr/broadsoft.pm b/FS/FS/cdr/broadsoft.pm
index 423e96f..cc61002 100644
--- a/FS/FS/cdr/broadsoft.pm
+++ b/FS/FS/cdr/broadsoft.pm
@@ -10,7 +10,7 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
   'weight'        => 500,
   'header'        => 1,     #0 default, set to 1 to ignore the first line, or
                             # to higher numbers to ignore that number of lines
-  'type'          => 'csv', #csv (default), fixedlength or xls
+  'type'          => 'csv',
   'sep_char'      => ',',   #for csv, defaults to ,
   'disabled'      => 0,     #0 default, set to 1 to disable
 
diff --git a/FS/FS/cdr/netsapiens.pm b/FS/FS/cdr/netsapiens.pm
index 9d07aef..cf5f8d3 100644
--- a/FS/FS/cdr/netsapiens.pm
+++ b/FS/FS/cdr/netsapiens.pm
@@ -10,7 +10,7 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
   'weight'        => 160,
   'header'        => 1,     #0 default, set to 1 to ignore the first line, or
                             # to higher numbers to ignore that number of lines
-  'type'          => 'csv', #csv (default), fixedlength or xls
+  'type'          => 'csv',
   'sep_char'      => ',',   #for csv, defaults to ,
   'disabled'      => 0,     #0 default, set to 1 to disable
 
diff --git a/FS/FS/cdr/sansay.pm b/FS/FS/cdr/sansay.pm
index 8087c57..9a17908 100644
--- a/FS/FS/cdr/sansay.pm
+++ b/FS/FS/cdr/sansay.pm
@@ -10,7 +10,7 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
   'weight'        => 135,
   'header'        => 0,     #0 default, set to 1 to ignore the first line, or
                             # to higher numbers to ignore that number of lines
-  'type'          => 'csv', #csv (default), fixedlength or xls
+  'type'          => 'csv',
   'sep_char'      => ';',   #for csv, defaults to ,
   'disabled'      => 0,     #0 default, set to 1 to disable
 
diff --git a/FS/FS/cdr/sonus.pm b/FS/FS/cdr/sonus.pm
index f219239..4a85004 100644
--- a/FS/FS/cdr/sonus.pm
+++ b/FS/FS/cdr/sonus.pm
@@ -10,7 +10,7 @@ use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
   'weight'        => 525,
   'header'        => 0,     #0 default, set to 1 to ignore the first line, or
                             # to higher numbers to ignore that number of lines
-  'type'          => 'csv', #csv (default), fixedlength or xls
+  'type'          => 'csv',
   'sep_char'      => ',',   #for csv, defaults to ,
   'import_fields' => [
     'src', # also customer id

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

Summary of changes:
 FS/FS/cdr/broadsoft.pm        |    2 +-
 FS/FS/cdr/netsapiens.pm       |    2 +-
 FS/FS/cdr/sansay.pm           |    2 +-
 FS/FS/cdr/sonus.pm            |    2 +-
 FS/FS/option_Common.pm        |    3 ++-
 FS/FS/part_pkg/bulk_Common.pm |    3 ++-
 6 files changed, 8 insertions(+), 6 deletions(-)