[freeside-commits] freeside/FS/FS/cust_main Billing.pm,1.24,1.25

[Ivan,,,]

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

Modified Files:
	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.24
retrieving revision 1.25
diff -u -w -d -r1.24 -r1.25
--- Billing.pm	19 Jan 2011 00:41:00 -0000	1.24
+++ Billing.pm	7 Mar 2011 01:36:26 -0000	1.25
@@ -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}
+           )
     )
   {