[freeside-commits] branch master updated. 40d974d3ce9ac2ae6cbdd415ae00bfbf7b73beef

Ivan ivan at 420.am
Mon Jun 18 21:40:30 PDT 2012


The branch, master has been updated
       via  40d974d3ce9ac2ae6cbdd415ae00bfbf7b73beef (commit)
      from  330f2110dfa35f690533c8baf25e2609a8b6d4a6 (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 40d974d3ce9ac2ae6cbdd415ae00bfbf7b73beef
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Jun 18 21:40:27 2012 -0700

    fix compilation error fallout from including FS::Misc in FS::Conf, RT#17620

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0314992..9cfea20 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -13,7 +13,7 @@ use FS::payby;
 use FS::conf;
 use FS::Record qw(qsearch qsearchs);
 use FS::UID qw(dbh datasrc use_confcompat);
-use FS::Misc;
+use FS::Misc::Invoicing qw( spool_formats );
 use FS::Misc::Geo;
 
 $base_dir = '%%%FREESIDE_CONF%%%';
@@ -3042,7 +3042,7 @@ and customer address. Include units.',
     'section'     => 'invoicing',
     'description' => 'Enable FTP of raw invoice data - format.',
     'type'        => 'select',
-    'options'     => [ FS::Misc::spool_formats() ],
+    'options'     => [ spool_formats() ],
   },
 
   {
@@ -3078,7 +3078,7 @@ and customer address. Include units.',
     'section'     => 'invoicing',
     'description' => 'Enable spooling of raw invoice data - format.',
     'type'        => 'select',
-    'options'     => [ FS::Misc::spool_formats() ],
+    'options'     => [ spool_formats() ],
   },
 
   {
diff --git a/FS/FS/Misc/Invoicing.pm b/FS/FS/Misc/Invoicing.pm
new file mode 100644
index 0000000..2fc52a9
--- /dev/null
+++ b/FS/FS/Misc/Invoicing.pm
@@ -0,0 +1,26 @@
+package FS::Misc::Invoicing;
+use base qw( Exporter );
+
+use vars qw( @EXPORT_OK );
+ at EXPORT_OK = qw( spool_formats );
+
+=head1 NAME
+
+FS::Misc::Invoicing - Invoice subroutines
+
+=head1 SYNOPSIS
+
+use FS::Misc::Invoicing qw( spool_formats );
+
+=item spool_formats
+  
+Returns a list of the invoice spool formats.
+
+=cut
+
+sub spool_formats {
+  qw(default oneline billco bridgestone)
+}
+
+1;
+
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index d94ab20..35ab9f3 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -1753,7 +1753,7 @@ Options are:
 
 =over 4
 
-=item format - any of FS::Misc::spool_formats
+=item format - any of FS::Misc::::Invoicing::spool_formats
 
 =item dest - if set (to POST, EMAIL or FAX), only sends spools invoices if the
 customer has the corresponding invoice destinations set (see
diff --git a/FS/FS/part_event/Action/cust_bill_send_csv_ftp.pm b/FS/FS/part_event/Action/cust_bill_send_csv_ftp.pm
index 8d2e36c..56ba680 100644
--- a/FS/FS/part_event/Action/cust_bill_send_csv_ftp.pm
+++ b/FS/FS/part_event/Action/cust_bill_send_csv_ftp.pm
@@ -2,7 +2,7 @@ package FS::part_event::Action::cust_bill_send_csv_ftp;
 
 use strict;
 use base qw( FS::part_event::Action );
-use FS::Misc;
+use FS::Misc::Invoicing qw( spool_formats );
 
 sub description { 'Upload CSV invoice data to an FTP server'; }
 
@@ -16,7 +16,7 @@ sub option_fields {
   (
     'ftpformat'   => { label   => 'Format',
                        type    =>'select',
-                       options => [ FS::Misc::spool_formats() ],
+                       options => [ spool_formats() ],
                      },
     'ftpserver'   => 'FTP server',
     'ftpusername' => 'FTP username',
diff --git a/FS/FS/part_event/Action/cust_bill_spool_csv.pm b/FS/FS/part_event/Action/cust_bill_spool_csv.pm
index 24c26ff..14349a9 100644
--- a/FS/FS/part_event/Action/cust_bill_spool_csv.pm
+++ b/FS/FS/part_event/Action/cust_bill_spool_csv.pm
@@ -2,7 +2,7 @@ package FS::part_event::Action::cust_bill_spool_csv;
 
 use strict;
 use base qw( FS::part_event::Action );
-use FS::Misc;
+use FS::Misc::Invoicing qw( spool_formats );
 
 sub description { 'Spool CSV invoice data'; }
 
@@ -16,7 +16,7 @@ sub option_fields {
   (
     'spoolformat'       => { label   => 'Format',
                              type    => 'select',
-                             options => [ FS::Misc::spool_formats() ],
+                             options => [ spool_formats() ],
                            },
     'spoolbalanceover'  => { label =>
                                'If balance (this invoice and previous) over',

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

Summary of changes:
 FS/FS/Conf.pm                                     |    6 ++--
 FS/FS/Misc/Invoicing.pm                           |   26 +++++++++++++++++++++
 FS/FS/cust_bill.pm                                |    2 +-
 FS/FS/part_event/Action/cust_bill_send_csv_ftp.pm |    4 +-
 FS/FS/part_event/Action/cust_bill_spool_csv.pm    |    4 +-
 5 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 FS/FS/Misc/Invoicing.pm




More information about the freeside-commits mailing list