X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTemplate_Mixin.pm;h=d1bcec5d5164e742a16d660ba65f6cdd22460e20;hb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;hp=64b9db5606af178931c162022e0db283c9c9ad40;hpb=36f114fa4084bfcfb52ed4673d54d1a0a7e33d15;p=freeside.git

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 64b9db560..d1bcec5d5 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2186,7 +2186,30 @@ sub _items_cust_bill_pkg {
                           'no_usage'        => $opt{'no_usage'},
                         );
 
-      if ( $cust_bill_pkg->pkgnum > 0 ) {
+      if ( ref($cust_bill_pkg) eq 'FS::quotation_pkg' ) {
+
+        warn "$me _items_cust_bill_pkg cust_bill_pkg is quotation_pkg\n"
+          if $DEBUG > 1;
+
+        if ( $cust_bill_pkg->setup != 0 ) {
+          my $description = $desc;
+          $description .= ' Setup'
+            if $cust_bill_pkg->recur != 0
+            || $discount_show_always
+            || $cust_bill_pkg->recur_show_zero;
+          push @b, {
+            'description' => $description,
+            'amount'      => sprintf("%.2f", $cust_bill_pkg->setup),
+          };
+        }
+        if ( $cust_bill_pkg->recur != 0 ) {
+          push @b, {
+            'description' => "$desc (". $cust_bill_pkg->part_pkg->freq_pretty.")",
+            'amount'      => sprintf("%.2f", $cust_bill_pkg->recur),
+          };
+        }
+
+      } elsif ( $cust_bill_pkg->pkgnum > 0 ) {
 
         warn "$me _items_cust_bill_pkg cust_bill_pkg is non-tax\n"
           if $DEBUG > 1;