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

(-)a/C4/Members.pm (-67 lines)
Lines 71-78 BEGIN { Link Here
71
71
72
        &GetAge
72
        &GetAge
73
        &GetCities
73
        &GetCities
74
        &GetRoadTypes
75
        &GetRoadTypeDetails
76
        &GetSortDetails
74
        &GetSortDetails
77
        &GetTitles
75
        &GetTitles
78
76
Lines 1860-1907 EOF Link Here
1860
    return 0;
1858
    return 0;
1861
}
1859
}
1862
1860
1863
=head2 GetRoadTypes (OUEST-PROVENCE)
1864
1865
  ($idroadtypearrayref, $roadttype_hashref) = &GetRoadTypes();
1866
1867
Looks up the different road type . Returns two
1868
elements: a reference-to-array, which lists the id_roadtype
1869
codes, and a reference-to-hash, which maps the road type of the road .
1870
1871
=cut
1872
1873
sub GetRoadTypes {
1874
    my $dbh   = C4::Context->dbh;
1875
    my $query = qq|
1876
SELECT roadtypeid,road_type 
1877
FROM roadtype 
1878
ORDER BY road_type|;
1879
    my $sth = $dbh->prepare($query);
1880
    $sth->execute();
1881
    my %roadtype;
1882
    my @id;
1883
1884
    #    insert empty value to create a empty choice in cgi popup
1885
1886
    while ( my $data = $sth->fetchrow_hashref ) {
1887
1888
        push @id, $data->{'roadtypeid'};
1889
        $roadtype{ $data->{'roadtypeid'} } = $data->{'road_type'};
1890
    }
1891
1892
#test to know if the table contain some records if no the function return nothing
1893
    my $id = @id;
1894
    if ( $id eq 0 ) {
1895
        return ();
1896
    }
1897
    else {
1898
        unshift( @id, "" );
1899
        return ( \@id, \%roadtype );
1900
    }
1901
}
1902
1903
1904
1905
=head2 GetTitles (OUEST-PROVENCE)
1861
=head2 GetTitles (OUEST-PROVENCE)
1906
1862
1907
  ($borrowertitle)= &GetTitles();
1863
  ($borrowertitle)= &GetTitles();
Lines 2001-2029 sub GetHideLostItemsPreference { Link Here
2001
    return $hidelostitems;    
1957
    return $hidelostitems;    
2002
}
1958
}
2003
1959
2004
=head2 GetRoadTypeDetails (OUEST-PROVENCE)
2005
2006
  ($roadtype) = &GetRoadTypeDetails($roadtypeid);
