diff --git a/circ/overdue.pl b/circ/overdue.pl index e755b12e16..e59961a302 100755 --- a/circ/overdue.pl +++ b/circ/overdue.pl @@ -236,7 +236,8 @@ if ($noreport) { my $strsth="SELECT date_due, borrowers.title as borrowertitle, - concat(surname,' ', firstname) as borrower, + borrowers.surname, + borrowers.firstname, borrowers.streetnumber, borrowers.streettype, borrowers.address, @@ -282,11 +283,12 @@ if ($noreport) { $strsth =~ s/WHERE 1=1/WHERE 1=1 AND borrowers.borrowernumber IN ($bnlist)/ if $bnlist; $strsth =~ s/WHERE 1=1/WHERE 0=1/ if $have_pattr_filter_data && !$bnlist; # no match if no borrowers matched patron attrs $strsth.=" ORDER BY " . ( - ($order eq "borrower" or $order eq "borrower desc") ? "$order, date_due" : - ($order eq "title" or $order eq "title desc") ? "$order, date_due, borrower" : - ($order eq "barcode" or $order eq "barcode desc") ? "items.$order, date_due, borrower" : - ($order eq "date_due desc") ? "date_due DESC, borrower" : - "date_due, borrower" # default sort order + ($order eq "borrower") ? "surname, firstname, date_due" : + ($order eq "borrower desc") ? "surname desc, firstname desc, date_due" : + ($order eq "title" or $order eq "title desc") ? "$order, date_due, surname, firstname" : + ($order eq "barcode" or $order eq "barcode desc") ? "items.$order, date_due, surname, firstname" : + ($order eq "date_due desc") ? "date_due DESC, surname, firstname" : + "date_due, surname, firstname" # default sort order ); $template->param(sql=>$strsth); my $sth=$dbh->prepare($strsth); @@ -315,7 +317,8 @@ if ($noreport) { itemnum => $data->{itemnumber}, issuedate => format_date($data->{issuedate}), borrowertitle => $data->{borrowertitle}, - name => $data->{borrower}, + surname => $data->{surname}, + firstname => $data->{firstname}, streetnumber => $data->{streetnumber}, streettype => $data->{streettype}, address => $data->{address}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index eb0540ebb7..e196399bfa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -116,7 +116,7 @@
[% FOREACH overdueloo IN overdueloop %]