Fix unmerged routing-preview.pl

This commit is contained in:
Matthias Meusburger 2009-09-22 14:32:20 +02:00 committed by Henri-Damien LAURENT
parent d208a5593a
commit 5ec00f6a55
1 changed files with 0 additions and 5 deletions

View File

@ -102,12 +102,7 @@ if($ok){
my @results;
my $data;
for(my $i=0;$i<$routing;$i++){
<<<<<<< HEAD:serials/routing-preview.pl
$data=GetMember('borrowernumber' => $routinglist[$i]->{'borrowernumber'});
$data->{'location'}=$data->{'branchcode'};
=======
$data=GetMember($routinglist[$i]->{'borrowernumber'},'borrowernumber');
>>>>>>> 704d6c9... [3.0.x](bug #3563) This replaces the library name by the branchname attached to the subscription, and hide streetaddesses in serials routing:serials/routing-preview.pl
$data->{'name'}="$data->{'firstname'} $data->{'surname'}";
$data->{'routingid'}=$routinglist[$i]->{'routingid'};
$data->{'subscriptionid'}=$subscriptionid;