2007
2008
Returns the description of roadtype
2009
C<&$roadtype>return description of road type
2010
C<&$roadtypeid>this is the value of roadtype s
2011
2012
=cut
2013
2014
sub GetRoadTypeDetails {
2015
    my ($roadtypeid) = @_;
2016
    my $dbh          = C4::Context->dbh;
2017
    my $query        = qq|
2018
SELECT road_type 
2019
FROM roadtype 
2020
WHERE roadtypeid=?|;
2021
    my $sth = $dbh->prepare($query);
2022
    $sth->execute($roadtypeid);
2023
    my $roadtype = $sth->fetchrow;
2024
    return ($roadtype);
2025
}
2026
2027
=head2 GetBorrowersToExpunge
1960
=head2 GetBorrowersToExpunge
2028
1961
2029
  $borrowers = &GetBorrowersToExpunge(
1962
  $borrowers = &GetBorrowersToExpunge(
(-)a/admin/roadtype.pl (-129 lines)
Lines 1-129 Link Here
1
#! /usr/bin/perl
2
3
# Copyright 2006 SAN OUEST-PROVENCE et Paul POULAIN
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use strict;
21
use warnings;
22
23
use CGI;
24
use C4::Context;
25
use C4::Output;
26
use C4::Auth;
27
28
29
sub StringSearch  {
30
    my $sth = C4::Context->dbh->prepare("Select * from roadtype where (road_type like ?) ORDER BY road_type");
31
    $sth->execute((shift || '') . '%');
32
    return $sth->fetchall_arrayref({});
33
}
34
35
my $input = new CGI;
36
my $searchfield=$input->param('road_type');
37
my $script_name="/cgi-bin/koha/admin/roadtype.pl";
38
my $roadtypeid=$input->param('roadtypeid');
39
my $op = $input->param('op') || '';
40
41
my ($template, $loggedinuser, $cookie)
42
    = get_template_and_user({template_name => "admin/roadtype.tmpl",
43
			     query => $input,
44
			     type => "intranet",
45
			     authnotrequired => 0,
46
                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
47
			     debug => 1,
48
			     });
49
50
51
$template->param(	script_name => $script_name,
52
		 	roadtypeid => $roadtypeid ,
53
		 	searchfield => $searchfield);
54
55
56
################## ADD_FORM ##################################
57
# called by default. Used to create form to add or  modify a record
58
if ($op eq 'add_form') {
59
	$template->param(add_form => 1);
60
	
61
	#---- if primkey exists, it's a modify action, so read values to modify...
62
	my $data;
63
	if ($roadtypeid) {
64
		my $dbh = C4::Context->dbh;
65
		my $sth=$dbh->prepare("select roadtypeid,road_type from roadtype where roadtypeid=?");
66
		$sth->execute($roadtypeid);
67
		$data=$sth->fetchrow_hashref;
68
		$sth->finish;
69
	}
70
71
	$template->param(	
72
				road_type       => $data->{'road_type'},
73
			);
74
##############ICI#####################
75
# END $OP eq ADD_FORM
76
################## ADD_VALIDATE #################################
77
# called by add_form, used to insert/modify data in DB
78
} elsif ($op eq 'add_validate') {
79
	my $dbh = C4::Context->dbh;
80
 	my $sth;
81
	
82
	if ($input->param('roadtypeid') ){
83
		$sth=$dbh->prepare("UPDATE roadtype SET road_type=? WHERE roadtypeid=?");
84
		$sth->execute($input->param('road_type'),$input->param('roadtypeid'));
85
	
86
	}
87
	else{	
88
		$sth=$dbh->prepare("INSERT INTO roadtype (road_type) VALUES (?)");
89
		$sth->execute($input->param('road_type'));
90
	}
91
	$sth->finish;
92
    print $input->redirect("/cgi-bin/koha/admin/roadtype.pl");
93
	exit;
94
95
# END $OP eq ADD_VALIDATE
96
################## DELETE_CONFIRM ##################################
97
# called by default form, used to confirm deletion of data in DB
98
} elsif ($op eq 'delete_confirm') {
99
	$template->param(delete_confirm => 1);
100
	my $dbh = C4::Context->dbh;
101
	my $sth2=$dbh->prepare("select roadtypeid,road_type from roadtype where  roadtypeid=?");
102
	$sth2->execute($roadtypeid);
103
	my $data=$sth2->fetchrow_hashref;
104
	$sth2->finish;
105
106
        $template->param(	
107
				road_type       =>	( $data->{'road_type'}),
108
				);
109
110
111
													# END $OP eq DELETE_CONFIRM
112
################## DELETE_CONFIRMED ##################################
113
# called by delete_confirm, used to effectively confirm deletion of data in DB
114
} elsif ($op eq 'delete_confirmed') {
115
	my $dbh = C4::Context->dbh;
116
	my $categorycode=uc($input->param('roadtypeid'));
117
	my $sth=$dbh->prepare("delete from roadtype where roadtypeid=?");
118
	$sth->execute($roadtypeid);
119
	$sth->finish;
120
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=roadtype.pl\"></html>";
121
	exit;
122
													# END $OP eq DELETE_CONFIRMED
123
} else { # DEFAULT
124
	$template->param(else => 1);
125
	$template->param(loop => StringSearch($searchfield));
126
127
128
} #---- END $OP eq DEFAULT
129
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 686-692 if($bor_messages_loop){ $template->param(flagged => 1 ); } Link Here
686
# Computes full borrower address
686
# Computes full borrower address
687
my @fulladdress;
687
my @fulladdress;
688
push @fulladdress, $borrower->{'streetnumber'} if ( $borrower->{'streetnumber'} );
688
push @fulladdress, $borrower->{'streetnumber'} if ( $borrower->{'streetnumber'} );
689
push @fulladdress, &GetRoadTypeDetails( $borrower->{'streettype'} ) if ( $borrower->{'streettype'} );
689
push @fulladdress, C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} ) if ( $borrower->{'streettype'} );
690
push @fulladdress, $borrower->{'address'} if ( $borrower->{'address'} );
690
push @fulladdress, $borrower->{'address'} if ( $borrower->{'address'} );
691
691
692
my $fast_cataloging = 0;
692
my $fast_cataloging = 0;
(-)a/installer/data/mysql/updatedatabase.pl (+31 lines)
Lines 7974-7979 if(CheckVersion($DBversion)) { Link Here
7974
    SetVersion($DBversion);
7974
    SetVersion($DBversion);
7975
}
7975
}
7976
7976
7977
$DBversion = "3.13.00.XXX";
7978
if ( CheckVersion($DBversion) ) {
7979
    $dbh->{AutoCommit} = 0;
7980
    $dbh->{RaiseError} = 1;
7981
7982
    my $av_added = $dbh->do(q|
7983
        INSERT INTO authorised_values(category, authorised_value, lib, lib_opac)
7984
            SELECT 'ROADTYPE', roadtypeid, road_type, road_type
7985
            FROM roadtype;
7986
    |);
7987
7988
    my $rt_deleted = $dbh->do(q|
7989
        DELETE FROM roadtype
7990
    |);
7991
7992
    if ( $av_added == $rt_deleted or $rt_deleted eq "0E0" ) {
7993
        $dbh->do(q|
7994
            DROP TABLE roadtype;
7995
        |);
7996
        $dbh->commit;
7997
        print "Upgrade to $DBversion done (Bug 7372: Move road types from the roadtype table to the ROADTYPE authorised values)\n";
7998
        SetVersion($DBversion);
7999
    } else {
8000
        print "Upgrade to $DBversion failed (Bug 7372: Move road types from the roadtype table to the ROADTYPE authorised values.\nTransaction aborted because $@\n)";
8001
        $dbh->rollback;
8002
    }
8003
8004
    $dbh->{AutoCommit} = 1;
8005
    $dbh->{RaiseError} = 0;
8006
}
8007
7977
=head1 FUNCTIONS
8008
=head1 FUNCTIONS
7978
8009
7979
=head2 TableExists($table)
8010
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (-1 lines)
Lines 33-39 Link Here
33
	<li><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></li>
