@@ -, +, @@ --- .../prog/en/includes/member-display-address-style-us.inc | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 1 + .../intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 1 + members/boraccount.pl | 3 --- members/discharge.pl | 2 ++ members/files.pl | 5 ----- members/mancredit.pl | 2 -- members/maninvoice.pl | 2 -- members/member-flags.pl | 7 ++----- members/member-password.pl | 7 ++----- members/moremember.pl | 2 -- members/notices.pl | 2 -- members/pay.pl | 2 -- members/paycollect.pl | 3 --- members/purchase-suggestions.pl | 4 ---- members/readingrec.pl | 2 -- members/routing-lists.pl | 2 -- members/statistics.pl | 2 -- members/summary-print.pl | 5 ----- tools/viewlog.pl | 2 -- 28 files changed, 21 insertions(+), 49 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc @@ -1,6 +1,10 @@ [% IF ( address or address2 ) %] [% IF ( address ) %] -
  • [% if (streetnumber) %][% streetnumber %][% end %] [% address %][%if (roadtype) %] [% roadtype %][% end %]
  • + [% SET roadtype_desc = '' %] + [% IF streettype %] + [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %] + [% END %] +
  • [% if (streetnumber) %][% streetnumber %][% end %] [% IF roadtype_desc %][% roadtype_desc %] [% END %][% address %][% end %]
  • [% END %] [% IF ( address2 ) %]
  • [% address2 %]
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › [% IF (unknowuser) %]Patron does not exist[% ELSE %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %] [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] Files for [% INCLUDE 'patron-title.inc' %] [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -1,5 +1,6 @@ [% USE Koha %] [% USE KohaDates %] +[% USE AuthorisedValues %] [% USE ColumnsSettings %] [% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %] [% SET exports_enabled = 1 %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE AuthorisedValues %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Sent notices for [% INCLUDE 'patron-title.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › Pay Fines for [% borrower.firstname %] [% borrower.surname %] [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › Purchase suggestions for [% INCLUDE 'patron-title.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -1,5 +1,6 @@ [% USE KohaDates %] [% USE Koha %] +[% USE AuthorisedValues %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] Circulation History for [% INCLUDE 'patron-title.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] Subscription Routing Lists for [% INCLUDE 'patron-title.inc' %] [% INCLUDE 'doc-head-close.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › [% IF ( unknowuser ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] <title> Koha › Tools › --- a/members/boraccount.pl +++ a/members/boraccount.pl @@ -104,14 +104,11 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { ); } -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); - $template->param(%$data); $template->param( finesview => 1, borrowernumber => $borrowernumber, - roadtype => $roadtype, branchname => GetBranchName($data->{'branchcode'}), total => sprintf("%.2f",$total), totalcredit => $totalcredit, --- a/members/discharge.pl +++ a/members/discharge.pl @@ -115,6 +115,8 @@ if ( $input->param('borrowernumber') ) { category_type => $data->{'category_type'}, categoryname => $data->{'description'}, address => $data->{'address'}, + streetnumber => $data->{streetnumber}, + streettype => $data->{streettype}, address2 => $data->{'address2'}, city => $data->{'city'}, zipcode => $data->{'zipcode'}, --- a/members/files.pl +++ a/members/files.pl @@ -118,16 +118,11 @@ else { my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'}); $template->param( picture => 1 ) if $picture; - # Computes full borrower address - my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); - my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'}; - $template->param( files => Koha::Borrower::Files->new( borrowernumber => $borrowernumber ) ->GetFilesInfo(), errors => \%errors, - address => $address, ); output_html_with_http_headers $cgi, $cookie, $template->output; } --- a/members/mancredit.pl +++ a/members/mancredit.pl @@ -91,14 +91,12 @@ if ($add){ ); } - my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); $template->param(%$data); $template->param( finesview => 1, borrowernumber => $borrowernumber, categoryname => $data->{'description'}, - roadtype => $roadtype, branchname => GetBranchName($data->{'branchcode'}), is_child => ($data->{'category_type'} eq 'C'), activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), --- a/members/maninvoice.pl +++ a/members/maninvoice.pl @@ -117,14 +117,12 @@ if ($add){ ); } - my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); $template->param(%$data); $template->param( finesview => 1, borrowernumber => $borrowernumber, categoryname => $data->{'description'}, branchname => GetBranchName($data->{'branchcode'}), - roadtype => $roadtype, is_child => ($data->{'category_type'} eq 'C'), activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), RoutingSerials => C4::Context->preference('RoutingSerials'), --- a/members/member-flags.pl +++ a/members/member-flags.pl @@ -168,10 +168,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { ); } -# Computes full borrower address -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $bor->{streettype} ); -my $address = $bor->{'streetnumber'} . " $roadtype " . $bor->{'address'}; - $template->param( borrowernumber => $bor->{'borrowernumber'}, cardnumber => $bor->{'cardnumber'}, @@ -181,8 +177,9 @@ $template->param( categorycode => $bor->{'categorycode'}, category_type => $bor->{'category_type'}, categoryname => $bor->{'description'}, - address => $address, + address => $bor->{address}, address2 => $bor->{'address2'}, + streettype => $bor->{streettype}, city => $bor->{'city'}, state => $bor->{'state'}, zipcode => $bor->{'zipcode'}, --- a/members/member-password.pl +++ a/members/member-password.pl @@ -100,10 +100,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { ); } -# Computes full borrower address -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $bor->{streettype} ) // ''; -my $address = $bor->{'streetnumber'} . " $roadtype " . $bor->{'address'}; - $template->param( othernames => $bor->{'othernames'}, surname => $bor->{'surname'}, firstname => $bor->{'firstname'}, @@ -112,8 +108,9 @@ my $address = $bor->{'streetnumber'} . " $roadtype " . $bor->{'address'}; categorycode => $bor->{'categorycode'}, category_type => $bor->{'category_type'}, categoryname => $bor->{'description'}, - address => $address, + address => $bor->{address}, address2 => $bor->{'address2'}, + streettype => $$bor->{streettype}, city => $bor->{'city'}, state => $bor->{'state'}, zipcode => $bor->{'zipcode'}, --- a/members/moremember.pl +++ a/members/moremember.pl @@ -248,7 +248,6 @@ my $relatives_issues_count = Koha::Database->new()->schema()->resultset('Issue') ->count( { borrowernumber => \@relatives } ); -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); my $today = DateTime->now( time_zone => C4::Context->tz); $today->truncate(to => 'day'); my $overdues_exist = 0; @@ -333,7 +332,6 @@ $template->param( $data->{'categorycode'} => 1 ); $template->param( detailview => 1, AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), - roadtype => $roadtype, borrowernumber => $borrowernumber, othernames => $data->{'othernames'}, categoryname => $data->{'description'}, --- a/members/notices.pl +++ a/members/notices.pl @@ -60,7 +60,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { ); } -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} ); $template->param(%$borrower); $template->param( @@ -69,7 +68,6 @@ $template->param( sentnotices => 1, branchname => GetBranchName($borrower->{'branchcode'}), categoryname => $borrower->{'description'}, - roadtype => $roadtype, activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), RoutingSerials => C4::Context->preference('RoutingSerials'), ); --- a/members/pay.pl +++ a/members/pay.pl @@ -228,8 +228,6 @@ sub borrower_add_additional_fields { if ($picture) { $b_ref->{has_picture} = 1; } - my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} ); - $b_ref->{roadtype} = $roadtype; if (C4::Context->preference('ExtendedPatronAttributes')) { $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber); --- a/members/paycollect.pl +++ a/members/paycollect.pl @@ -184,9 +184,6 @@ sub borrower_add_additional_fields { $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber); } - my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} ); - $b_ref->{roadtype} = $roadtype; - $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} ); return; } --- a/members/purchase-suggestions.pl +++ a/members/purchase-suggestions.pl @@ -62,10 +62,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { ); } -# Computes full borrower address -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} ); -$template->param( roadtype => $roadtype ); - my ($picture, $dberror) = GetPatronImage($borrowernumber); $template->param( picture => 1 ) if $picture; --- a/members/readingrec.pl +++ a/members/readingrec.pl @@ -117,14 +117,12 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { } -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); $template->param(%$data); $template->param( readingrecordview => 1, borrowernumber => $borrowernumber, categoryname => $data->{description}, - roadtype => $roadtype, is_child => ( $data->{category_type} eq 'C' ), branchname => $branches->{ $data->{branchcode} }->{branchname}, loop_reading => $issues, --- a/members/routing-lists.pl +++ a/members/routing-lists.pl @@ -101,7 +101,6 @@ if ($borrowernumber) { ################################################################################## -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} ); $template->param(%$borrower); $template->param( @@ -111,7 +110,6 @@ $template->param( branch => $branch, branchname => GetBranchName($borrower->{'branchcode'}), categoryname => $borrower->{description}, - roadtype => $roadtype, RoutingSerials => C4::Context->preference('RoutingSerials'), ); --- a/members/statistics.pl +++ a/members/statistics.pl @@ -96,13 +96,11 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'}); $template->param( picture => 1 ) if $picture; -my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} ); $template->param(%$borrower); $template->param( statisticsview => 1, datas => $datas, - roadtype => $roadtype, column_names => \@statistic_column_names, count_total_issues => $count_total_issues, count_total_issues_returned => $count_total_issues_returned, --- a/members/summary-print.pl +++ a/members/summary-print.pl @@ -58,10 +58,6 @@ foreach my $accountline (@$accts) { } } -my $roadtype = - C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ) // ''; -$roadtype = '' if ( ! $roadtype ); - our $totalprice = 0; my $total_format = ''; $total_format = sprintf( "%.2f", $total ) if ($total); @@ -74,7 +70,6 @@ $template->param( %$data, borrowernumber => $borrowernumber, - address => $data->{'streetnumber'} . " $roadtype " . $data->{'address'}, accounts => $accts, totaldue => $total_format, --- a/tools/viewlog.pl +++ a/tools/viewlog.pl @@ -84,14 +84,12 @@ if ( $src eq 'circ' ) { ); } - my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} ); $template->param(%$data); $template->param( menu => 1, borrowernumber => $borrowernumber, categoryname => $data->{'description'}, - roadtype => $roadtype, branchname => GetBranchName( $data->{'branchcode'} ), RoutingSerials => C4::Context->preference('RoutingSerials'), ); --