[freeside-commits] branch master updated. 86ba66f385625b57c8d06a6beb3c63f6f452a29f

[Carl J. Adams-Collier]

The branch, master has been updated
       via  86ba66f385625b57c8d06a6beb3c63f6f452a29f (commit)
      from  4604b94aa453d00d16f2de0533b9138e0e9c3355 (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 86ba66f385625b57c8d06a6beb3c63f6f452a29f
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Thu Sep 11 13:14:50 2014 -0700

    FS RT #27189 - only printing 'each' if package quantity > 1 ; removed now-obsolete checks for pluralization of 'month'

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 0063567..be0200c 100644
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -171,14 +171,15 @@ sub calc_discount {
     my $format;
 
     if ( $months eq '1' ) {
-      $d .= "discount of $money_char$amount each";
+      $d .= "discount of $money_char$amount";
+      $d .= " each" if $cust_pkg->quantity > 1;
       $format = 'Undiscounted amount: %s%.2f';
     } else {
       $d .= 'setup ' if defined $param->{'setup_charge'};
       $d .= 'discount of '. $discount->description_short;
-      $d .= " for $months month". ( $months!=1 ? 's' : '' )
+      $d .= " for $months months"
 	unless defined $param->{'setup_charge'};
-      $d .= ": $money_char$amount" if $months != 1 || $discount->percent;
+      $d .= ": $money_char$amount" if $discount->percent;
       $format = 'Undiscounted monthly amount: %s%.2f';
     }
 

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

Summary of changes:
 FS/FS/part_pkg/discount_Mixin.pm |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)