View | Details | Raw Unified | Return to bug 6801
Collapse All | Expand All

(-)a/C4/Members.pm (-1 / +5 lines)
Lines 1043-1049 sub GetPendingIssues { Link Here
1043
    # Borrowers part of the query
1043
    # Borrowers part of the query
1044
    my $bquery = '';
1044
    my $bquery = '';
1045
    for (my $i = 0; $i < @borrowernumbers; $i++) {
1045
    for (my $i = 0; $i < @borrowernumbers; $i++) {
1046
        $bquery .= ' borrowernumber = ?';
1046
        $bquery .= ' issues.borrowernumber = ?';
1047
        if ($i < $#borrowernumbers ) {
1047
        if ($i < $#borrowernumbers ) {
1048
            $bquery .= ' OR';
1048
            $bquery .= ' OR';
1049
        }
1049
        }
Lines 1070-1075 sub GetPendingIssues { Link Here
1070
           biblioitems.volumedesc,
1070
           biblioitems.volumedesc,
1071
           biblioitems.lccn,
1071
           biblioitems.lccn,
1072
           biblioitems.url,
1072
           biblioitems.url,
1073
           borrowers.firstname,
1074
           borrowers.surname,
1075
           borrowers.cardnumber,
1073
           issues.timestamp AS timestamp,
1076
           issues.timestamp AS timestamp,
1074
           issues.renewals  AS renewals,
1077
           issues.renewals  AS renewals,
1075
           issues.borrowernumber AS borrowernumber,
1078
           issues.borrowernumber AS borrowernumber,
Lines 1078-1083 sub GetPendingIssues { Link Here
1078
    LEFT JOIN items       ON items.itemnumber       =      issues.itemnumber
1081
    LEFT JOIN items       ON items.itemnumber       =      issues.itemnumber
1079
    LEFT JOIN biblio      ON items.biblionumber     =      biblio.biblionumber
1082
    LEFT JOIN biblio      ON items.biblionumber     =      biblio.biblionumber
1080
    LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
1083
    LEFT JOIN biblioitems ON items.biblioitemnumber = biblioitems.biblioitemnumber
1084
    LEFT JOIN borrowers ON issues.borrowernumber = borrowers.borrowernumber
1081
    WHERE
1085
    WHERE
1082
      $bquery
1086
      $bquery
1083
    ORDER BY issues.issuedate"
1087
    ORDER BY issues.issuedate"
(-)a/circ/circulation.pl (-6 / +2 lines)
Lines 418-436 sub build_issue_data { Link Here
418
    foreach my $it ( @$issueslist ) {
418
    foreach my $it ( @$issueslist ) {
419
        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} );
419
        my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} );
420
420
421
        # Getting borrower details
422
        my $memberdetails = GetMemberDetails($it->{'borrowernumber'});
423
        $it->{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
424
        $it->{'cardnumber'} = $memberdetails->{'cardnumber'};
425
        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
421
        # set itemtype per item-level_itype syspref - FIXME this is an ugly hack
426
        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
422
        $it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
427
423
428
        ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges(
424
        ($it->{'charge'}, $it->{'itemtype_charge'}) = GetIssuingCharges(
429
            $it->{'itemnumber'}, $borrower->{'borrowernumber'}
425
            $it->{'itemnumber'}, $it->{'borrowernumber'}
430
        );
426
        );
431
        $it->{'charge'} = sprintf("%.2f", $it->{'charge'});
427
        $it->{'charge'} = sprintf("%.2f", $it->{'charge'});
432
        my ($can_renew, $can_renew_error) = CanBookBeRenewed( 
428
        my ($can_renew, $can_renew_error) = CanBookBeRenewed( 
433
            $borrower->{'borrowernumber'},$it->{'itemnumber'}
429
            $it->{'borrowernumber'},$it->{'itemnumber'}
434
        );
430
        );
435
        $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
431
        $it->{"renew_error_${can_renew_error}"} = 1 if defined $can_renew_error;
436
        my ( $restype, $reserves ) = CheckReserves( $it->{'itemnumber'} );
432
        my ( $restype, $reserves ) = CheckReserves( $it->{'itemnumber'} );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-5 / +5 lines)
Lines 701-707 No patron matched <span class="ex">[% message %]</span> Link Here
701
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
701
        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
702
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
702
        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
703
        <td>[% todayissue.checkoutdate %]</td>
703
        <td>[% todayissue.checkoutdate %]</td>
704
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %]
704
        [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.firstname %] [% todayissue.surname %]</td>[% END %]
705
        <td>[% todayissue.issuingbranchname %]</td>
705
        <td>[% todayissue.issuingbranchname %]</td>
706
        <td>[% todayissue.itemcallnumber %]</td>
706
        <td>[% todayissue.itemcallnumber %]</td>
707
            <td>[% todayissue.charge %]</td>
707
            <td>[% todayissue.charge %]</td>
Lines 776-782 No patron matched <span class="ex">[% message %]</span> Link Here
776
            [% previssue.itemtype %]
776
            [% previssue.itemtype %]
777
        </td>
777
        </td>
778
        <td>[% previssue.displaydate %]</td>
778
        <td>[% previssue.displaydate %]</td>
779
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.borrowername %]</td>[% END %]
779
        [% IF ( previssue.multiple_borrowers ) %]<td>[% previssue.firstname %] [% previssue.surname %]</td>[% END %]
780
        <td>[% previssue.issuingbranchname %]</td>
780
        <td>[% previssue.issuingbranchname %]</td>
781
        <td>[% previssue.itemcallnumber %]</td>
781
        <td>[% previssue.itemcallnumber %]</td>
782
        <td>[% previssue.charge %]</td>
782
        <td>[% previssue.charge %]</td>
Lines 885-891 No patron matched <span class="ex">[% message %]</span> Link Here
885
        <td>[% relissue.issuingbranchname %]</td>
885
        <td>[% relissue.issuingbranchname %]</td>
886
        <td>[% relissue.itemcallnumber %]</td>
886
        <td>[% relissue.itemcallnumber %]</td>
887
        <td>[% relissue.charge %]</td>
887
        <td>[% relissue.charge %]</td>
888
        <td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.borrowername %] ([% relissue.cardnumber %])</a></td>
888
        <td>[% relissue.replacementprice %]</td><td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissue.borrowernumber %]">[% relissue.firstname %] [% relissue.surname %] ([% relissue.cardnumber %])</a></td>
