X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fdiscount_Mixin.pm;h=be0200c77c3e5de2ad945f0bd5d6ec6629b3b3bc;hb=86ba66f385625b57c8d06a6beb3c63f6f452a29f;hp=0063567dd4fbb50931e50749e6666de148cec10e;hpb=55a9939e17ab945d00336317b9842f17cc27ba6e;p=freeside.git

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 0063567dd..be0200c77 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';
     }