X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=patroncards%2Fmanage.pl;h=13b574b758e5e06e330c717fd3d99ee404e14b59;hb=6bad4db6a76d719ad6ac7fec2d4c7ec87ec8aa95;hp=7026b3412ffe5b703bacb9c7fa4dfbebfb740793;hpb=8e0b1fe58f7e4f6e595b18d43c939c203833dac1;p=koha.git

diff --git a/patroncards/manage.pl b/patroncards/manage.pl
index 7026b3412f..13b574b758 100755
--- a/patroncards/manage.pl
+++ b/patroncards/manage.pl
@@ -14,9 +14,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use warnings;
@@ -27,12 +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::Lib 1.000000 qw(get_all_templates get_all_layouts get_all_profiles get_batch_summary html_table);
-use C4::Patroncards::Layout 1.000000;
-use C4::Patroncards::Template 1.000000;
-use C4::Patroncards::Profile 1.000000;
-use C4::Labels::Batch 1.000000;
+use C4::Creators;
+use C4::Patroncards;
+use C4::Labels;
 
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -75,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->param('LoginBranchname')) : '');
+my $branch_code = ($card_element eq 'batch' ? C4::Context->userenv->{'branch'} : '');
 
 if ($op eq 'delete') {
     my $err = 0;
@@ -104,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,