fix unapplied payment report, RT#73048, fallout from #25944

diff --git a/httemplate/search/elements/grouped-search/html b/httemplate/search/elements/grouped-search/html
index 293da33..9c2418a 100644 (file)
--- a/httemplate/search/elements/grouped-search/html
+++ b/httemplate/search/elements/grouped-search/html
@@ -11,8 +11,8 @@ my $redirect;
 
 if ( $group_info->{num} == 0 ) {
   $redirect = $opt{'redirect_empty'};
 
 if ( $group_info->{num} == 0 ) {
   $redirect = $opt{'redirect_empty'};

+  $redirect = &$redirect($cgi) if $redirect && ref($redirect) eq 'CODE';

   if ($redirect) {
   if ($redirect) {

-    $redirect = &$redirect($cgi) if ref($redirect) eq 'CODE';

     redirect( $redirect );
   } else { # just print this stuff and exit
     $m->comp('/elements/header.html', $opt{'title'});
     redirect( $redirect );
   } else { # just print this stuff and exit
     $m->comp('/elements/header.html', $opt{'title'});

diff --git a/httemplate/search/elements/report_cust_pay_or_refund.html b/httemplate/search/elements/report_cust_pay_or_refund.html
index 806746a..1cc77f7 100644 (file)
--- a/httemplate/search/elements/report_cust_pay_or_refund.html
+++ b/httemplate/search/elements/report_cust_pay_or_refund.html
@@ -30,7 +30,7 @@ Examples:
   <& /elements/tr-select.html,
     label     => ucfirst(PL($name_singular)) . ' of type:',
     field     => 'payby',
   <& /elements/tr-select.html,
     label     => ucfirst(PL($name_singular)) . ' of type:',
     field     => 'payby',

-    options   => [ keys(\%payby) ],
+    options   => [ keys %payby ],

     labels    => \%payby,
     multiple  => 1,
     size      => 18,
     labels    => \%payby,
     multiple  => 1,
     size      => 18,