X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=patroncards%2Fmanage.pl;h=13b574b758e5e06e330c717fd3d99ee404e14b59;hb=9706908b269ebc068b19a0989ca8af6804b1a540;hp=71e1b82eeb614777ded23fcc04e12e9618504751;hpb=7aa3a055914d4c8757455898208848619f5aaec5;p=koha.git

diff --git a/patroncards/manage.pl b/patroncards/manage.pl
index 71e1b82eeb..13b574b758 100755
--- a/patroncards/manage.pl
+++ b/patroncards/manage.pl
@@ -27,10 +27,9 @@ use autouse 'Data::Dumper' => qw(Dumper);
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use autouse 'C4::Branch' => qw(get_branch_code_from_name);
-use C4::Creators 1.000000;
-use C4::Patroncards 1.000000;
-use C4::Labels 1.000000;
+use C4::Creators;
+use C4::Patroncards;
+use C4::Labels;
 
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -73,7 +72,7 @@ my $display_columns = { layout =>   [  # db column       => {col label
 };
 
 my $errstr = ($cgi->param('error') ? $cgi->param('error') : '');
-my $branch_code = ($card_element eq 'batch' ? get_branch_code_from_name($template->{VARS}->{'LoginBranchname'}) : '');
+my $branch_code = ($card_element eq 'batch' ? C4::Context->userenv->{'branch'} : '');
 
 if ($op eq 'delete') {
     my $err = 0;
@@ -102,8 +101,7 @@ my $table = html_table($display_columns->{$card_element}, $db_rows);
 
 $template->param(print => 1) if ($card_element eq 'batch');
 $template->param(
-                error           => ($errstr ? 1 : 0),
-                $errstr         => 1,
+                error           => $errstr,
 );
 $template->param(
                 op              => $op,