[freeside-commits] branch master updated. 9066ea72aa1cd817e81fa828358fb26cec508087

[Ivan]

The branch, master has been updated
       via  9066ea72aa1cd817e81fa828358fb26cec508087 (commit)
       via  8a4f82e9928327f4f6ea8dc1364b71819a63f530 (commit)
      from  179e9a70dfec14043be265986882ee728454254a (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 9066ea72aa1cd817e81fa828358fb26cec508087
Merge: 8a4f82e 179e9a7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 22 10:15:05 2013 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 8a4f82e9928327f4f6ea8dc1364b71819a63f530
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Mar 22 10:14:54 2013 -0700

    fix flat_introrate price plan vs. quantities, RT#22134, RT#13136

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index a45300c..939a625 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1038,7 +1038,7 @@ sub _make_lines {
       if ( $@ );
 
     #base_cancel???
-    $unitrecur = $cust_pkg->part_pkg->base_recur || $recur; #XXX uuh
+    $unitrecur = $cust_pkg->base_recur( \$sdate ) || $recur; #XXX uuh, better
 
     if ( $increment_next_bill ) {
 

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

Summary of changes:
 FS/FS/cust_main/Billing.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)