@@ -, +, @@ --- acqui/acqui-home.pl | 5 +- acqui/booksellers.pl | 3 +- admin/aqbudgets.pl | 3 +- circ/branchtransfers.pl | 5 +- circ/overdue.pl | 15 --- circ/transferstoreceive.pl | 8 +- circ/waitingreserves.pl | 6 +- .../prog/en/includes/borrower_debarments.inc | 4 +- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 66 ++++++------ .../en/includes/member-alt-address-style-de.inc | 22 ++-- .../en/includes/member-alt-address-style-fr.inc | 22 ++-- .../en/includes/member-alt-address-style-us.inc | 20 ++-- .../en/includes/member-alt-contact-style-de.inc | 18 ++-- .../en/includes/member-alt-contact-style-fr.inc | 18 ++-- .../en/includes/member-alt-contact-style-us.inc | 18 ++-- .../includes/member-display-address-style-de.inc | 20 ++-- .../includes/member-display-address-style-fr.inc | 22 ++-- .../includes/member-display-address-style-us.inc | 20 ++-- .../member-display-alt-address-style-de.inc | 20 ++-- .../member-display-alt-address-style-fr.inc | 26 ++--- .../member-display-alt-address-style-us.inc | 20 ++-- .../en/includes/member-main-address-style-de.inc | 18 ++-- .../en/includes/member-main-address-style-fr.inc | 18 ++-- .../en/includes/member-main-address-style-us.inc | 18 ++-- .../prog/en/includes/members-toolbar.inc | 42 ++++---- .../prog/en/modules/acqui/acqui-home.tt | 4 +- .../prog/en/modules/acqui/booksellers.tt | 6 +- .../prog/en/modules/admin/aqbudgets.tt | 8 +- .../prog/en/modules/circ/branchtransfers.tt | 6 +- .../prog/en/modules/circ/printslip.tt | 2 +- .../prog/en/modules/circ/transferstoreceive.tt | 14 +-- .../prog/en/modules/circ/waitingreserves.tt | 14 +-- .../prog/en/modules/members/boraccount.tt | 10 +- .../prog/en/modules/members/deletemem.tt | 14 +-- .../prog/en/modules/members/discharge.tt | 8 +- .../prog/en/modules/members/housebound.tt | 16 +-- .../prog/en/modules/members/mancredit.tt | 12 +-- .../prog/en/modules/members/maninvoice.tt | 12 +-- .../prog/en/modules/members/member-flags.tt | 10 +- .../prog/en/modules/members/member-password.tt | 14 +-- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/moremember-print.tt | 20 ++-- .../prog/en/modules/members/moremember.tt | 120 ++++++++++----------- .../intranet-tmpl/prog/en/modules/members/pay.tt | 21 ++-- .../prog/en/modules/members/paycollect.tt | 26 ++--- .../prog/en/modules/members/printfeercpt.tt | 9 +- .../prog/en/modules/members/printinvoice.tt | 9 +- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 4 +- .../prog/en/modules/members/routing-lists.tt | 4 +- .../prog/en/modules/reserve/request.tt | 50 ++++----- .../prog/en/modules/reviews/reviewswaiting.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 12 ++- members/boraccount.pl | 4 +- members/deletemem.pl | 18 +--- members/discharge.pl | 26 +---- members/files.pl | 6 +- members/housebound.pl | 7 +- members/mancredit.pl | 4 +- members/maninvoice.pl | 5 +- members/member-flags.pl | 22 +--- members/member-password.pl | 24 +---- members/moremember.pl | 15 +-- members/notices.pl | 4 +- members/pay.pl | 13 +-- members/paycollect.pl | 5 +- members/printfeercpt.pl | 26 +---- members/printinvoice.pl | 25 +---- members/purchase-suggestions.pl | 8 +- members/readingrec.pl | 35 +++--- members/routing-lists.pl | 15 +-- members/statistics.pl | 11 +- members/summary-print.pl | 9 +- opac/opac-detail.pl | 2 +- opac/opac-reserve.pl | 4 - reserve/request.pl | 22 +--- reviews/reviewswaiting.pl | 3 +- tools/viewlog.pl | 10 +- 78 files changed, 486 insertions(+), 725 deletions(-) --- a/acqui/acqui-home.pl +++ a/acqui/acqui-home.pl @@ -73,10 +73,7 @@ foreach my $budget ( @{$budget_arr} ) { my $patron = Koha::Patrons->find( $budget->{budget_owner_id} ); if ( $patron ) { - # FIXME should pass the entire object into budget_owner - $budget->{budget_owner_firstname} = $patron->firstname; - $budget->{budget_owner_surname} = $patron->surname; - $budget->{budget_owner_borrowernumber} = $patron->borrowernumber; + $budget->{budget_owner} = $patron; } if ( !defined $budget->{budget_amount} ) { --- a/acqui/booksellers.pl +++ a/acqui/booksellers.pl @@ -139,8 +139,7 @@ for my $vendor (@suppliers) { $basket->{$_} ||= 0; } if ( $patron ) { - $basket->{authorisedby_firstname} = $patron->firstname; - $basket->{authorisedby_surname} = $patron->surname; + $basket->{authorisedby} = $patron; } if ($basket->{basketgroupid}) { my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid}); --- a/admin/aqbudgets.pl +++ a/admin/aqbudgets.pl @@ -117,8 +117,7 @@ if ($op eq 'add_form') { exit; } $dropbox_disabled = BudgetHasChildren($budget_id); - my $patron = Koha::Patrons->find( $budget->{budget_owner_id} ); - $budget->{budget_owner_name} = ( $patron ? $patron->firstname . ' ' . $patron->surname : '' ); + $budget->{budget_owner} = Koha::Patrons->find( $budget->{budget_owner_id} ); } # build budget hierarchy --- a/circ/branchtransfers.pl +++ a/circ/branchtransfers.pl @@ -211,10 +211,7 @@ foreach my $code ( keys %$messages ) { $err{borrowernumber} = $messages->{'WasReturned'}; my $patron = Koha::Patrons->find( $messages->{'WasReturned'} ); if ( $patron ) { # Just in case... - $err{title} = $patron->title; - $err{firstname} = $patron->firstname; - $err{surname} = $patron->surname; - $err{cardnumber} = $patron->cardnumber; + $err{patron} = $patron; } } $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' ); --- a/circ/overdue.pl +++ a/circ/overdue.pl @@ -300,27 +300,12 @@ if ($noreport) { push @overduedata, { patron => scalar Koha::Patrons->find( $data->{borrowernumber} ), duedate => $data->{date_due}, - borrowernumber => $data->{borrowernumber}, barcode => $data->{barcode}, - cardnumber => $data->{cardnumber}, itemnum => $data->{itemnumber}, issuedate => output_pref({ dt => dt_from_string( $data->{issuedate} ), dateonly => 1 }), - borrowertitle => $data->{borrowertitle}, - surname => $data->{surname}, - firstname => $data->{firstname}, - streetnumber => $data->{streetnumber}, - streettype => $data->{streettype}, - address => $data->{address}, - address2 => $data->{address2}, - city => $data->{city}, - zipcode => $data->{zipcode}, - country => $data->{country}, - phone => $data->{phone}, - email => $data->{email}, biblionumber => $data->{biblionumber}, title => $data->{title}, author => $data->{author}, - branchcode => $data->{branchcode}, homebranchcode => $data->{homebranchcode}, holdingbranchcode => $data->{holdingbranchcode}, itemcallnumber => $data->{itemcallnumber}, --- a/circ/transferstoreceive.pl +++ a/circ/transferstoreceive.pl @@ -115,13 +115,7 @@ while ( my $library = $libraries->next ) { # we check if we have a reserv for this transfer my $holds = $item->current_holds; if ( my $first_hold = $holds->next ) { - my $patron = Koha::Patrons->find( $first_hold->borrowernumber ); - # FIXME The full patron object should be passed to the template - $getransf{'borrowernum'} = $patron->borrowernumber; - $getransf{'borrowername'} = $patron->surname; - $getransf{'borrowerfirstname'} = $patron->firstname; - $getransf{'borrowermail'} = $patron->email if $patron->email; - $getransf{'borrowerphone'} = $patron->phone; + $getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber ); } push( @transferloop, \%getransf ); } --- a/circ/waitingreserves.pl +++ a/circ/waitingreserves.pl @@ -131,11 +131,7 @@ while ( my $hold = $holds->next ) { $getreserv{'dotransfer'} = 1; } - my $borEmail = $patron->first_valid_email_address; - - if ( $borEmail ) { - $getreserv{'borrowermail'} = $borEmail; - } + $getreserv{patron} = $patron; if ($today > $calcDate) { if ($cancelall) { --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -68,7 +68,7 @@