[freeside-commits] branch master updated. a6f90db7a81b1cee5749e42878188577fa5d99b5

[Ivan]

The branch, master has been updated
       via  a6f90db7a81b1cee5749e42878188577fa5d99b5 (commit)
      from  ac8410cdb67639afeb84c84e975fffadf3e6cce1 (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 a6f90db7a81b1cee5749e42878188577fa5d99b5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Feb 8 11:48:23 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 3f4792e..7090ce7 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -602,6 +602,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;
@@ -617,6 +619,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;
@@ -871,7 +875,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(-)