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

(-)a/circ/circulation.pl (-26 / +5 lines)
Lines 527-538 if($lib_messages_loop){ $template->param(flagged => 1 ); } Link Here
527
my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
527
my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
528
if($bor_messages_loop){ $template->param(flagged => 1 ); }
528
if($bor_messages_loop){ $template->param(flagged => 1 ); }
529
529
530
# Computes full borrower address
531
my @fulladdress;
532
push @fulladdress, $borrower->{'streetnumber'} if ( $borrower->{'streetnumber'} );
533
push @fulladdress, C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} ) if ( $borrower->{'streettype'} );
534
push @fulladdress, $borrower->{'address'} if ( $borrower->{'address'} );
535
536
my $fast_cataloging = 0;
530
my $fast_cataloging = 0;
537
if (defined getframeworkinfo('FA')) {
531
if (defined getframeworkinfo('FA')) {
538
    $fast_cataloging = 1 
532
    $fast_cataloging = 1 
Lines 551-556 my $relatives_issues_count = Link Here
551
  Koha::Database->new()->schema()->resultset('Issue')
545
  Koha::Database->new()->schema()->resultset('Issue')
552
  ->count( { borrowernumber => \@relatives } );
546
  ->count( { borrowernumber => \@relatives } );
553
547
548
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
549
550
$template->param(%$borrower);
551
554
$template->param(
552
$template->param(
555
    lib_messages_loop => $lib_messages_loop,
553
    lib_messages_loop => $lib_messages_loop,
556
    bor_messages_loop => $bor_messages_loop,
554
    bor_messages_loop => $bor_messages_loop,
Lines 562-589 $template->param( Link Here
562
    branchname        => GetBranchName($borrower->{'branchcode'}),
560
    branchname        => GetBranchName($borrower->{'branchcode'}),
563
    printer           => $printer,
561
    printer           => $printer,
564
    printername       => $printer,
562
    printername       => $printer,
565
    firstname         => $borrower->{'firstname'},
566
    surname           => $borrower->{'surname'},
567
    showname          => $borrower->{'showname'},
568
    category_type     => $borrower->{'category_type'},
569
    was_renewed       => $query->param('was_renewed') ? 1 : 0,
563
    was_renewed       => $query->param('was_renewed') ? 1 : 0,
570
    expiry            => format_date($borrower->{'dateexpiry'}),
564
    expiry            => format_date($borrower->{'dateexpiry'}),
571
    categorycode      => $borrower->{'categorycode'},
565
    roadtype          => $roadtype,
572
    categoryname      => $borrower->{description},
573
    address           => join(' ', @fulladdress),
574
    address2          => $borrower->{'address2'},
575
    email             => $borrower->{'email'},
576
    emailpro          => $borrower->{'emailpro'},
577
    borrowernotes     => $borrower->{'borrowernotes'},
578
    city              => $borrower->{'city'},
579
    state              => $borrower->{'state'},
580
    zipcode           => $borrower->{'zipcode'},
581
    country           => $borrower->{'country'},
582
    phone             => $borrower->{'phone'},
583
    mobile            => $borrower->{'mobile'},
584
    phonepro          => $borrower->{'phonepro'},
585
    cardnumber        => $borrower->{'cardnumber'},
586
    othernames        => $borrower->{'othernames'},
587
    amountold         => $amountold,
566
    amountold         => $amountold,
588
    barcode           => $barcode,
567
    barcode           => $barcode,
589
    stickyduedate     => $stickyduedate,
568
    stickyduedate     => $stickyduedate,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-27 / +27 lines)
Lines 5-34 Link Here
5
}</style>
5
}</style>
6
<![endif]-->
6
<![endif]-->
7
<ul class="patronbriefinfo">
7
<ul class="patronbriefinfo">
8
[% IF ( patronimages ) %]
8
    [% IF ( patronimages ) %]
9
[% IF ( picture ) %]
9
        [% IF ( picture ) %]
10
<li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
10
            <li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
11
[% ELSE %]
11
        [% ELSE %]
12
<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
12
            <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
13
[% END %]
14
[% END %]
15
    [% IF ( address or address2 ) %]
16
        [% IF ( address ) %]
17
            <li class="patronaddress1">[% address %]</li>
18
        [% END %]
19
        [% IF ( address2 ) %]
20
            <li class="patronaddress2">[% address2 %]</li>
21
        [% END %]
13
        [% END %]
22
    [% ELSE %]
23
            <li><span class="empty" id="noaddressstored">No address stored.</span></li>
24
    [% END %]
14
    [% END %]
25
    <li class="patroncity">[% IF ( city ) %]
15
    [% IF Koha.Preference( 'addressformat' ) %]
26
            [% city %][% IF ( state ) %], [% state %][% END %]
16
        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
27
	    [% zipcode %][% IF ( country ) %], [% country %][% END %]
28
    [% ELSE %]
17
    [% ELSE %]
29
        <span class="empty" id="nocitystored">No city stored.</span>
18
        [% INCLUDE 'member-display-address-style-us.inc' %]
30
    [% END %]</li>
19
    [% END %]
31
    <li class="patronphone">[% IF ( phone ) %]
20
21
    [% IF ( phone ) %]<li class="patronphone">
32
        [% phone %]
22
        [% phone %]
33
    [% ELSE %]
23
    [% ELSE %]
34
        [% IF ( mobile ) %]
24
        [% IF ( mobile ) %]
Lines 36-55 Link Here
36
        [% ELSE %]
26
        [% ELSE %]
37
            [% IF ( phonepro ) %]
27
            [% IF ( phonepro ) %]
38
                [% phonepro %]
28
                [% phonepro %]
39
            [% ELSE %]
40
                <span class="empty" id="nophonestored">No phone stored.</span>
41
            [% END %]
29
            [% END %]
42
        [% END %]
30
        [% END %]</li>
43
    [% END %]</li>
31
    [% END %]
44
    [% IF ( email ) %]
32
    [% IF ( email ) %]
45
        <li class="email"> <a href="mailto:[% email %]" title="[% email %]">[% email %]</a></li>
33
        <li class="email"> <a href="mailto:[% email %]" title="[% email %]">[% email %]</a></li>
46
    [% ELSE %]
34
    [% ELSE %]
47
        [% IF ( emailpro ) %]
35
        [% IF ( emailpro ) %]
48
            <li class="email"> <a href="mailto:[% emailpro %]" title="[% emailpro %]">[% emailpro %]</a></li>
36
            <li class="email"> <a href="mailto:[% emailpro %]" title="[% emailpro %]">[% emailpro %]</a></li>
49
        [% ELSE %]
50
            <li> <span class="empty">No email stored.</span>    </li>
51
        [% END %]
37
        [% END %]
52
    [% END %]
38
    [% END %]
39
40
    [% UNLESS ( address or address2 ) %]
41
        <li><span class="empty" id="noaddressstored">No address stored.</span></li>
42
    [% END %]
43
    [% UNLESS ( city ) %]
44
        <li><span class="empty" id="nocitystored">No city stored.</span></li>
45
    [% END %]
46
    [% UNLESS ( phone or mobile or phonepro) %]
47
        <li> <span class="empty">No phone stored.</span></li>
48
    [% END %]
49
    [% UNLESS ( email or emailpro) %]
50
        <li> <span class="empty">No email stored.</span></li>
51
    [% END %]
52
53
    [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
53
    [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
54
        [% IF ( extendedattribute.display_checkout ) %]
54
        [% IF ( extendedattribute.display_checkout ) %]
55
            [% IF ( extendedattribute.value ) %]
55
            [% IF ( extendedattribute.value ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt (-37 / +39 lines)
Lines 7-58 in the global namespace %] Link Here
7
}</style>
7
}</style>
8
<![endif]-->
8
<![endif]-->
9
<ul class="patronbriefinfo">
9
<ul class="patronbriefinfo">
10
[% IF ( patronimages ) %]
10
    [% IF ( patronimages ) %]
11
[% IF borrower.has_picture %]
11
        [% IF borrower.has_picture %]
12
<li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrower.borrowernumber %]" id="patronimage" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
12
        <li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrower.borrowernumber %]" id="patronimage" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
13
[% ELSE %]
13
        [% ELSE %]
14
<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
14
            <li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
15
[% END %]
16
[% END %]
17
    [% IF ( borrower.address or borrower.address2 ) %]
18
        [% IF ( borrower.address ) %]
19
            <li class="patronaddress1">[% borrower.address %]</li>
20
        [% END %]
21
        [% IF ( borrower.address2 ) %]
22
            <li class="patronaddress2">[% borrower.address2 %]</li>
23
        [% END %]
15
        [% END %]
24
    [% ELSE %]
25
            <li><span class="empty" id="noaddressstored">No address stored.</span></li>
26
    [% END %]
16
    [% END %]
27
    <li class="patroncity">
17
28
    [% IF borrower.city %]
18
    [% IF Koha.Preference( 'addressformat' ) %]
29
            [% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %]
19
        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
30
	    [% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %]
31
    [% ELSE %]
20
    [% ELSE %]
32
        <span class="empty" id="nocitystored">No city stored.</span>
21
        [% INCLUDE 'member-display-address-style-us.inc' %]
33
    [% END %]</li>
22
    [% END %]
34
    <li class="patronphone">[% IF borrower.phone %]
23
35
        [% borrower.phone %]
24
    [% IF ( phone ) %]<li class="patronphone">
25
        [% phone %]
36
    [% ELSE %]
26
    [% ELSE %]
37
        [% IF borrower.mobile %]
27
        [% IF ( mobile ) %]
38
            [% borrower.mobile %]
28
            [% mobile %]
39
        [% ELSE %]
29
        [% ELSE %]
40
            [% IF borrower.phonepro %]
30
            [% IF ( phonepro ) %]
41
                [% borrower.phonepro %]
31
                [% phonepro %]
42
            [% ELSE %]
43
                <span class="empty" id="nophonestored">No phone stored.</span>
44
            [% END %]
32
            [% END %]
45
        [% END %]
33
        [% END %]</li>
46
    [% END %]</li>
34
    [% END %]
47
    [% IF borrower.email %]
35
    [% IF ( email ) %]
48
        <li class="email"> <a href="mailto:[% borrower.email %]" title="[% borrower.email %]">[% borrower.email %]</a></li>
36
        <li class="email"> <a href="mailto:[% email %]" title="[% email %]">[% email %]</a></li>
49
    [% ELSE %]
37
    [% ELSE %]
50
        [% IF borrower.emailpro %]
38
        [% IF ( emailpro ) %]
51
            <li class="email"> <a href="mailto:[% borrower.emailpro %]" title="[% borrower.emailpro %]">[% borrower.emailpro %]</a></li>
39
            <li class="email"> <a href="mailto:[% emailpro %]" title="[% emailpro %]">[% emailpro %]</a></li>
52
        [% ELSE %]
53
            <li> <span class="empty">No email stored.</span>    </li>
54
        [% END %]
40
        [% END %]
55
    [% END %]
41
    [% END %]
42
43
    [% UNLESS ( address or address2 ) %]
44
        <li><span class="empty" id="noaddressstored">No address stored.</span></li>
45
    [% END %]
46
    [% UNLESS ( city ) %]
47
        <li><span class="empty" id="nocitystored">No city stored.</span></li>
48
    [% END %]
49
    [% UNLESS ( phone or mobile or phonepro) %]
50
        <li> <span class="empty">No phone stored.</span></li>
51
    [% END %]
52
    [% UNLESS ( email or emailpro) %]
53
        <li> <span class="empty">No email stored.</span></li>
54
    [% END %]
55
56
57
56
    [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN borrower.extendedattributes %]
58
    [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN borrower.extendedattributes %]
57
        [% IF ( extendedattribute.display_checkout ) %]
59
        [% IF ( extendedattribute.display_checkout ) %]
58
            [% IF ( extendedattribute.value ) %]
60
            [% IF ( extendedattribute.value ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc (+12 lines)
Line 0 Link Here
1
[% IF ( address or address2 ) %]
2
    [% IF ( address ) %]
3
        <li class="patronaddress1">[% address %][%if (roadtype) %] [% roadtype %][% end %][% if (streetnumber) %] [% streetnumber %][% end %]</li>
4
    [% END %]
5
    [% IF ( address2 ) %]
6
        <li class="patronaddress2">[% address2 %]</li>
7
    [% END %]
8
[% END %]
9
[% IF ( city ) %]<li class="patroncity">
10
    [%IF (zipcode ) %][% zipcode %] [% END %][% city %][% IF ( state ) %]</br>[% state %][% END %]
11
    [% IF ( country ) %]<br />[% country %][% END %]</li>
12
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc (+12 lines)
Line 0 Link Here
1
[% IF ( address or address2 ) %]
2
    [% IF ( address ) %]
3
        <li class="patronaddress1">[% if (streetnumber) %][% streetnumber %][% end %] [% address %][%if (roadtype) %] [% roadtype %][% end %]</li>
4
    [% END %]
5
    [% IF ( address2 ) %]
6
        <li class="patronaddress2">[% address2 %]</li>
7
    [% END %]
8
[% END %]
9
[% IF ( city ) %]<li class="patroncity">
10
        [% city %][% IF ( state ) %], [% state %][% END %]
11
        [% zipcode %][% IF ( country ) %], [% country %][% END %]</li>
12
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (+1 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</title>
4
<title>Koha &rsaquo; Patrons &rsaquo; Account for [% INCLUDE 'patron-title.inc' %]</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (+1 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Create manual credit</title>
3
<title>Koha &rsaquo; Patrons &rsaquo; Create manual credit</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (+1 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Create manual invoice</title>
3
<title>Koha &rsaquo; Patrons &rsaquo; Create manual invoice</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-7 / +7 lines)
Lines 185-197 function validate1(date) { Link Here
185
185
186
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
186
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
187
187
188
<p class="address">
188
    <div class = "address">
189
        [% address %]<br />
189
        [% IF Koha.Preference( 'addressformat' ) %]
190
        [% IF ( address2 ) %][% address2 %]<br />[% END %]
190
            [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
191
    	[% IF ( city ) %][% city %][% END %] 
191
        [% ELSE %]
192
    	[% IF ( state ) %][% state %][% END %]
192
            [% INCLUDE 'member-display-address-style-us.inc' %]
193
    	[% IF ( zipcode ) %][% zipcode %]<br />[% END %]
193
        [% END %]
194
	[% IF ( country ) %][% country %][% END %]</p>
194
    </div>
195
		    
195
		    
196
	<div class="rows">
196
	<div class="rows">
197
		<ol>
197
		<ol>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (+1 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>
4
<title>Sent notices for [% INCLUDE 'patron-title.inc' %]</title>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-2 / +2 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% borrower.firstname %] [% borrower.surname %]</title>
3
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% borrower.firstname %] [% borrower.surname %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 170-178 function enableCheckboxActions(){ Link Here
170
171
171
</div>
172
</div>
172
</div>
173
</div>
173
174
<div class="yui-b">
174
<div class="yui-b">
175
[% INCLUDE 'circ-menu.tt' %]
175
[% INCLUDE 'circ-menu.inc' %]
176
</div>
176
</div>
177
</div>
177
</div>
178
[% INCLUDE 'intranet-bottom.inc' %]
178
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-1 / +2 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% borrower.firstname %] [% borrower.surname %]</title>
3
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% borrower.firstname %] [% borrower.surname %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 226-232 function moneyFormat(textObj) { Link Here
226
</div>
227
</div>
227
228
228
<div class="yui-b">
229
<div class="yui-b">
229
[% INCLUDE 'circ-menu.tt' %]
230
[% INCLUDE 'circ-menu.inc' %]
230
</div>
231
</div>
231
</div>
232
</div>
232
[% INCLUDE 'intranet-bottom.inc' %]
233
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (+1 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo; Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title>
3
<title>Koha &rsaquo; Patrons &rsaquo; Purchase suggestions for [% INCLUDE 'patron-title.inc' %]</title>
3
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (+1 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %]</title>
3
<title>Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt (+1 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Patrons &rsaquo;
3
<title>Koha &rsaquo; Patrons &rsaquo;
3
[% IF ( unknowuser ) %]
4
[% IF ( unknowuser ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (+1 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>
3
<title>
3
	Koha &rsaquo; Tools &rsaquo;
4
	Koha &rsaquo; Tools &rsaquo;
(-)a/members/boraccount.pl (-23 / +6 lines)
Lines 104-142 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
104
    );
104
    );
105
}
105
}
106
106
107
# Computes full borrower address
108
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
107
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
109
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
108
109
#workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad
110
$template->param(%$data);
110
111
111
$template->param(
112
$template->param(
112
    finesview           => 1,
113
    finesview           => 1,
113
    firstname           => $data->{'firstname'},
114
    surname             => $data->{'surname'},
115
    othernames          => $data->{'othernames'},
116
    borrowernumber      => $borrowernumber,
114
    borrowernumber      => $borrowernumber,
117
    cardnumber          => $data->{'cardnumber'},
115
    roadtype            => $roadtype,
118
    categorycode        => $data->{'categorycode'},
116
    branchname		=> GetBranchName($data->{'branchcode'}),
119
    category_type       => $data->{'category_type'},
120
    categoryname		=> $data->{'description'},
121
    address             => $address,
122
    address2            => $data->{'address2'},
123
    city                => $data->{'city'},
124
    state               => $data->{'state'},
125
    zipcode             => $data->{'zipcode'},
126
    country             => $data->{'country'},
127
    phone               => $data->{'phone'},
128
    phonepro            => $data->{'phonepro'},
129
    mobile              => $data->{'mobile'},
130
    email               => $data->{'email'},
131
    emailpro            => $data->{'emailpro'},
132
    branchcode          => $data->{'branchcode'},
133
	branchname			=> GetBranchName($data->{'branchcode'}),
134
    total               => sprintf("%.2f",$total),
117
    total               => sprintf("%.2f",$total),
135
    totalcredit         => $totalcredit,
118
    totalcredit         => $totalcredit,
136
    is_child            => ($data->{'category_type'} eq 'C'),
119
    is_child            => ($data->{'category_type'} eq 'C'),
137
    reverse_col         => $reverse_col,
120
    reverse_col         => $reverse_col,
138
    accounts            => $accts,
121
    accounts            => $accts,
139
	activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
122
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
140
    RoutingSerials => C4::Context->preference('RoutingSerials'),
123
    RoutingSerials => C4::Context->preference('RoutingSerials'),
141
);
124
);
142
125
(-)a/members/mancredit.pl (-34 / +16 lines)
Lines 83-126 if ($add){ Link Here
83
    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
83
    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
84
    $template->param( picture => 1 ) if $picture;
84
    $template->param( picture => 1 ) if $picture;
85
85
86
if (C4::Context->preference('ExtendedPatronAttributes')) {
86
    if (C4::Context->preference('ExtendedPatronAttributes')) {
87
    my $attributes = GetBorrowerAttributes($borrowernumber);
87
        my $attributes = GetBorrowerAttributes($borrowernumber);
88
    $template->param(
88
        $template->param(
89
        ExtendedPatronAttributes => 1,
89
            ExtendedPatronAttributes => 1,
90
        extendedattributes => $attributes
90
            extendedattributes => $attributes
91
    );
91
        );
92
}
92
    }
93
93
94
# Computes full borrower address
94
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
95
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
95
    $template->param(%$data);
96
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
97
96
98
    $template->param(
97
    $template->param(
99
        finesview => 1,
98
        finesview      => 1,
100
        borrowernumber => $borrowernumber,
99
        borrowernumber => $borrowernumber,
101
        firstname => $data->{'firstname'},
100
        categoryname   => $data->{'description'},
102
        surname  => $data->{'surname'},
101
        roadtype       => $roadtype,
103
        othernames => $data->{'othernames'},
102
        branchname     => GetBranchName($data->{'branchcode'}),
104
		    cardnumber => $data->{'cardnumber'},
103
        is_child       => ($data->{'category_type'} eq 'C'),
105
		    categorycode => $data->{'categorycode'},
104
        activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
106
		    category_type => $data->{'category_type'},
105
        RoutingSerials => C4::Context->preference('RoutingSerials'),
107
		    categoryname  => $data->{'description'},
108
            address => $address,
109
		    address2 => $data->{'address2'},
110
		    city => $data->{'city'},
111
		    state => $data->{'state'},
112
		    zipcode => $data->{'zipcode'},
113
		    country => $data->{'country'},
114
		    phone => $data->{'phone'},
115
            phonepro => $data->{'phonepro'},
116
            mobile => $data->{'mobile'},
117
		    email => $data->{'email'},
118
            emailpro => $data->{'emailpro'},
119
		    branchcode => $data->{'branchcode'},
120
		    branchname => GetBranchName($data->{'branchcode'}),
121
		    is_child        => ($data->{'category_type'} eq 'C'),
122
			activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
123
            RoutingSerials => C4::Context->preference('RoutingSerials'),
124
        );
106
        );
125
    output_html_with_http_headers $input, $cookie, $template->output;
107
    output_html_with_http_headers $input, $cookie, $template->output;
126
}
108
}
(-)a/members/maninvoice.pl (-36 / +17 lines)
Lines 109-151 if ($add){ Link Here
109
    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
109
    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
110
    $template->param( picture => 1 ) if $picture;
110
    $template->param( picture => 1 ) if $picture;
111
111
112
if (C4::Context->preference('ExtendedPatronAttributes')) {
112
    if (C4::Context->preference('ExtendedPatronAttributes')) {
113
    my $attributes = GetBorrowerAttributes($borrowernumber);
113
        my $attributes = GetBorrowerAttributes($borrowernumber);
114
    $template->param(
114
        $template->param(
115
        ExtendedPatronAttributes => 1,
115
            ExtendedPatronAttributes => 1,
116
        extendedattributes => $attributes
116
            extendedattributes => $attributes
117
    );
117
        );
118
}
118
    }
119
120
# Computes full borrower address
121
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
122
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
123
119
124
	$template->param(
120
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
125
                finesview => 1,
121
    $template->param(%$data);
126
                borrowernumber => $borrowernumber,
122
    $template->param(
127
		firstname => $data->{'firstname'},
123
        finesview      => 1,
128
                surname  => $data->{'surname'},
124
        borrowernumber => $borrowernumber,
129
        othernames => $data->{'othernames'},
125
        categoryname   => $data->{'description'},
130
		cardnumber => $data->{'cardnumber'},
126
        branchname     => GetBranchName($data->{'branchcode'}),
131
		categorycode => $data->{'categorycode'},
127
        roadtype       => $roadtype,
132
		category_type => $data->{'category_type'},
128
        is_child       => ($data->{'category_type'} eq 'C'),
133
		categoryname  => $data->{'description'},
129
        activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
134
        address => $address,
135
		address2 => $data->{'address2'},
136
		city => $data->{'city'},
137
		state => $data->{'state'},
138
		zipcode => $data->{'zipcode'},
139
		country => $data->{'country'},
140
		phone => $data->{'phone'},
141
        phonepro => $data->{'phonepro'},
142
        mobile => $data->{'mobile'},
143
		email => $data->{'email'},
144
        emailpro => $data->{'emailpro'},
145
		branchcode => $data->{'branchcode'},
146
		branchname => GetBranchName($data->{'branchcode'}),
147
		is_child        => ($data->{'category_type'} eq 'C'),
148
		activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
149
        RoutingSerials => C4::Context->preference('RoutingSerials'),
130
        RoutingSerials => C4::Context->preference('RoutingSerials'),
150
    );
131
    );
151
    output_html_with_http_headers $input, $cookie, $template->output;
132
    output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/moremember.pl (-6 / +2 lines)
Lines 335-343 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
335
    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
335
    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
336
}
336
}
337
337
338
# Computes full borrower address
339
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
340
341
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
338
# in template <TMPL_IF name="I"> => instutitional (A for Adult, C for children) 
342
$template->param( $data->{'categorycode'} => 1 ); 
339
$template->param( $data->{'categorycode'} => 1 ); 
343
$template->param(
340
$template->param(
Lines 356-363 $template->param( Link Here
356
    overdues_exist  => $overdues_exist,
353
    overdues_exist  => $overdues_exist,
357
    StaffMember     => ($category_type eq 'S'),
354
    StaffMember     => ($category_type eq 'S'),
358
    is_child        => ($category_type eq 'C'),
355
    is_child        => ($category_type eq 'C'),
359
    samebranch     => $samebranch,
356
    samebranch      => $samebranch,
360
    quickslip		  => $quickslip,
357
    quickslip       => $quickslip,
361
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
358
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
362
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
359
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
363
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
360
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
Lines 366-372 $template->param( Link Here
366
    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
363
    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
367
    relatives_issues_count => $relatives_issues_count,
364
    relatives_issues_count => $relatives_issues_count,
368
    relatives_borrowernumbers => \@relatives,
365
    relatives_borrowernumbers => \@relatives,
369
    address => $address
370
);
366
);
371
367
372
output_html_with_http_headers $input, $cookie, $template->output;
368
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/notices.pl (-11 / +9 lines)
Lines 52-58 $template->param( picture => 1 ) if $picture; Link Here
52
52
53
# Getting the messages
53
# Getting the messages
54
my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
54
my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
55
$template->param( %{$borrower} );
56
55
57
if (C4::Context->preference('ExtendedPatronAttributes')) {
56
if (C4::Context->preference('ExtendedPatronAttributes')) {
58
    my $attributes = GetBorrowerAttributes($borrowernumber);
57
    my $attributes = GetBorrowerAttributes($borrowernumber);
Lines 62-80 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
62
    );
61
    );
63
}
62
}
64
63
65
# Computes full borrower address
66
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} );
64
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} );
67
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
65
$template->param(%$borrower);
68
66
69
$template->param(
67
$template->param(
70
			QUEUED_MESSAGES 	=> $queued_messages,
68
    QUEUED_MESSAGES    => $queued_messages,
71
			borrowernumber 		=> $borrowernumber,
69
    borrowernumber     => $borrowernumber,
72
			sentnotices 		=> 1,
70
    sentnotices        => 1,
73
                        branchname              => GetBranchName($borrower->{'branchcode'}),
71
    branchname         => GetBranchName($borrower->{'branchcode'}),
74
                        categoryname            => $borrower->{'description'},
72
    categoryname       => $borrower->{'description'},
75
                        address                 => $address,
73
    roadtype           => $roadtype,
76
			activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
74
    activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
77
            RoutingSerials => C4::Context->preference('RoutingSerials'),
75
    RoutingSerials => C4::Context->preference('RoutingSerials'),
78
);
76
);
79
output_html_with_http_headers $input, $cookie, $template->output;
77
output_html_with_http_headers $input, $cookie, $template->output;
80
78
(-)a/members/pay.pl (-3 / +5 lines)
Lines 133-138 sub add_accounts_to_template { Link Here
133
        }
133
        }
134
    }
134
    }
