Bug 19585: Inventory: Allow additional separators in a barcode file

[koha_ffzg] / tools / modborrowers.pl

diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
index 720e2a1..5c8e1b6 100755 (executable)
--- a/tools/modborrowers.pl
+++ b/tools/modborrowers.pl
@@ -148,7 +148,7 @@ if ( $op eq 'show' ) {
     # Construct drop-down list values
     my $branches = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;
     my @branches_option;
-    push @branches_option, { value => $_->{value}, lib => $_->{branchname} } for @$branches;
+    push @branches_option, { value => $_->{branchcode}, lib => $_->{branchname} } for @$branches;
     unshift @branches_option, { value => "", lib => "" };
     my @categories_option;
     push @categories_option, { value => $_->categorycode, lib => $_->description } for @patron_categories;
@@ -366,9 +366,10 @@ exit;
 
 sub GetBorrowerInfos {
     my ( %info ) = @_;
-    my $borrower = Koha::Patrons->find( \%info );
-    if ( $borrower ) {
-        $borrower = $borrower->unblessed;
+    my $patron = Koha::Patrons->find( \%info );
+    my $borrower;
+    if ( $patron ) {
+        $borrower = $patron->unblessed;
         for ( qw(dateenrolled dateexpiry) ) {
             my $userdate = $borrower->{$_};
             unless ($userdate && $userdate ne "0000-00-00" and $userdate ne "9999-12-31") {
@@ -377,7 +378,7 @@ sub GetBorrowerInfos {
             }
             $borrower->{$_} = $userdate || '';
         }
-        $borrower->{category_description} = Koha::Patron::Categories->find( $borrower->{categorycode} )->{description};
+        $borrower->{category_description} = $patron->category->description;
         my $attr_loop = C4::Members::Attributes::GetBorrowerAttributes( $borrower->{borrowernumber} );
         $borrower->{patron_attributes} = $attr_loop;
     }