33
	<li><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></li>
34
	<li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li>
34
	<li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li>
35
    <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
35
    <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
36
    <li><a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a></li>
37
</ul>
36
</ul>
38
37
39
<h5>Catalog</h5>
38
<h5>Catalog</h5>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-3 lines)
Lines 56-64 Link Here
56
	<dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
56
	<dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
57
    <dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
57
    <dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
58
    <dd>Define cities and towns that your patrons live in.</dd>
58
    <dd>Define cities and towns that your patrons live in.</dd>
59
    <dt><a href="/cgi-bin/koha/admin/roadtype.pl" >Road types</a>
60
    </dt>
61
    <dd>Define road types (street, avenue, way, etc.). Road types display as authorized values when adding/editing patrons and can be used in geographic statistics.</dd>
62
</dl>
59
</dl>
63
</div>
60
</div>
64
<div class="yui-u">
61
<div class="yui-u">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tt (-134 lines)
Lines 1-134 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %]Road types &rsaquo; [% IF ( roadtypeid ) %] Modify road type[% ELSE %] New road type[% END %][% ELSE %][% IF ( delete_confirm ) %]Road types &rsaquo; Confirm deletion of road type[% ELSE %] Road type[% END %][% END %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
5
//<![CDATA[
6
        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
7
        function isNotNull(f,noalert) {
8
                if (f.value.length == 0) {
9
        return false;
10
                }
11
        return true;
12
        }
13
        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
14
        function isNum(v,maybenull) {
15
        var n = new Number(v.value);
16
        if (isNaN(n)) {
17
                return false;
18
                }
19
        if (maybenull == 0 && v.value =='') {
20
                return false;
21
        }
22
        return true;
23
        }
24
        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
25
        function Check(f) {
26
                var ok=1;
27
                var _alertString="";
28
                var alertString2;
29
                if (f.road_type.value.length == 0  ) {
30
                        _alertString += "\n- " + _("Road type");
31
                        alert(_alertString);	
32
                }
33
                else{
34
                document.Aform.submit();
35
                }
36
        }
37
//]]>
38
</script>
39
</head>
40
<body id="admin_roadtype" class="admin">
41
[% INCLUDE 'header.inc' %]
42
[% INCLUDE 'roadtype-admin-search.inc' %]
43
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; [% IF ( add_form ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a> &rsaquo; [% IF ( roadtypeid ) %] Modify road type[% ELSE %] New road type[% END %][% ELSE %][% IF ( delete_confirm ) %]<a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a> &rsaquo; Confirm deletion of road type[% ELSE %] Road type[% END %][% END %]</div>
44
45
<div id="doc3" class="yui-t2">
46
   
47
   <div id="bd">
48
	<div id="yui-main">
49
	<div class="yui-b">
50
51
[% IF ( add_form ) %]
52
	[% IF ( roadtypeid ) %]
53
		<h1>Modify road type</h1>
54
	[% ELSE %]
55
		<h1>New road type</h1>
56
	[% END %]
57
58
	<form action="[% script_name %]" name="Aform" method="post">
59
	<input type="hidden" name="op" value="add_validate" />
60
	<input type="hidden" name="checked" value="0" />
61
	<input type="hidden" name="roadtypeid" value="[% roadtypeid %]" />
62
63
<fieldset class="rows"><ol>
64
[% IF ( roadtypeid ) %]
65
<li>
66
	<span class="label">Road type: </span>[% roadtypeid %]
67
	</li>
68
[% END %]
69
	<li>			
70
		<label for="road_type">Road type: </label>
71
	<input  type="text" name="road_type" id="road_type" size="80" maxlength="100" value="[% road_type |html %]" />
72
	</li></ol></fieldset>
73
	
74
	<fieldset class="action">					  
75
	<input class="button" type="button" onclick="Check(this.form)" value="Submit" />	<a class="cancel" href="/cgi-bin/koha/admin/roadtype.pl">Cancel</a>
76
	</fieldset>
77
	</form>
78
[% END %]
79
80
[% IF ( delete_confirm ) %]
81
    <div class="dialog alert"><h3>Delete road type "[% road_type %]?"</h3>
82
<table>	<tr>
83
        <th>Road type id: </th>
84
			<td>[% roadtypeid %]</td>
85
		</tr>
86
	<tr>	<th>Road type: </th>
87
		<td>[% road_type %]
88
		</td>
89
90
	</tr></table><form action="[% script_name %]" method="post">
91
			<input type="hidden" name="op" value="delete_confirmed" />
92
            <input type="hidden" name="roadtypeid" value="[% roadtypeid %]" /><input type="submit" class="approve" value="Yes, delete" /></form> <form action="[% script_name %]" method="post">
93
            <input type="submit" class="deny" value="No, do not delete" /></form></div>
94
[% END %]
95
96
[% IF ( else ) %]
97
98
<div id="toolbar" class="btn-toolbar">
99
    <a class="btn btn-small" id="addroad" href="/cgi-bin/koha/admin/roadtype.pl?op=add_form"><i class="icon-plus"></i> New road type</a>
100
</div>
101
102
	<h2>Road type</h2>
103
	[% IF ( searchfield ) %]
104
		Search on  [% searchfield %]
105
	[% END %]
106
107
[% IF ( loop ) %]	<table>
108
		<tr>
109
			<th>Road type</th>
110
			<th colspan="2">&nbsp;</th>
111
		</tr>
112
		[% FOREACH loo IN loop %]
113
		[% UNLESS ( loop.odd ) %]
114
		<tr class="highlight">
115
		[% ELSE %]
116
		<tr>
117
		[% END %]
118
			<td>[% loo.road_type %]</td>
119
			<td><a href="[% loo.script_name %]?op=add_form&amp;roadtypeid=[% loo.roadtypeid %]">Edit</a></td>
120
			<td><a href="[% loo.script_name %]?op=delete_confirm&amp;roadtypeid=[% loo.roadtypeid %]">Delete</a></td>
121
		</tr>
122
		[% END %]
123
	</table>[% END %]
124
[% END %]
125
126
</div>
127
</div>
128
<div class="yui-b">
129
[% INCLUDE 'admin-menu.inc' %]
130
</div>
131
</div>
132
[% INCLUDE 'intranet-bottom.inc' %]
133
134
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-3 / +11 lines)
Lines 218-224 Link Here
218
<input type="hidden" name="BorrowerMandatoryField" value="[% BorrowerMandatoryField %]" />
218
<input type="hidden" name="BorrowerMandatoryField" value="[% BorrowerMandatoryField %]" />
219
<input type="hidden" name="category_type" value="[% category_type %]" />
219
<input type="hidden" name="category_type" value="[% category_type %]" />
220
<input type="hidden" name="updtype" value="[% updtype %]" />
220
<input type="hidden" name="updtype" value="[% updtype %]" />
221
<input type="hidden" name="select_roadtype" value="[% select_roadtype %]" />
222
<input type="hidden" name="destination" value="[% destination %]" />
221
<input type="hidden" name="destination" value="[% destination %]" />
223
<input type="hidden" name="check_member" value="[% check_member %]" />
222
<input type="hidden" name="check_member" value="[% check_member %]" />
224
<input type="hidden" name="borrowernumber" value="[% IF ( opduplicate ) %][% ELSE %][% borrowernumber %][% END %]" />
223
<input type="hidden" name="borrowernumber" value="[% IF ( opduplicate ) %][% ELSE %][% borrowernumber %][% END %]" />
Lines 456-462 Link Here
456
    </li>
455
    </li>
457
        [% END %]
456
        [% END %]
458
        [% UNLESS nostreettype %]
457
        [% UNLESS nostreettype %]
459
    [% IF ( road_cgipopup ) %]
458
    [% IF roadtypes %]
460
      <li>
459
      <li>
461
      [% IF ( mandatorystreettype ) %]
460
      [% IF ( mandatorystreettype ) %]
462
      <label for="streettype" class="required">
461
      <label for="streettype" class="required">
Lines 464-470 Link Here
464
      <label for="streettype">
463
      <label for="streettype">
465
      [% END %]
464
      [% END %]
466
      Street type: </label>
465
      Street type: </label>
467
      [% roadpopup %]
466
      <select name="streettype">
467
        <option value=""></option>
468
        [% FOR roadtype IN roadtypes %]
469
          [% IF roadtype.selected %]
470
            <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
471
          [% ELSE %]
472
            <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
473
          [% END %]
474
        [% END %]
475
      </select>
468
	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
476
	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
469
      </li>
477
      </li>
470
    [% END %] 
478
    [% END %] 
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-3 / +1 lines)
Lines 212-220 function validate1(date) { Link Here
212
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
212
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
213
213
214
<p class="address">[% streetnumber %]
214
<p class="address">[% streetnumber %]
215
        [% IF ( roaddetails ) %]
215
        [% IF roadtype %][% roadtype %][% END %]
216
         [% roaddetails %]
217
        [% END %]
218
        [% address %]<br />
216
        [% address %]<br />
219
        [% IF ( address2 ) %][% address2 %]<br />[% END %]
217
        [% IF ( address2 ) %][% address2 %]<br />[% END %]
220
    	[% IF ( city ) %][% city %][% END %] 
218
    	[% IF ( city ) %][% city %][% END %] 
(-)a/members/memberentry.pl (-13 / +2 lines)
Lines 204-210 if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) Link Here
204
        qr/^nodouble$/,
204
        qr/^nodouble$/,
205
        qr/^op$/,
205
        qr/^op$/,
206
        qr/^save$/,
206
        qr/^save$/,
207
        qr/^select_roadtype$/,
208
        qr/^updtype$/,
207
        qr/^updtype$/,
209
        qr/^SMSnumber$/,
208
        qr/^SMSnumber$/,
210
        qr/^setting_extended_patron_attributes$/,
209
        qr/^setting_extended_patron_attributes$/,
Lines 549-565 if (@{$city_arrayref} ) { Link Here
549
    }
548
    }
