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

(-)a/circ/overdue.pl (-1 / +16 lines)
Lines 247-252 if ($noreport) { Link Here
247
        borrowers.cardnumber,
247
        borrowers.cardnumber,
248
        borrowers.borrowernumber,
248
        borrowers.borrowernumber,
249
        borrowers.branchcode,
249
        borrowers.branchcode,
250
        borrowers.categorycode,
251
        categories.category_type,
250
        issues.itemnumber,
252
        issues.itemnumber,
251
        issues.issuedate,
253
        issues.issuedate,
252
        items.datelastborrowed,
254
        items.datelastborrowed,
Lines 269-274 if ($noreport) { Link Here
269
        return_claims.id AS return_claim_id
271
        return_claims.id AS return_claim_id
270
      FROM issues
272
      FROM issues
271
    LEFT JOIN borrowers   ON (issues.borrowernumber=borrowers.borrowernumber )
273
    LEFT JOIN borrowers   ON (issues.borrowernumber=borrowers.borrowernumber )
274
    LEFT JOIN categories  ON (categories.categorycode = borrowers.categorycode )
272
    LEFT JOIN items       ON (issues.itemnumber=items.itemnumber)
275
    LEFT JOIN items       ON (issues.itemnumber=items.itemnumber)
273
    LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber)
276
    LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber)
274
    LEFT JOIN biblio      ON (biblio.biblionumber=items.biblionumber )
277
    LEFT JOIN biblio      ON (biblio.biblionumber=items.biblionumber )
Lines 349-355 if ($noreport) { Link Here
349
        }
352
        }
350
353
351
        push @overduedata, {
354
        push @overduedata, {
352
            patron                  => Koha::Patrons->find( $data->{borrowernumber} ),
355
            borrower => {
356
                branchcode     => $data->{branchcode},
357
                borrowernumber => $data->{borrowernumber},
358
                categorycode   => $data->{categorycode},
359
                category_type  => $data->{category_type},
360
                surname        => $data->{surname},
361
                othernames     => $data->{othernames},
362
                firstname      => $data->{firstname},
363
                preferred_name => $data->{preferred_name},
364
                middle_name    => $data->{middle_name},
365
                cardnumber     => $data->{cardnumber},
366
                title          => $data->{title}
367
            },
353
            duedate                 => $data->{date_due},
368
            duedate                 => $data->{date_due},
354
            borrowernumber          => $data->{borrowernumber},
369
            borrowernumber          => $data->{borrowernumber},
355
            cardnumber              => $data->{cardnumber},
370
            cardnumber              => $data->{cardnumber},
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (-2 / +3 lines)
Lines 3-8 Link Here
3
[%- USE Branches -%]
3
[%- USE Branches -%]
4
[%- SET data = {} -%]
4
[%- SET data = {} -%]
5
[%- IF patron -%]
5
[%- IF patron -%]
6
    [%- SET data.branchcode     = patron.branchcode -%]
6
    [%- SET data.category_type  = patron.category.category_type -%]
7
    [%- SET data.category_type  = patron.category.category_type -%]
7
    [%- SET data.surname        = patron.surname -%]
8
    [%- SET data.surname        = patron.surname -%]
8
    [%- SET data.othernames     = patron.othernames -%]
9
    [%- SET data.othernames     = patron.othernames -%]
Lines 13-18 Link Here
13
    [%- SET data.borrowernumber = patron.borrowernumber -%]
14
    [%- SET data.borrowernumber = patron.borrowernumber -%]
14
    [%- SET data.title          = patron.title -%]
15
    [%- SET data.title          = patron.title -%]
15
[%- ELSIF ( borrower.borrowernumber ) -%]
16
[%- ELSIF ( borrower.borrowernumber ) -%]
17
    [%- SET data.branchcode     = borrower.branchcode -%]
16
    [%- SET data.category_type  = borrower.category_type -%]
18
    [%- SET data.category_type  = borrower.category_type -%]
17
    [%- SET data.surname        = borrower.surname -%]
19
    [%- SET data.surname        = borrower.surname -%]
18
    [%- SET data.othernames     = borrower.othernames -%]
20
    [%- SET data.othernames     = borrower.othernames -%]
Lines 38-45 Link Here
38
[%- SET display_cardnumber = 1 -%]
40
[%- SET display_cardnumber = 1 -%]
39
[%- IF no_cardnumber -%][%- SET display_cardnumber = 0 -%][%- END -%]
41
[%- IF no_cardnumber -%][%- SET display_cardnumber = 0 -%][%- END -%]
40
[%- IF hide_patron_infos_if_needed -%]
42
[%- IF hide_patron_infos_if_needed -%]
41
    [%# Should only be set if patron is set -%]
43
    [%- SET can_see_patron_infos = logged_in_user.can_see_patrons_from( data.branchcode ) -%]
42
    [%- SET can_see_patron_infos = logged_in_user.can_see_patron_infos( patron ) -%]
43
    [%- UNLESS can_see_patron_infos -%]
44
    [%- UNLESS can_see_patron_infos -%]
44
        [%- SET display_patron_name = 0 -%]
45
        [%- SET display_patron_name = 0 -%]
45
        [%- SET display_cardnumber  = 0 -%]
46
        [%- SET display_cardnumber  = 0 -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt (-5 / +4 lines)
Lines 120-127 Link Here
120
                                                [% END %]
120
                                                [% END %]
121
                                            </td>
121
                                            </td>
122
                                            <td>
122
                                            <td>
123
                                                [% INCLUDE 'patron-title.inc' patron=overdueloo.patron hide_patron_infos_if_needed=1 %]
123
                                                [% INCLUDE 'patron-title.inc' borrower=overdueloo.borrower hide_patron_infos_if_needed=1 %]
124
                                                [% IF logged_in_user.can_see_patron_infos( overdueloo.patron ) %]
124
                                                [% IF logged_in_user.can_see_patrons_from( overdueloo.branchcode ) %]
125
                                                    [% IF ( overdueloo.email ) %]
125
                                                    [% IF ( overdueloo.email ) %]
126
                                                        <span class="overdue_email"> [<a href="mailto:[% overdueloo.email | uri %]?subject=[% INCLUDE subject %] [% overdueloo.title | uri %]">email</a>] </span>
126
                                                        <span class="overdue_email"> [<a href="mailto:[% overdueloo.email | uri %]?subject=[% INCLUDE subject %] [% overdueloo.title | uri %]">email</a>] </span>
127
                                                    [% END %]
127
                                                    [% END %]
Lines 136-143 Link Here
136
                                                    </span>
136
                                                    </span>
137
                                                [% END %]
137
                                                [% END %]
138
                                            </td>
138
                                            </td>
139
                                            <td>[% Categories.GetName( overdueloo.patron.categorycode ) | html %]</td>
139
                                            <td>[% Categories.GetName( overdueloo.borrower.categorycode ) | html %]</td>
140
                                            <td>[% Branches.GetName( overdueloo.patron.branchcode ) | html %]</td>
140
                                            <td>[% Branches.GetName( overdueloo.borrower.branchcode ) | html %]</td>
141
                                            <td
141
                                            <td
142
                                                >[% INCLUDE 'biblio-title.inc' biblio=overdueloo link = 1 %]
142
                                                >[% INCLUDE 'biblio-title.inc' biblio=overdueloo link = 1 %]
143
                                                [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td
143
                                                [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td
144
- 

Return to bug 41343