@@ -, +, @@ using the system preference - Apply patch on top of 1st and 2nd patch - Select 'German style' in system preference 'addressformat' in I18N/L10N - Verify that the address information displays properly in the left column of all patron's pages. - Verify that the address displays properly in the main area of moremember.pl as well (Note: In right column, Alternate address /contact are not yet touched)) - Switch system preference to US style, repeat checks --- circ/circulation.pl | 31 ++------ .../intranet-tmpl/prog/en/includes/circ-menu.inc | 54 +++++++------- .../intranet-tmpl/prog/en/includes/circ-menu.tt | 76 ++++++++++---------- .../includes/member-display-address-style-de.inc | 13 ++++ .../includes/member-display-address-style-us.inc | 13 ++++ .../prog/en/modules/members/boraccount.tt | 1 + .../prog/en/modules/members/mancredit.tt | 1 + .../prog/en/modules/members/maninvoice.tt | 1 + .../prog/en/modules/members/moremember.tt | 14 ++-- .../prog/en/modules/members/notices.tt | 1 + .../intranet-tmpl/prog/en/modules/members/pay.tt | 4 +- .../prog/en/modules/members/paycollect.tt | 3 +- .../en/modules/members/purchase-suggestions.tt | 1 + .../prog/en/modules/members/routing-lists.tt | 1 + .../prog/en/modules/members/statistics.tt | 1 + .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 1 + members/boraccount.pl | 29 ++------ members/mancredit.pl | 50 +++++-------- members/maninvoice.pl | 53 +++++--------- members/moremember.pl | 10 +-- members/notices.pl | 20 +++--- members/pay.pl | 8 ++- members/paycollect.pl | 7 +- members/purchase-suggestions.pl | 3 +- members/readingrec.pl | 24 +------ members/routing-lists.pl | 26 +------ members/statistics.pl | 11 ++- tools/viewlog.pl | 24 +------ 28 files changed, 190 insertions(+), 291 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc --- a/circ/circulation.pl +++ a/circ/circulation.pl @@ -527,12 +527,6 @@ if($lib_messages_loop){ $template->param(flagged => 1 ); } my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch ); if($bor_messages_loop){ $template->param(flagged => 1 ); } -# Computes full borrower address -my @fulladdress; -push @fulladdress, $borrower->{'streetnumber'} if ( $borrower->{'streetnumber'} ); -push @fulladdress, C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} ) if ( $borrower->{'streettype'} ); -push @fulladdress, $borrower->{'address'} if ( $borrower->{'address'} ); - my $fast_cataloging = 0; if (defined getframeworkinfo('FA')) { $fast_cataloging = 1 @@ -551,6 +545,10 @@ my $relatives_issues_count = Koha::Database->new()->schema()->resultset('Issue') ->count( { borrowernumber => \@relatives } ); +my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} ); + +$template->param(%$borrower); + $template->param( lib_messages_loop => $lib_messages_loop, bor_messages_loop => $bor_messages_loop, @@ -562,28 +560,9 @@ $template->param( branchname => GetBranchName($borrower->{'branchcode'}), printer => $printer, printername => $printer, - firstname => $borrower->{'firstname'}, - surname => $borrower->{'surname'}, - showname => $borrower->{'showname'}, - category_type => $borrower->{'category_type'}, was_renewed => $query->param('was_renewed') ? 1 : 0, expiry => format_date($borrower->{'dateexpiry'}), - categorycode => $borrower->{'categorycode'}, - categoryname => $borrower->{description}, - address => join(' ', @fulladdress), - address2 => $borrower->{'address2'}, - email => $borrower->{'email'}, - emailpro => $borrower->{'emailpro'}, - borrowernotes => $borrower->{'borrowernotes'}, - city => $borrower->{'city'}, - state => $borrower->{'state'}, - zipcode => $borrower->{'zipcode'}, - country => $borrower->{'country'}, - phone => $borrower->{'phone'}, - mobile => $borrower->{'mobile'}, - phonepro => $borrower->{'phonepro'}, - cardnumber => $borrower->{'cardnumber'}, - othernames => $borrower->{'othernames'}, + roadtype => $roadtype, amountold => $amountold, barcode => $barcode, stickyduedate => $stickyduedate, --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -5,30 +5,20 @@ }