[freeside-commits] branch FREESIDE_4_BRANCH updated. b94ae73fdc40568f33b7f7dbdac15bda18fb9347

[Mitch Jackson]

The branch, FREESIDE_4_BRANCH has been updated
       via  b94ae73fdc40568f33b7f7dbdac15bda18fb9347 (commit)
      from  2134c57999b90936f5d92d068e67e39c9fe60b35 (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 b94ae73fdc40568f33b7f7dbdac15bda18fb9347
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Fri Jun 29 14:36:45 2018 -0500

    RT# 31208,80543 Issue converting quotation

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 653e69891..4d1079a04 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -3133,9 +3133,9 @@ sub _items_fee {
   my @cust_bill_pkg = grep { $_->feepart } $self->cust_bill_pkg;
   my $escape_function = $options{escape_function};
 
-  my $locale = $self->quotationnum
-             ? $self->prospect_main->locale
-             : $self->cust_main->locale;
+  my $locale = $self->cust_main
+             ? $self->cust_main->locale
+             : $self->prospect_main->locale;
 
   my @items;
   foreach my $cust_bill_pkg (@cust_bill_pkg) {

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

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