From 5ec00f6a55945a72b9bcbdd0c2659dc44acc4708 Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Tue, 22 Sep 2009 14:32:20 +0200 Subject: [PATCH] Fix unmerged routing-preview.pl --- serials/routing-preview.pl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl index e001104b6d..7d5f65f5bd 100755 --- a/serials/routing-preview.pl +++ b/serials/routing-preview.pl @@ -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; -- 2.39.5