From 2f4cc4a8f913912a4a8c7fc716a130ae6b5a240a Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Mon, 9 Mar 2020 16:51:28 +0000
Subject: [PATCH] Bug 17845: Remove some missed references to branchprinter

Remove a few last references to branchprinter, mostly from tests.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 Koha/Library.pm                               | 1 -
 t/Koha/Script.t                               | 1 -
 t/Koha/Script_cron.t                          | 1 -
 t/db_dependent/Circulation/GetHardDueDate.t   | 2 --
 t/db_dependent/Circulation/OfflineOperation.t | 1 -
 t/db_dependent/RotatingCollections.t          | 1 -
 t/lib/Mocks.pm                                | 4 ++--
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Koha/Library.pm b/Koha/Library.pm
index 1d0dc1ccaf..f2b680c5fb 100644
--- a/Koha/Library.pm
+++ b/Koha/Library.pm
@@ -115,7 +115,6 @@ sub to_api_mapping {
         branchurl        => 'url',
         issuing          => undef,
         branchip         => 'ip',
-        branchprinter    => undef,
         branchnotes      => 'notes',
         marcorgcode      => 'marc_org_code',
     };
diff --git a/t/Koha/Script.t b/t/Koha/Script.t
index 7c758f407a..778693b607 100644
--- a/t/Koha/Script.t
+++ b/t/Koha/Script.t
@@ -33,7 +33,6 @@ is_deeply(
         'cardnumber'    => undef,
         'firstname'     => 'CLI',
         'branchname'    => undef,
-        'branchprinter' => undef,
         'emailaddress'  => undef,
         'number'        => undef,
         'shibboleth'    => undef,
diff --git a/t/Koha/Script_cron.t b/t/Koha/Script_cron.t
index d73aa82cd0..c5e7f950c3 100644
--- a/t/Koha/Script_cron.t
+++ b/t/Koha/Script_cron.t
@@ -33,7 +33,6 @@ is_deeply(
         'cardnumber'    => undef,
         'firstname'     => 'CRON',
         'branchname'    => undef,
-        'branchprinter' => undef,
         'emailaddress'  => undef,
         'number'        => undef,
         'shibboleth'    => undef,
diff --git a/t/db_dependent/Circulation/GetHardDueDate.t b/t/db_dependent/Circulation/GetHardDueDate.t
index 47958d5e79..275ecc426e 100644
--- a/t/db_dependent/Circulation/GetHardDueDate.t
+++ b/t/db_dependent/Circulation/GetHardDueDate.t
@@ -53,7 +53,6 @@ my $samplebranch1 = {
     branchemail    => 'sample email',
     branchurl      => 'sample url',
     branchip       => 'sample ip',
-    branchprinter  => undef,
     opac_info      => 'sample opac',
 };
 my $samplebranch2 = {
@@ -71,7 +70,6 @@ my $samplebranch2 = {
     branchemail    => 'sample email2',
     branchurl      => 'sample url2',
     branchip       => 'sample ip2',
-    branchprinter  => undef,
     opac_info      => 'sample opac2',
 };
 Koha::Library->new($samplebranch1)->store;
diff --git a/t/db_dependent/Circulation/OfflineOperation.t b/t/db_dependent/Circulation/OfflineOperation.t
index fb11b6f274..6a92da4b1c 100644
--- a/t/db_dependent/Circulation/OfflineOperation.t
+++ b/t/db_dependent/Circulation/OfflineOperation.t
@@ -48,7 +48,6 @@ my $samplebranch1 = {
     branchemail    => 'sample email',
     branchurl      => 'sample url',
     branchip       => 'sample ip',
-    branchprinter  => undef,
     opac_info      => 'sample opac',
 };
 Koha::Library->new($samplebranch1)->store;
diff --git a/t/db_dependent/RotatingCollections.t b/t/db_dependent/RotatingCollections.t
index a83adba99f..cbe3dcf005 100644
--- a/t/db_dependent/RotatingCollections.t
+++ b/t/db_dependent/RotatingCollections.t
@@ -186,7 +186,6 @@ my $samplebranch = {
     branchemail    => 'sample email',
     branchurl      => 'sample url',
     branchip       => 'sample ip',
-    branchprinter  => undef,
     branchnotes    => 'sample note',
     opac_info      => 'sample opac',
 };
diff --git a/t/lib/Mocks.pm b/t/lib/Mocks.pm
index a28d873bbf..df2d587b07 100644
--- a/t/lib/Mocks.pm
+++ b/t/lib/Mocks.pm
@@ -60,9 +60,9 @@ sub mock_userenv {
     my $branchname   = $params->{branchname}   || $userenv->{branchname};
     my $flags        = $params->{flags}        || $userenv->{flags}          || 0;
     my $emailaddress = $params->{emailaddress} || $userenv->{emailaddress};
-    my ( $branchprinter, $shibboleth );
+    my ( $shibboleth );
 
-    C4::Context->set_userenv($usernum, $userid, $cardnumber, $firstname, $surname, $branchcode, $branchname, $flags, $emailaddress, $branchprinter, $shibboleth );
+    C4::Context->set_userenv($usernum, $userid, $cardnumber, $firstname, $surname, $branchcode, $branchname, $flags, $emailaddress, $shibboleth );
 }
 
 1;
-- 
2.20.1