[freeside-commits] freeside/FS/FS/cust_main Billing.pm, 1.18.2.6, 1.18.2.7

[Erik Levinson]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Billing.pm 
Log Message:
add waive setup fee upon package order feature, RT12568

Index: Billing.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing.pm,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.7
diff -u -w -d -r1.18.2.6 -r1.18.2.7
--- Billing.pm	10 Mar 2011 02:26:50 -0000	1.18.2.6
+++ Billing.pm	25 Apr 2011 04:37:11 -0000	1.18.2.7
@@ -846,6 +846,8 @@
   {
     
     warn "    bill setup\n" if $DEBUG > 1;
+
+    unless ( $cust_pkg->waive_setup ) {
     $lineitems++;
 
     $setup = eval { $cust_pkg->calc_setup( $time, \@details ) };
@@ -853,6 +855,7 @@
       if $@;
 
     $unitsetup = $cust_pkg->part_pkg->unit_setup || $setup; #XXX uuh
+    }
 
     $cust_pkg->setfield('setup', $time)
       unless $cust_pkg->setup;