889
     </tr>
889
     </tr>
890
    [% END %] <!-- /loop relissues -->
890
    [% END %] <!-- /loop relissues -->
891
    <!-- /if relissues -->[% END %]
891
    <!-- /if relissues -->[% END %]
Lines 905-914 No patron matched <span class="ex">[% message %]</span> Link Here
905
        <td>[% relprevissue.displaydate %]</td>
905
        <td>[% relprevissue.displaydate %]</td>
906
        <td>[% relprevissue.issuingbranchname %]</td>
906
        <td>[% relprevissue.issuingbranchname %]</td>
907
        <td>[% relprevissue.itemcallnumber %]</td>
907
        <td>[% relprevissue.itemcallnumber %]</td>
908
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.borrowername %]</td>[% END %]
908
	[% IF ( relprevissue.multiple_borrowers ) %]<td>[% relprevissue.firstname %] [% relprevissue.surname %]</td>[% END %]
909
        <td>[% relprevissue.charge %]</td>
909
        <td>[% relprevissue.charge %]</td>
910
        <td>[% relprevissue.replacementprice %]</td>
910
        <td>[% relprevissue.replacementprice %]</td>
911
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.borrowername %] ([% relprevissue.cardnumber %])</a></td>
911
        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relprevissue.borrowernumber %]">[% relprevissue.firstname %] [% relprevissue.surname %] ([% relprevissue.cardnumber %])</a></td>
