[freeside-commits] freeside/FS/FS/cust_main Billing.pm, 1.18.2.4, 1.18.2.5

Ivan,,, ivan at wavetail.420.am
Sun Mar 6 17:36:29 PST 2011


Update of /home/cvs/cvsroot/freeside/FS/FS/cust_main
In directory wavetail.420.am:/tmp/cvs-serv7330/cust_main

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Billing.pm 
Log Message:
when bill_usage_on_cancel config is set, fix billing setup on cancellation of unbilled packages, RT#11651

Index: Billing.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing.pm,v
retrieving revision 1.18.2.4
retrieving revision 1.18.2.5
diff -u -w -d -r1.18.2.4 -r1.18.2.5
--- Billing.pm	27 Jan 2011 05:18:39 -0000	1.18.2.4
+++ Billing.pm	7 Mar 2011 01:36:27 -0000	1.18.2.5
@@ -820,7 +820,9 @@
 
   my $setup = 0;
   my $unitsetup = 0;
-  if ( $options{'resetup'}
+  if (     ! $options{recurring_only}
+       and ! $options{cancel}
+       and ( $options{'resetup'}
        || ( ! $cust_pkg->setup
             && ( ! $cust_pkg->start_date
                  || $cust_pkg->start_date <= $time
@@ -831,7 +833,7 @@
                     )
                )
           )
-        and !$options{recurring_only}
+           )
     )
   {
     



More information about the freeside-commits mailing list