[freeside-commits] branch master updated. 4a023e047c3a0c44606b7c549b1b4c6e157f8222

[Mark Wells]

The branch, master has been updated
       via  4a023e047c3a0c44606b7c549b1b4c6e157f8222 (commit)
      from  9324c0938ae5422f0836c56b59dee1b12c8526a7 (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 4a023e047c3a0c44606b7c549b1b4c6e157f8222
Author: Mark Wells <mark at freeside.biz>
Date:   Tue May 31 18:43:13 2016 -0700

    ipifony charge import: add option to always bill on the customer's next bill date, #38342

diff --git a/FS/bin/freeside-ipifony-download b/FS/bin/freeside-ipifony-download
index ee1f4bd..10faa74 100644
--- a/FS/bin/freeside-ipifony-download
+++ b/FS/bin/freeside-ipifony-download
@@ -13,7 +13,7 @@ use File::Copy qw(copy);
 use Text::CSV;
 
 my %opt;
-getopts('vqa:P:C:e:', \%opt);
+getopts('vqNa:P:C:e:', \%opt);
 
 # Product codes that are subject to flat rate E911 charges.  For these 
 # products, the'quantity' field represents the number of lines.
@@ -32,6 +32,7 @@ sub HELP_MESSAGE { '
       freeside-ipifony-download 
         [ -v ]
         [ -q ]
+        [ -N ]
         [ -a archivedir ]
         [ -P port ]
         [ -C category ]
@@ -192,7 +193,8 @@ FILE: foreach my $filename (@$files) {
     if ( $next_bill_date ) {
       my ($bill_month, $bill_year) = (localtime($next_bill_date))[4, 5];
       my ($this_month, $this_year) = (localtime(time))[4, 5];
-      if ( $this_month == $bill_month and $this_year == $bill_year ) {
+      if ( $opt{N} or 
+           $this_month == $bill_month and $this_year == $bill_year ) {
         $cust_main->set('charge_date', $next_bill_date);
       }
     }
@@ -296,6 +298,7 @@ freeside-ipifony-download - Download and import invoice items from IPifony.
       freeside-ipifony-download 
         [ -v ]
         [ -q ]
+        [ -N ]
         [ -a archivedir ]
         [ -P port ]
         [ -C category ]
@@ -312,12 +315,19 @@ have an authorization key to connect as that user.
 
 I<hostname>: the SFTP server.
 
+I<path>: the path on the server to the working directory. The working
+directory is the one containing the "ready/" and "done/" subdirectories.
+
 =head1 OPTIONAL PARAMETERS
 
 -v: Be verbose.
 
 -q: Include the quantity and unit price in the charge description.
 
+-N: Always bill the charges on the customer's next bill date, if they have
+one. Otherwise, charges will be billed on the next bill date only if it's
+within the current calendar month.
+
 -a I<archivedir>: Save a copy of the downloaded file to I<archivedir>.
 
 -P I<port>: Connect to that TCP port.

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

Summary of changes:
 FS/bin/freeside-ipifony-download |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)