[freeside-commits] branch master updated. 36f114fa4084bfcfb52ed4673d54d1a0a7e33d15

[Ivan]

The branch, master has been updated
       via  36f114fa4084bfcfb52ed4673d54d1a0a7e33d15 (commit)
      from  8f89376bceb710bceb8d2d3b9dd7fe24e7d47cf3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 36f114fa4084bfcfb52ed4673d54d1a0a7e33d15
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jul 4 18:53:18 2012 -0700

    quotations, RT#16996

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 19b452e..64b9db5 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -2152,7 +2152,9 @@ sub _items_cust_bill_pkg {
       }
     }
 
-    my @cust_bill_pkg_display = $cust_bill_pkg->cust_bill_pkg_display;
+    my @cust_bill_pkg_display = $cust_bill_pkg->can('cust_bill_pkg_display')
+                                  ? $cust_bill_pkg->cust_bill_pkg_display
+                                  : ( $cust_bill_pkg );
 
     warn "$me _items_cust_bill_pkg considering cust_bill_pkg ".
          $cust_bill_pkg->billpkgnum. ", pkgnum ". $cust_bill_pkg->pkgnum. "\n"

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Template_Mixin.pm |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)