[freeside-commits] branch FREESIDE_4_BRANCH updated. ee2c24000b674f533f847da66e6852e9748944bb

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  ee2c24000b674f533f847da66e6852e9748944bb (commit)
      from  6ae8ddf64da20f220a9136d1282deb1b6c3d4af6 (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 ee2c24000b674f533f847da66e6852e9748944bb
Author: Mark Wells <mark at freeside.biz>
Date:   Sun Feb 28 18:16:26 2016 -0800

    omit quantity and unit price from IPifony charge descriptions, #39083

diff --git a/FS/bin/freeside-ipifony-download b/FS/bin/freeside-ipifony-download
index 51db035..ee1f4bd 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('va:P:C:e:', \%opt);
+getopts('vqa: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.
@@ -31,6 +31,7 @@ sub HELP_MESSAGE { '
   Usage:
       freeside-ipifony-download 
         [ -v ]
+        [ -q ]
         [ -a archivedir ]
         [ -P port ]
         [ -C category ]
@@ -201,10 +202,12 @@ FILE: foreach my $filename (@$files) {
       amount      => $hash{unit_price},
       quantity    => $hash{quantity},
       start_date  => $cust_main->get('charge_date'),
-      pkg         => $hash{date_desc} .
-                   ' (' . $hash{quantity} . ' @ $' . $hash{unit_price} . ' ea)',
+      pkg         => $hash{date_desc},
       taxclass    => $TAXCLASSES{ $hash{taxclass} },
     );
+    if ( $opt{q} ) {
+      $charge_opt{pkg} .= ' (' . $hash{quantity} . ' @ $' . $hash{unit_price} . ' ea)';
+    }
     if (my $classname = $hash{classname}) {
       if (!exists($classnum_of{$classname}) ) {
         # then look it up
@@ -292,6 +295,7 @@ freeside-ipifony-download - Download and import invoice items from IPifony.
 
       freeside-ipifony-download 
         [ -v ]
+        [ -q ]
         [ -a archivedir ]
         [ -P port ]
         [ -C category ]
@@ -312,6 +316,8 @@ I<hostname>: the SFTP server.
 
 -v: Be verbose.
 
+-q: Include the quantity and unit price in the charge description.
+
 -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 |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)