[freeside-commits] branch FREESIDE_4_BRANCH updated. 327db72830c235a53d9a8ff2eec15c07eeeeb3ca

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  327db72830c235a53d9a8ff2eec15c07eeeeb3ca (commit)
      from  d0e6e5ffa6a1fab7b291a941927b24e26e174a01 (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 327db72830c235a53d9a8ff2eec15c07eeeeb3ca
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Feb 8 11:48:24 2017 -0800

    fix recurring display w/discounts, RT#41844

diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index 4c79c7d..be7de85 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -618,6 +618,8 @@ this customer that are active (recurring).
 
 =cut
 
+#recurring_pkgs?  different from cust_pkg idea of "active" which has
+# a setup vs not_yet_billed which doesn't
 sub active_pkgs {
   my $self = shift; 
   grep { my $part_pkg = $_->part_pkg;
@@ -633,6 +635,8 @@ are active (recurring).
 
 =cut
 
+#ncancelled_recurring_pkgs?  different from cust_pkg idea of "active" which has
+# a setup vs not_yet_billed which doesn't
 sub ncancelled_active_pkgs {
   my $self = shift; 
   grep { my $part_pkg = $_->part_pkg;
@@ -887,7 +891,7 @@ sub display_recurring {
         my $discount = $cust_pkg_discount->discount;
         #and only one of these for each
         $pkg_amount -= $discount->amount;
-        $pkg_amount -= $amount * $discount->percent/100;
+        $pkg_amount -= $pkg_amount * $discount->percent/100;
       }
 
       $pkg_amount *= ( $cust_pkg->quantity || 1 );

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

Summary of changes:
 FS/FS/cust_main/Packages.pm |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)