From 381992561d7b1a88e05d49d3e474a2fad25873c7 Mon Sep 17 00:00:00 2001
From: Mitch Jackson <mitch@freeside.biz>
Date: Wed, 13 Jun 2018 02:25:09 -0500
Subject: RT# 32234 Allow unmask of SSN/DL#

---
 FS/FS/AccessRight.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/AccessRight.pm b/FS/FS/AccessRight.pm
index 471e32aff..1b581b247 100644
--- a/FS/FS/AccessRight.pm
+++ b/FS/FS/AccessRight.pm
@@ -156,6 +156,8 @@ tie my %rights, 'Tie::IxHash',
     'View package definition costs', #NEWNEW
     'Change package start date',
     'Change package contract end date',
+    'Unmask customer DL',
+    'Unmask customer SSN',
   ],
   
   ###
@@ -509,4 +511,3 @@ L<FS::access_right>, L<FS::access_group>, L<FS::access_user>
 =cut
 
 1;
-
-- 
cgit v1.2.1


From 965826f80175e6e09b851bdd119e955b6c3783d4 Mon Sep 17 00:00:00 2001
From: Mitch Jackson <mitch@freeside.biz>
Date: Thu, 14 Jun 2018 14:46:38 -0500
Subject: RT# 80543 Crash creating new quotation

---
 FS/FS/Template_Mixin.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS')

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index b9514fee1..578e5a192 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -3139,7 +3139,9 @@ sub _items_fee {
   my @cust_bill_pkg = grep { $_->feepart } $self->cust_bill_pkg;
   my $escape_function = $options{escape_function};
 
-  my $locale = $self->cust_main->locale;
+  my $locale = $self->quotationnum
+             ? $self->prospect_main->locale
+             : $self->cust_main->locale;
 
   my @items;
   foreach my $cust_bill_pkg (@cust_bill_pkg) {
-- 
cgit v1.2.1