135
    borrower_add_additional_fields($borrower);
135
    borrower_add_additional_fields($borrower);
136
137
    #workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad
138
    $template->param(%$borrower);
139
136
    $template->param(
140
    $template->param(
137
        accounts => $accounts,
141
        accounts => $accounts,
138
        borrower => $borrower,
142
        borrower => $borrower,
Lines 226-235 sub borrower_add_additional_fields { Link Here
226
    if ($picture) {
230
    if ($picture) {
227
        $b_ref->{has_picture} = 1;
231
        $b_ref->{has_picture} = 1;
228
    }
232
    }
229
230
    # Computes full borrower address
231
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
233
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
232
    $b_ref->{address} = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
234
    $b_ref->{roadtype} = $roadtype;
233
235
234
    if (C4::Context->preference('ExtendedPatronAttributes')) {
236
    if (C4::Context->preference('ExtendedPatronAttributes')) {
235
        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
237
        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
(-)a/members/paycollect.pl (-2 / +5 lines)
Lines 143-148 if ( $total_paid and $total_paid ne '0.00' ) { Link Here
143
143
144
borrower_add_additional_fields($borrower);
144
borrower_add_additional_fields($borrower);
145
145
146
#workaround for Bug 4041 to get rid of duplicated code in circ-menu.tt, use circ-menu.inc instad
147
$template->param(%$borrower);
148
149
146
$template->param(
150
$template->param(
147
    borrowernumber => $borrowernumber,    # some templates require global
151
    borrowernumber => $borrowernumber,    # some templates require global
148
    borrower      => $borrower,
152
    borrower      => $borrower,
Lines 182-190 sub borrower_add_additional_fields { Link Here
182
        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
186
        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
183
    }
187
    }
184
188
185
    # Computes full borrower address
186
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
189
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
187
    $b_ref->{address} = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
190
    $b_ref->{roadtype} = $roadtype;
188
191
189
    $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
192
    $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
190
    return;
193
    return;
(-)a/members/purchase-suggestions.pl (-2 / +1 lines)
Lines 64-71 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
64
64
65
# Computes full borrower address
65
# Computes full borrower address
66
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
66
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
67
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
67
$template->param( roadtype => $roadtype );
68
$template->param( address => $address );
69
68
70
my ($picture, $dberror) = GetPatronImage($borrowernumber);
69
my ($picture, $dberror) = GetPatronImage($borrowernumber);
71
$template->param( picture => 1 ) if $picture;
70
$template->param( picture => 1 ) if $picture;
(-)a/members/readingrec.pl (-22 / +2 lines)
Lines 123-156 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
123
}
123
}
124
124
125
125
126
# Computes full borrower address
127
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
126
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
128
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
127
$template->param(%$data);
129
128
130
$template->param(
129
$template->param(
131
    readingrecordview => 1,
130
    readingrecordview => 1,
132
    title             => $data->{title},
133
    initials          => $data->{initials},
134
    surname           => $data->{surname},
135
    othernames        => $data->{othernames},
136
    borrowernumber    => $borrowernumber,
131
    borrowernumber    => $borrowernumber,
137
    firstname         => $data->{firstname},
138
    cardnumber        => $data->{cardnumber},
139
    categorycode      => $data->{categorycode},
140
    category_type     => $data->{category_type},
141
    categoryname      => $data->{description},
132
    categoryname      => $data->{description},
142
    address           => $address,
133
    roadtype          => $roadtype,
143
    address2          => $data->{address2},
144
    city              => $data->{city},
145
    state             => $data->{state},
146
    zipcode           => $data->{zipcode},
147
    country           => $data->{country},
148
    phone             => $data->{phone},
149
    phonepro          => $data->{phonepro},
150
    mobile            => $data->{mobile},
151
    email             => $data->{email},
152
    emailpro             => $data->{emailpro},
153
    branchcode        => $data->{branchcode},
154
    is_child          => ( $data->{category_type} eq 'C' ),
134
    is_child          => ( $data->{category_type} eq 'C' ),
155
    branchname        => $branches->{ $data->{branchcode} }->{branchname},
135
    branchname        => $branches->{ $data->{branchcode} }->{branchname},
156
    loop_reading      => $issues,
136
    loop_reading      => $issues,
(-)a/members/routing-lists.pl (-23 / +3 lines)
Lines 101-138 if ($borrowernumber) { Link Here
101
##################################################################################
101
##################################################################################
102
102
103
103
104
# Computes full borrower address
105
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
104
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
106
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
105
$template->param(%$borrower);
107
106
108
$template->param(
107
$template->param(
109
110
    findborrower      => $findborrower,
108
    findborrower      => $findborrower,
111
    borrower          => $borrower,
109
    borrower          => $borrower,
112
    borrowernumber    => $borrowernumber,
110
    borrowernumber    => $borrowernumber,
113
    branch            => $branch,
111
    branch            => $branch,
114
    branchname        => GetBranchName($borrower->{'branchcode'}),
112
    branchname        => GetBranchName($borrower->{'branchcode'}),
115
    title             => $borrower->{'title'},
116
    initials          => $borrower->{'initials'},
117
    firstname         => $borrower->{'firstname'},
118
    surname           => $borrower->{'surname'},
119
    othernames        => $borrower->{'othernames'},
120
    categorycode      => $borrower->{'categorycode'},
121
    categoryname      => $borrower->{description},
113
    categoryname      => $borrower->{description},
122
    address           => $address,
114
    roadtype          => $roadtype,
123
    address2          => $borrower->{'address2'},
115
    RoutingSerials    => C4::Context->preference('RoutingSerials'),
124
    phone             => $borrower->{'phone'},
125
    phonepro          => $borrower->{'phonepro'},
126
    mobile            => $borrower->{'mobile'},
127
    email             => $borrower->{'email'},
128
    emailpro          => $borrower->{'emailpro'},
129
    borrowernotes     => $borrower->{'borrowernotes'},
130
    city              => $borrower->{'city'},
131
    state             => $borrower->{'state'},
132
    zipcode           => $borrower->{'zipcode'},
133
    country           => $borrower->{'country'},
134
    cardnumber        => $borrower->{'cardnumber'},
135
    RoutingSerials => C4::Context->preference('RoutingSerials'),
136
);
116
);
137
117
138
if (C4::Context->preference('ExtendedPatronAttributes')) {
118
if (C4::Context->preference('ExtendedPatronAttributes')) {
(-)a/members/statistics.pl (-6 / +5 lines)
Lines 96-110 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
96
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
96
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
97
$template->param( picture => 1 ) if $picture;
97
$template->param( picture => 1 ) if $picture;
98
98
99
# Computes full borrower address
100
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
99
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
101
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
100
$template->param(%$borrower);
102
101
103
$template->param(
102
$template->param(
104
    statisticsview => 1,
103
    statisticsview     => 1,
105
    datas          => $datas,
104
    datas              => $datas,
106
    address        => $address,
105
    roadtype           => $roadtype,
107
    column_names   => \@statistic_column_names,
106
    column_names       => \@statistic_column_names,
108
    count_total_issues => $count_total_issues,
107
    count_total_issues => $count_total_issues,
109
    count_total_issues_returned => $count_total_issues_returned,
108
    count_total_issues_returned => $count_total_issues_returned,
110
    count_total_precedent_state => $count_total_precedent_state,
109
    count_total_precedent_state => $count_total_precedent_state,
(-)a/tools/viewlog.pl (-23 / +2 lines)
Lines 85-118 if ( $src eq 'circ' ) { Link Here
85
        );
85
        );
86
    }
86
    }
87
87
88
    # Computes full borrower address
89
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
88
    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
90
    my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
89
    $template->param(%$data);
91
90
92
    $template->param(
91
    $template->param(
93
        menu           => 1,
92
        menu           => 1,
94
        title          => $data->{'title'},
95
        initials       => $data->{'initials'},
96
        surname        => $data->{'surname'},
97
        othernames     => $data->{'othernames'},
98
        borrowernumber => $borrowernumber,
93
        borrowernumber => $borrowernumber,
99
        firstname      => $data->{'firstname'},
100
        cardnumber     => $data->{'cardnumber'},
101
        categorycode   => $data->{'categorycode'},
102
        category_type  => $data->{'category_type'},
103
        categoryname   => $data->{'description'},
94
        categoryname   => $data->{'description'},
104
        address        => $address,
95
        roadtype       => $roadtype,
105
        address2       => $data->{'address2'},
106
        city           => $data->{'city'},
107
        state          => $data->{'state'},
108
        zipcode        => $data->{'zipcode'},
109
        country        => $data->{'country'},
110
        phone          => $data->{'phone'},
111
        phonepro       => $data->{'phonepro'},
112
        mobile         => $data->{'mobile'},
113
        email          => $data->{'email'},
114
        emailpro       => $data->{'emailpro'},
115
        branchcode     => $data->{'branchcode'},
116
        branchname     => GetBranchName( $data->{'branchcode'} ),
96
        branchname     => GetBranchName( $data->{'branchcode'} ),
117
        RoutingSerials => C4::Context->preference('RoutingSerials'),
97
        RoutingSerials => C4::Context->preference('RoutingSerials'),
118
    );
98
    );
119
- 

Return to bug 4041