X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_main%2FBilling.pm;h=79a0c9ed1495047cf2b44be8d638d24afe0a8841;hp=8a6056b67d32739fe8fc551e7a44943f63a3095a;hb=a8981b8fc11c032fd4fa1a3943c4785391a9ffb4;hpb=f1205344753e1b44945ccc0daa1c78d0f7fa7c45

diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index 8a6056b67..79a0c9ed1 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1253,10 +1253,8 @@ sub _make_lines {
         }
     }
 
-    if ($cust_pkg->waive_setup && $part_pkg->plan eq "prorate") {
-      $lineitems++;
-      $setup = 0 if $part_pkg->prorate_setup($cust_pkg, $time);
-    }
+    $lineitems++
+    if $cust_pkg->waive_setup && $part_pkg->can('prorate_setup') && $part_pkg->prorate_setup($cust_pkg, $time);
 
     $cust_pkg->setfield('setup', $time)
       unless $cust_pkg->setup;