excel number format fix, #17971

diff --git a/httemplate/search/cust_bill_pkg_referral.html b/httemplate/search/cust_bill_pkg_referral.html
index f17cea3..1bb6b91 100644 (file)
--- a/httemplate/search/cust_bill_pkg_referral.html
+++ b/httemplate/search/cust_bill_pkg_referral.html
@@ -190,7 +190,7 @@ my @orwhere;
 push @orwhere, "(cust_bill_pkg.setup > 0)" if $setup;
 push @orwhere, "($recur_sql > 0)"          if $recur;
 push @orwhere, "($usage_sql > 0)"          if $usage;
-push @where, join(' OR ', @orwhere);
+push @where, '('.join(' OR ', @orwhere).')' if @orwhere;
 
 $join_cust =  '        JOIN cust_bill     USING ( invnum )
                   LEFT JOIN cust_main     USING ( custnum )

diff --git a/httemplate/search/elements/search-xls.html b/httemplate/search/elements/search-xls.html
index 6a19cf2..a3a8226 100644 (file)
--- a/httemplate/search/elements/search-xls.html
+++ b/httemplate/search/elements/search-xls.html
@@ -49,7 +49,7 @@ my $writer = sub {
   # Wrapper for $worksheet->write.
   # Do any massaging of the value/format here.
   my ($r, $c, $value, $format) = @_;
-  if ( $value =~ /^\Q$money_char\E(\d+\.?\d*)$/ ) {
+  if ( $value =~ /^\Q$money_char\E(-?\d+\.?\d*)$/ ) {
     # Currency: strip the symbol, clone the requested format,
     # and format it for currency
     $value = $1;