912
912
913
    </tr>
913
    </tr>
914
    <!-- /loop relprevissue -->[% END %]
914
    <!-- /loop relprevissue -->[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 566-572 function validate1(date) { Link Here
566
        <td>[% relissueloo.itemcallnumber %]</td>
566
        <td>[% relissueloo.itemcallnumber %]</td>
567
        <td>[% relissueloo.charge %]</td>
567
        <td>[% relissueloo.charge %]</td>
568
        <td>[% relissueloo.replacementprice %]</td>
568
        <td>[% relissueloo.replacementprice %]</td>
569
	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %] ([% relissueloo.cardnumber %])</a></td>
569
	    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
570
        </tr>
570
        </tr>
571
  [% END %]
571
  [% END %]
572
        </tbody>
572
        </tbody>
(-)a/members/moremember.pl (-7 / +2 lines)
Lines 259-268 sub build_issue_data { Link Here
259
    my $localissue;
259
    my $localissue;
260
260
261
    for ( my $i = 0 ; $i < $issuecount ; $i++ ) {
261
    for ( my $i = 0 ; $i < $issuecount ; $i++ ) {
262
        # Getting borrower details
263
        my $memberdetails = GetMemberDetails($issue->[$i]{'borrowernumber'});
264
        $issue->[$i]{'borrowername'} = $memberdetails->{'firstname'} . " " . $memberdetails->{'surname'};
265
        $issue->[$i]{'cardnumber'} = $memberdetails->{'cardnumber'};
266
        my $datedue = $issue->[$i]{'date_due'};
262
        my $datedue = $issue->[$i]{'date_due'};
267
        my $issuedate = $issue->[$i]{'issuedate'};
263
        my $issuedate = $issue->[$i]{'issuedate'};
268
        $issue->[$i]{'date_due'}  = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');
264
        $issue->[$i]{'date_due'}  = C4::Dates->new($issue->[$i]{'date_due'}, 'iso')->output('syspref');
Lines 306-312 sub build_issue_data { Link Here
306
302
307
        #find the charge for an item
303
        #find the charge for an item
308
        my ( $charge, $itemtype ) =
304
        my ( $charge, $itemtype ) =
309
          GetIssuingCharges( $issue->[$i]{'itemnumber'}, $borrowernumber );
305
          GetIssuingCharges( $issue->[$i]{'itemnumber'}, $issue->[$i]{'borrowernumber'} );
310
306
311
        my $itemtypeinfo = getitemtypeinfo($itemtype);
307
        my $itemtypeinfo = getitemtypeinfo($itemtype);
312
        $row{'itemtype_description'} = $itemtypeinfo->{description};
308
        $row{'itemtype_description'} = $itemtypeinfo->{description};
Lines 314-320 sub build_issue_data { Link Here
314
310
315
        $row{'charge'} = sprintf( "%.2f", $charge );
311
        $row{'charge'} = sprintf( "%.2f", $charge );
316
312
317
        my ( $renewokay,$renewerror ) = CanBookBeRenewed( $borrowernumber, $issue->[$i]{'itemnumber'}, $override_limit );
313
        my ( $renewokay,$renewerror ) = CanBookBeRenewed( $issue->[$i]{'borrowernumber'}, $issue->[$i]{'itemnumber'}, $override_limit );
318
        $row{'norenew'} = !$renewokay;
314
        $row{'norenew'} = !$renewokay;
319
        $row{'can_confirm'} = ( !$renewokay && $renewerror ne 'on_reserve' );
315
        $row{'can_confirm'} = ( !$renewokay && $renewerror ne 'on_reserve' );
320
        $row{"norenew_reason_$renewerror"} = 1 if $renewerror;
316
        $row{"norenew_reason_$renewerror"} = 1 if $renewerror;
321
- 

Return to bug 6801