550
}
549
}
551
  
550
  
552
my $default_roadtype;
551
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE', $data{streettype} );
553
$default_roadtype=$data{'streettype'} ;
552
$template->param( roadtypes => $roadtypes);
554
my($roadtypeid,$road_type)=GetRoadTypes();
555
  $template->param( road_cgipopup => 1) if ($roadtypeid );
556
my $roadpopup = CGI::popup_menu(-name=>'streettype',
557
        -id => 'streettype',
558
        -values=>$roadtypeid,
559
        -labels=>$road_type,
560
        -override => 1,
561
        -default=>$default_roadtype
562
        );  
563
553
564
my $default_borrowertitle = '';
554
my $default_borrowertitle = '';
565
unless ( $op eq 'duplicate' ) { $default_borrowertitle=$data{'title'} }
555
unless ( $op eq 'duplicate' ) { $default_borrowertitle=$data{'title'} }
Lines 731-737 $template->param( Link Here
731
  ethcatpopup => $ethcatpopup,
721
  ethcatpopup => $ethcatpopup,
732
  relshiploop => \@relshipdata,
722
  relshiploop => \@relshipdata,
733
  city_loop => $city_arrayref,
723
  city_loop => $city_arrayref,
734
  roadpopup => $roadpopup,  
735
  borrotitlepopup => $borrotitlepopup,
724
  borrotitlepopup => $borrotitlepopup,
736
  guarantorinfo   => $guarantorinfo,
725
  guarantorinfo   => $guarantorinfo,
737
  flagloop  => \@flagdata,
726
  flagloop  => \@flagdata,
(-)a/members/moremember.pl (-2 / +2 lines)
Lines 246-252 my $relissue = []; Link Here
246
if ( @borrowernumbers ) {
246
if ( @borrowernumbers ) {
247
    $relissue    = GetPendingIssues(@borrowernumbers);
247
    $relissue    = GetPendingIssues(@borrowernumbers);
248
}
248
}
249
my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
249
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
250
my $today       = DateTime->now( time_zone => C4::Context->tz);
250
my $today       = DateTime->now( time_zone => C4::Context->tz);
251
$today->truncate(to => 'day');
251
$today->truncate(to => 'day');
252
my @borrowers_with_issues;
252
my @borrowers_with_issues;
Lines 412-418 $template->param( Link Here
412
    detailview => 1,
412
    detailview => 1,
413
    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
413
    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
414
    CANDELETEUSER    => $candeleteuser,
414
    CANDELETEUSER    => $candeleteuser,
415
    roaddetails     => $roaddetails,
415
    roadtype        => $roadtype,
416
    borrowernumber  => $borrowernumber,
416
    borrowernumber  => $borrowernumber,
417
    othernames      => $data->{'othernames'},
417
    othernames      => $data->{'othernames'},
418
    categoryname    => $data->{'description'},
418
    categoryname    => $data->{'description'},
(-)a/members/routing-lists.pl (-3 / +2 lines)
Lines 101-108 if ($borrowernumber) { Link Here
101
101
102
102
103
# Computes full borrower address
103
# Computes full borrower address
104
my (undef, $roadttype_hashref) = &GetRoadTypes();
104
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
105
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
105
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
106
106
107
$template->param(
107
$template->param(
108
108
109
- 

Return to bug 7372