Attachment 64469 Details for Bug 17600 – Bug 17600: Explicitly export the subroutines used

[patch] Bug 17600: Explicitly export the subroutines used

Bug-17600-Explicitly-export-the-subroutines-used.patch (text/plain), 41.98 KB, created by Jonathan Druart on 2017-06-20 19:31:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-06-20 19:31:38 UTC

Size: 41.98 KB

patch

obsolete

>From c443d6c300f4d051325648db812bb090e43b512d Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 5 Dec 2016 12:45:14 +0100
>Subject: [PATCH] Bug 17600: Explicitly export the subroutines used
>
>This patch is generated using the export.pl script
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Accounts.pm                    |  6 +++---
> C4/Acquisition.pm                 |  4 ++--
> C4/Auth.pm                        |  4 ++--
> C4/Auth_with_cas.pm               |  2 +-
> C4/Auth_with_ldap.pm              |  9 +++------
> C4/Auth_with_shibboleth.pm        |  2 +-
> C4/AuthoritiesMarc.pm             |  8 ++++----
> C4/BackgroundJob.pm               |  2 +-
> C4/Barcodes/annual.pm             |  2 +-
> C4/Biblio.pm                      | 10 +++++-----
> C4/Breeding.pm                    | 12 ++++++------
> C4/Circulation.pm                 | 24 ++++++++++++------------
> C4/ClassSortRoutine/Dewey.pm      |  2 +-
> C4/ClassSortRoutine/Generic.pm    |  2 +-
> C4/ClassSortRoutine/LCC.pm        |  2 +-
> C4/Context.pm                     |  2 +-
> C4/CourseReserves.pm              |  6 +++---
> C4/Creators/Profile.pm            |  2 +-
> C4/Creators/Template.pm           |  2 +-
> C4/HoldsQueue.pm                  | 10 +++++-----
> C4/ILSDI/Services.pm              | 18 +++++++++---------
> C4/ImportBatch.pm                 | 12 ++++++------
> C4/InstallAuth.pm                 |  2 +-
> C4/Items.pm                       | 12 ++++++------
> C4/Koha.pm                        |  2 +-
> C4/Labels/Label.pm                |  2 +-
> C4/Letters.pm                     | 10 +++++-----
> C4/Log.pm                         |  2 +-
> C4/MarcModificationTemplates.pm   |  2 +-
> C4/Matcher.pm                     |  2 +-
> C4/Members.pm                     | 16 ++++++++--------
> C4/Message.pm                     |  2 +-
> C4/NewsChannels.pm                |  2 +-
> C4/Overdues.pm                    |  6 +++---
> C4/Patroncards/Patroncard.pm      |  2 +-
> C4/Record.pm                      |  6 +++---
> C4/Reports/Guided.pm              |  6 +++---
> C4/Reserves.pm                    | 20 ++++++++++----------
> C4/Ris.pm                         |  2 +-
> C4/RotatingCollections.pm         |  4 ++--
> C4/Search.pm                      | 12 ++++++------
> C4/Search/History.pm              |  2 +-
> C4/Serials.pm                     | 12 ++++++------
> C4/Service.pm                     |  4 ++--
> C4/ShelfBrowser.pm                |  4 ++--
> C4/SocialData.pm                  |  2 +-
> C4/Suggestions.pm                 |  4 ++--
> C4/Templates.pm                   |  2 +-
> C4/TmplToken.pm                   |  2 +-
> C4/XISBN.pm                       |  8 ++++----
> C4/XSLT.pm                        | 10 +++++-----
> Koha/ArticleRequest.pm            |  2 +-
> Koha/Biblio.pm                    |  2 +-
> Koha/BiblioUtils.pm               |  2 +-
> Koha/BiblioUtils/Iterator.pm      |  2 +-
> Koha/Config/SysPref.pm            |  2 +-
> Koha/EDI.pm                       |  6 +++---
> Koha/Exporter/Record.pm           |  4 ++--
> Koha/Hold.pm                      |  4 ++--
> Koha/I18N.pm                      |  2 +-
> Koha/ItemType.pm                  |  4 ++--
> Koha/MetaSearcher.pm              |  2 +-
> Koha/MetadataRecord.pm            |  2 +-
> Koha/MetadataRecord/Authority.pm  |  2 +-
> Koha/Patron.pm                    |  4 ++--
> Koha/Patron/Category.pm           |  2 +-
> Koha/Patron/Discharge.pm          |  2 +-
> Koha/Uploader.pm                  |  1 -
> Koha/Virtualshelf.pm              |  2 +-
> Koha/Virtualshelfshare.pm         |  2 +-
> acqui/pdfformat/layout2pages.pm   |  2 +-
> acqui/pdfformat/layout2pagesde.pm |  2 +-
> acqui/pdfformat/layout3pages.pm   |  2 +-
> acqui/pdfformat/layout3pagesfr.pm |  2 +-
> misc/translator/TmplTokenizer.pm  |  2 +-
> 75 files changed, 180 insertions(+), 184 deletions(-)
>
>diff --git a/C4/Accounts.pm b/C4/Accounts.pm
>index 7f939a2eef..5ce3d65901 100644
>--- a/C4/Accounts.pm
>+++ b/C4/Accounts.pm
>@@ -21,10 +21,10 @@ package C4::Accounts;
> use strict;
> #use warnings; FIXME - Bug 2505
> use C4::Context;
>-use C4::Stats;
>+use C4::Stats qw( UpdateStats );
> use C4::Members;
>-use C4::Circulation qw(ReturnLostItem);
>-use C4::Log qw(logaction);
>+use C4::Circulation qw( ReturnLostItem LostItem );
>+use C4::Log qw( logaction );
> use Koha::Account;
> use Koha::Account::Lines;
> 
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 70d58604d5..23971b5fcd 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -23,8 +23,8 @@ use Carp;
> use C4::Context;
> use C4::Debug;
> use C4::Suggestions;
>-use C4::Biblio;
>-use C4::Contract;
>+use C4::Biblio qw( GetBiblio GetBiblioData GetBiblionumberFromItemnumber GetFrameworkCode GetMarcFromKohaField DelBiblio GetMarcStructure IsMarcStructureInternal );
>+use C4::Contract qw( GetContract );
> use C4::Debug;
> use C4::Templates qw(gettemplate);
> use Koha::DateUtils qw( dt_from_string output_pref );
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 123525a4b0..3294cd6954 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -27,11 +27,11 @@ use CGI::Session;
> 
> use C4::Context;
> use C4::Templates;    # to get the template
>-use C4::Languages;
>+use C4::Languages qw( getlanguage );
> use C4::Search::History;
> use Koha;
> use Koha::Caches;
>-use Koha::AuthUtils qw(get_script_name hash_password);
>+use Koha::AuthUtils qw( get_script_name hash_password );
> use Koha::Libraries;
> use Koha::LibraryCategories;
> use Koha::Patrons;
>diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm
>index e93d3dabac..fa6c95eb57 100644
>--- a/C4/Auth_with_cas.pm
>+++ b/C4/Auth_with_cas.pm
>@@ -22,7 +22,7 @@ use warnings;
> 
> use C4::Debug;
> use C4::Context;
>-use Koha::AuthUtils qw(get_script_name);
>+use Koha::AuthUtils qw( get_script_name );
> use Authen::CAS::Client;
> use CGI qw ( -utf8 );
> use FindBin;
>diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
>index 61eb78a16c..2c90989f87 100644
>--- a/C4/Auth_with_ldap.pm
>+++ b/C4/Auth_with_ldap.pm
>@@ -23,13 +23,10 @@ use Carp;
> 
> use C4::Debug;
> use C4::Context;
>-use C4::Members qw(AddMember);
>-use C4::Members::Attributes;
>-use C4::Members::AttributeTypes;
>-use C4::Members::Messaging;
>-use C4::Auth qw(checkpw_internal);
>+use C4::Members qw( AddMember );
>+use C4::Auth qw( checkpw checkpw_internal );
> use Koha::Patrons;
>-use Koha::AuthUtils qw(hash_password);
>+use Koha::AuthUtils qw( hash_password );
> use List::MoreUtils qw( any );
> use Net::LDAP;
> use Net::LDAP::Filter;
>diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm
>index 3521fbfad6..31b3c409b5 100644
>--- a/C4/Auth_with_shibboleth.pm
>+++ b/C4/Auth_with_shibboleth.pm
>@@ -21,7 +21,7 @@ use Modern::Perl;
> 
> use C4::Debug;
> use C4::Context;
>-use Koha::AuthUtils qw(get_script_name);
>+use Koha::AuthUtils qw( get_script_name );
> use Koha::Database;
> use C4::Members qw( AddMember_Auto );
> use C4::Members::Messaging;
>diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm
>index 11f1418c61..e4951f293e 100644
>--- a/C4/AuthoritiesMarc.pm
>+++ b/C4/AuthoritiesMarc.pm
>@@ -21,12 +21,12 @@ use strict;
> use warnings;
> use C4::Context;
> use MARC::Record;
>-use C4::Biblio;
>-use C4::Search;
>+use C4::Biblio qw( ModZebra GetMarcFromKohaField GetMarcBiblio ModBiblio GetFrameworkCode );
>+use C4::Search qw( FindDuplicate new_record_from_zebra );
> use C4::AuthoritiesMarc::MARC21;
> use C4::AuthoritiesMarc::UNIMARC;
>-use C4::Charset;
>-use C4::Log;
>+use C4::Charset qw( SetUTF8Flag );
>+use C4::Log qw( logaction );
> use Koha::MetadataRecord::Authority;
> use Koha::Authorities;
> use Koha::Authority::MergeRequest;
>diff --git a/C4/BackgroundJob.pm b/C4/BackgroundJob.pm
>index f607340f12..547cd10658 100644
>--- a/C4/BackgroundJob.pm
>+++ b/C4/BackgroundJob.pm
>@@ -21,7 +21,7 @@ package C4::BackgroundJob;
> use strict;
> #use warnings; FIXME - Bug 2505
> use C4::Context;
>-use C4::Auth qw/get_session/;
>+use C4::Auth qw( get_session );
> use Digest::MD5;
> 
> 
>diff --git a/C4/Barcodes/annual.pm b/C4/Barcodes/annual.pm
>index 1c8a432677..eae6c0b037 100644
>--- a/C4/Barcodes/annual.pm
>+++ b/C4/Barcodes/annual.pm
>@@ -25,7 +25,7 @@ use Carp;
> use C4::Context;
> use C4::Debug;
> 
>-use Koha::DateUtils qw( output_pref dt_from_string );
>+use Koha::DateUtils qw( dt_from_string output_pref );
> 
> use vars qw(@ISA);
> use vars qw($debug $cgi_debug);	# from C4::Debug, of course
>diff --git a/C4/Biblio.pm b/C4/Biblio.pm
>index 968be874ea..58f95b8492 100644
>--- a/C4/Biblio.pm
>+++ b/C4/Biblio.pm
>@@ -29,15 +29,15 @@ use MARC::File::XML;
> use POSIX qw(strftime);
> use Module::Load::Conditional qw(can_load);
> 
>-use C4::Koha;
>-use C4::Log;    # logaction
>+use C4::Koha qw( get_infos_of getitemtypeinfo );
>+use C4::Log qw( logaction );
> use C4::Budgets;
> use C4::ClassSource qw( GetClassSort );
>-use C4::Charset qw( SetUTF8Flag );
>+use C4::Charset qw( SetUTF8Flag SetMarcUnicodeFlag StripNonXmlChars nsb_clean );
> use C4::Linker;
>-use C4::OAI::Sets;
>+use C4::OAI::Sets qw( UpdateOAISetsBiblio );
> use C4::Debug;
>-use C4::Items;
>+use C4::Items qw( AddItem ModItem GetItem GetHiddenItemnumbers GetMarcItem );
> 
> use Koha::Caches;
> use Koha::Authority::Types;
>diff --git a/C4/Breeding.pm b/C4/Breeding.pm
>index e3dd9b2552..58e77ae592 100644
>--- a/C4/Breeding.pm
>+++ b/C4/Breeding.pm
>@@ -21,13 +21,13 @@ package C4::Breeding;
> use strict;
> use warnings;
> 
>-use C4::Biblio;
>-use C4::Koha;
>-use C4::Charset;
>+use C4::Biblio qw( AddBiblio TransformMarcToKoha TransformMarcToKohaOneField );
>+use C4::Koha qw( GetNormalizedISBN );
>+use C4::Charset qw( MarcToUTF8Record SetUTF8Flag );
> use MARC::File::USMARC;
>-use C4::ImportBatch;
>-use C4::AuthoritiesMarc; #GuessAuthTypeCode, FindDuplicateAuthority
>-use C4::Languages;
>+use C4::ImportBatch qw( GetZ3950BatchId AddBiblioToBatch AddAuthToBatch );
>+use C4::AuthoritiesMarc qw( GetAuthorizedHeading GuessAuthTypeCode FindDuplicateAuthority ModAuthority );
>+use C4::Languages qw( getlanguage );
> use Koha::Database;
> use Koha::XSLT_Handler;
> 
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 12b81da066..591aad1d4e 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -22,32 +22,32 @@ package C4::Circulation;
> use strict;
> #use warnings; FIXME - Bug 2505
> use DateTime;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use C4::Context;
>-use C4::Stats;
>-use C4::Reserves;
>-use C4::Biblio;
>-use C4::Items;
>-use C4::Members;
>-use C4::Accounts;
>+use C4::Stats qw( UpdateStats );
>+use C4::Reserves qw( CheckReserves CanItemBeReserved MoveReserve ModReserve ModReserveStatus IsItemOnHoldAndFound IsAvailableForItemLevelRequest );
>+use C4::Biblio qw( GetBiblio GetBiblioFromItemNumber GetBiblioItemData UpdateTotalIssues GetBiblioData );
>+use C4::Items qw( GetItem GetItemnumberFromBarcode ModItem ModItemTransfer ModDateLastSeen CartToShelf ShelfToCart );
>+use C4::Members qw( GetMemberDetails GetMember GetMemberAccountBalance GetAge );
>+use C4::Accounts qw( getnextacctno chargelostitem );
> use C4::ItemCirculationAlertPreference;
> use C4::Message;
> use C4::Debug;
>-use C4::Log; # logaction
>-use C4::Overdues qw(CalcFine UpdateFine get_chargeable_units);
>-use C4::RotatingCollections qw(GetCollectionItemBranches);
>+use C4::Log qw( logaction );
>+use C4::Overdues qw( UpdateFine get_chargeable_units CalcFine );
>+use C4::RotatingCollections qw( isItemInAnyCollection );
> use Algorithm::CheckDigits;
> 
> use Data::Dumper;
> use Koha::Account;
> use Koha::AuthorisedValues;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Calendar;
> use Koha::Checkouts;
> use Koha::IssuingRules;
> use Koha::Items;
> use Koha::Patrons;
>-use Koha::Patron::Debarments;
>+use Koha::Patron::Debarments qw( GetDebarments DelUniqueDebarment AddUniqueDebarment );
> use Koha::Database;
> use Koha::Libraries;
> use Koha::Holds;
>diff --git a/C4/ClassSortRoutine/Dewey.pm b/C4/ClassSortRoutine/Dewey.pm
>index 111bafb537..eedf4ed768 100644
>--- a/C4/ClassSortRoutine/Dewey.pm
>+++ b/C4/ClassSortRoutine/Dewey.pm
>@@ -28,7 +28,7 @@ C4::ClassSortRoutine::Dewey - generic call number sorting key routine
> 
> =head1 SYNOPSIS
> 
>-use C4::ClassSortRoutine;
>+use C4::ClassSortRoutine qw( GetClassSortKey );
> 
> my $cn_sort = GetClassSortKey('Dewey', $cn_class, $cn_item);
> 
>diff --git a/C4/ClassSortRoutine/Generic.pm b/C4/ClassSortRoutine/Generic.pm
>index 8b7d890394..665dd53ca6 100644
>--- a/C4/ClassSortRoutine/Generic.pm
>+++ b/C4/ClassSortRoutine/Generic.pm
>@@ -28,7 +28,7 @@ C4::ClassSortRoutine::Generic - generic call number sorting key routine
> 
> =head1 SYNOPSIS
> 
>-use C4::ClassSortRoutine;
>+use C4::ClassSortRoutine qw( GetClassSortKey );
> 
> my $cn_sort = GetClassSortKey('Generic', $cn_class, $cn_item);
> 
>diff --git a/C4/ClassSortRoutine/LCC.pm b/C4/ClassSortRoutine/LCC.pm
>index 5f9c8f9c6f..b943fb683e 100644
>--- a/C4/ClassSortRoutine/LCC.pm
>+++ b/C4/ClassSortRoutine/LCC.pm
>@@ -30,7 +30,7 @@ C4::ClassSortRoutine::LCC - generic call number sorting key routine
> 
> =head1 SYNOPSIS
> 
>-use C4::ClassSortRoutine;
>+use C4::ClassSortRoutine qw( GetClassSortKey );
> 
> my $cn_sort = GetClassSortKey('LCC', $cn_class, $cn_item);
> 
>diff --git a/C4/Context.pm b/C4/Context.pm
>index a50ddfda5a..cfbbc83d51 100644
>--- a/C4/Context.pm
>+++ b/C4/Context.pm
>@@ -97,7 +97,7 @@ use DateTime::TimeZone;
> use Module::Load::Conditional qw(can_load);
> use Carp;
> 
>-use C4::Boolean;
>+use C4::Boolean qw( true_p );
> use C4::Debug;
> use Koha;
> use Koha::Config;
>diff --git a/C4/CourseReserves.pm b/C4/CourseReserves.pm
>index 25e210ece4..4cf1877e3b 100644
>--- a/C4/CourseReserves.pm
>+++ b/C4/CourseReserves.pm
>@@ -20,9 +20,9 @@ use Modern::Perl;
> use List::MoreUtils qw(any);
> 
> use C4::Context;
>-use C4::Items qw(GetItem ModItem);
>-use C4::Biblio qw(GetBiblioFromItemNumber);
>-use C4::Circulation qw(GetOpenIssue);
>+use C4::Items qw( GetItem ModItem );
>+use C4::Biblio qw( GetBiblioFromItemNumber GetBiblio );
>+use C4::Circulation qw( GetOpenIssue );
> 
> use vars qw($DEBUG @FIELDS);
> our (@ISA, @EXPORT_OK);
>diff --git a/C4/Creators/Profile.pm b/C4/Creators/Profile.pm
>index 37512fa882..c81f1f2dce 100644
>--- a/C4/Creators/Profile.pm
>+++ b/C4/Creators/Profile.pm
>@@ -7,7 +7,7 @@ use autouse 'Data::Dumper' => qw(Dumper);
> 
> use C4::Context;
> use C4::Debug;
>-use C4::Creators::Lib qw(get_unit_values);
>+use C4::Creators::Lib qw( get_unit_values );
> 
> 
> sub _check_params {
>diff --git a/C4/Creators/Template.pm b/C4/Creators/Template.pm
>index ee504d7308..596eb2d7cf 100644
>--- a/C4/Creators/Template.pm
>+++ b/C4/Creators/Template.pm
>@@ -8,7 +8,7 @@ use autouse 'Data::Dumper' => qw(Dumper);
> use C4::Context;
> use C4::Debug;
> use C4::Creators::Profile;
>-use C4::Creators::Lib qw(get_unit_values);
>+use C4::Creators::Lib qw( get_unit_values );
> 
> 
> sub _check_params {
>diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
>index 3519205fe3..4ba6c7244f 100755
>--- a/C4/HoldsQueue.pm
>+++ b/C4/HoldsQueue.pm
>@@ -24,11 +24,11 @@ use warnings;
> 
> use C4::Context;
> use C4::Search;
>-use C4::Items;
>-use C4::Circulation;
>-use C4::Members;
>-use C4::Biblio;
>-use Koha::DateUtils;
>+use C4::Items qw( GetItem );
>+use C4::Circulation qw( GetTransfers GetBranchItemRule );
>+use C4::Members qw( GetMember );
>+use C4::Biblio qw( GetHolds GetMarcBiblio GetRecordValue GetBiblioData GetBiblio );
>+use Koha::DateUtils qw( dt_from_string );
> 
> use List::Util qw(shuffle);
> use List::MoreUtils qw(any);
>diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
>index 287ac0287b..7719f6dbfa 100644
>--- a/C4/ILSDI/Services.pm
>+++ b/C4/ILSDI/Services.pm
>@@ -20,20 +20,20 @@ package C4::ILSDI::Services;
> use strict;
> use warnings;
> 
>-use C4::Members;
>-use C4::Items;
>-use C4::Circulation;
>-use C4::Accounts;
>-use C4::Biblio;
>-use C4::Reserves qw(AddReserve GetReservesFromBorrowernumber CanBookBeReserved CanItemBeReserved IsAvailableForItemLevelRequest);
>+use C4::Members qw( GetMember GetPendingIssues );
>+use C4::Items qw( GetItem GetItemsByBiblioitemnumber );
>+use C4::Circulation qw( GetBiblioIssues CanBookBeRenewed barcodedecode decode CanBookBeIssued AddRenewal GetItemIssue );
>+use C4::Accounts qw( getcharges );
>+use C4::Biblio qw( GetBiblioItemByBiblioNumber GetBiblio GetMarcBiblio GetBiblioFromItemNumber );
>+use C4::Reserves qw( GetReserve GetReservesFromBorrowernumber CanBookBeReserved IsAvailableForItemLevelRequest CalculatePriority AddReserve CanItemBeReserved CancelReserve );
> use C4::Context;
>-use C4::AuthoritiesMarc;
>+use C4::Auth qw( checkpw );
> use XML::Simple;
> use HTML::Entities;
> use CGI qw ( -utf8 );
> use DateTime;
>-use C4::Auth;
>-use C4::Members::Attributes qw(GetBorrowerAttributes);
>+use C4::Auth qw( checkpw );
>+use C4::Members qw( GetMember GetMemberDetails GetPendingIssues );
> 
> use Koha::Biblios;
> use Koha::Libraries;
>diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm
>index 66e264d164..611b2bb63c 100644
>--- a/C4/ImportBatch.pm
>+++ b/C4/ImportBatch.pm
>@@ -21,12 +21,12 @@ use strict;
> use warnings;
> 
> use C4::Context;
>-use C4::Koha;
>-use C4::Biblio;
>-use C4::Items;
>-use C4::Charset;
>-use C4::AuthoritiesMarc;
>-use C4::MarcModificationTemplates;
>+use C4::Koha qw( GetNormalizedISBN );
>+use C4::Biblio qw( AddBiblio ModBiblio GetMarcFromKohaField GetBiblio GetXmlBiblio GetFrameworkCode TransformMarcToKoha DelBiblio );
>+use C4::Items qw( AddItem GetItem GetItemnumberFromBarcode ModItemFromMarc ModItem AddItemFromMarc DelItem DelItemCheck );
>+use C4::Charset qw( SetUTF8Flag StripNonXmlChars MarcToUTF8Record );
>+use C4::AuthoritiesMarc qw( ModAuthority GuessAuthTypeCode AddAuthority GetAuthorityXML GetAuthority DelAuthority GetAuthorizedHeading );
>+use C4::MarcModificationTemplates qw( ModifyRecordWithTemplate );
> use Koha::Plugins::Handler;
> use Koha::Logger;
> 
>diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm
>index 3e009a4df6..55e29109c0 100644
>--- a/C4/InstallAuth.pm
>+++ b/C4/InstallAuth.pm
>@@ -23,7 +23,7 @@ use Digest::MD5 qw(md5_base64);
> use File::Spec;
> 
> use C4::Context;
>-use C4::Output;
>+use C4::Output qw( output_html_with_http_headers );
> use C4::Templates;
> use C4::Koha;
> use CGI::Session;
>diff --git a/C4/Items.pm b/C4/Items.pm
>index 8ef72965a2..cec4c9ad0c 100644
>--- a/C4/Items.pm
>+++ b/C4/Items.pm
>@@ -23,12 +23,12 @@ use strict;
> 
> use Carp;
> use C4::Context;
>-use C4::Koha;
>-use C4::Biblio qw( GetFrameworkCode );
>-use Koha::DateUtils;
>+use C4::Koha qw( IsKohaFieldLinked get_infos_of GetItemTypes );
>+use C4::Biblio qw( GetFrameworkCode GetMarcFromKohaField TransformMarcToKoha ModZebra AddBiblio GetBiblionumberFromItemnumber GetBiblio GetMarcBiblio TransformKohaToMarc GetMarcStructure IsMarcStructureInternal );
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use MARC::Record;
>-use C4::ClassSource;
>-use C4::Log;
>+use C4::ClassSource qw( GetClassSort GetClassSources GetClassSource );
>+use C4::Log qw( logaction );
> use List::MoreUtils qw/any/;
> use YAML qw/Load/;
> use DateTime::Format::MySQL;
>@@ -36,7 +36,7 @@ use Data::Dumper; # used as part of logging item record changes, not just for
>                   # debugging; so please don't remove this
> 
> use Koha::AuthorisedValues;
>-use Koha::DateUtils qw/dt_from_string/;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Database;
> 
> use Koha::Biblioitems;
>diff --git a/C4/Koha.pm b/C4/Koha.pm
>index eee035fef1..07fb7d32c0 100644
>--- a/C4/Koha.pm
>+++ b/C4/Koha.pm
>@@ -25,7 +25,7 @@ use strict;
> 
> use C4::Context;
> use Koha::Caches;
>-use Koha::DateUtils qw(dt_from_string);
>+use Koha::DateUtils qw( dt_from_string );
> use Koha::AuthorisedValues;
> use Koha::Libraries;
> use Koha::MarcSubfieldStructures;
>diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm
>index c7c5371549..3dc9a4090a 100644
>--- a/C4/Labels/Label.pm
>+++ b/C4/Labels/Label.pm
>@@ -12,7 +12,7 @@ use Text::Bidi qw( log2vis );
> 
> use C4::Context;
> use C4::Debug;
>-use C4::Biblio;
>+use C4::Biblio qw( GetAuthorisedValueDesc GetMarcFromKohaField GetMarcBiblio );
> 
> 
> my $possible_decimal = qr/\d{3,}(?:\.\d+)?/; # at least three digits for a DDCN
>diff --git a/C4/Letters.pm b/C4/Letters.pm
>index 4413e2ea91..4868d27701 100644
>--- a/C4/Letters.pm
>+++ b/C4/Letters.pm
>@@ -27,16 +27,16 @@ use Carp;
> use Template;
> use Module::Load::Conditional qw(can_load);
> 
>-use C4::Members;
>-use C4::Members::Attributes qw(GetBorrowerAttributes);
>-use C4::Log;
>+use C4::Members qw( GetMember GetNoticeEmailAddress );
>+use C4::Members qw( GetMember GetNoticeEmailAddress );
>+use C4::Log qw( logaction );
> use C4::SMS;
> use C4::Debug;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( format_sqldatetime dt_from_string output_pref );
> use Koha::SMS::Providers;
> 
> use Koha::Email;
>-use Koha::DateUtils qw( format_sqldatetime dt_from_string );
>+use Koha::DateUtils qw( format_sqldatetime dt_from_string output_pref );
> 
> our (@ISA, @EXPORT_OK);
> BEGIN {
>diff --git a/C4/Log.pm b/C4/Log.pm
>index 44e395ab10..4a46a074a2 100644
>--- a/C4/Log.pm
>+++ b/C4/Log.pm
>@@ -27,7 +27,7 @@ use warnings;
> use JSON qw( to_json );
> 
> use C4::Context;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( output_pref dt_from_string );
> use Koha::Logger;
> 
> 
>diff --git a/C4/MarcModificationTemplates.pm b/C4/MarcModificationTemplates.pm
>index e409f34153..cc16c108a6 100644
>--- a/C4/MarcModificationTemplates.pm
>+++ b/C4/MarcModificationTemplates.pm
>@@ -22,7 +22,7 @@ use Modern::Perl;
> use DateTime;
> 
> use C4::Context;
>-use Koha::SimpleMARC;
>+use Koha::SimpleMARC qw( field_exists field_equals copy_field copy_and_replace_field update_field move_field delete_field );
> 
> use constant DEBUG => 0;
> our ( @ISA, @EXPORT_OK );
>diff --git a/C4/Matcher.pm b/C4/Matcher.pm
>index aaead2f492..463a96cf9b 100644
>--- a/C4/Matcher.pm
>+++ b/C4/Matcher.pm
>@@ -23,7 +23,7 @@ use MARC::Record;
> 
> use Koha::SearchEngine;
> use Koha::SearchEngine::Search;
>-use Koha::Util::Normalize qw/legacy_default remove_spaces upper_case lower_case/;
>+use Koha::Util::Normalize qw( remove_spaces upper_case lower_case legacy_default );
> 
> =head1 NAME
> 
>diff --git a/C4/Members.pm b/C4/Members.pm
>index ead8d2525e..3e030d84f4 100644
>--- a/C4/Members.pm
>+++ b/C4/Members.pm
>@@ -26,19 +26,19 @@ use C4::Context;
> use String::Random qw( random_string );
> use Scalar::Util qw( looks_like_number );
> use Date::Calc qw/Today check_date Date_to_Days/;
>-use C4::Log; # logaction
>-use C4::Overdues;
>-use C4::Reserves;
>+use C4::Log qw( logaction );
>+use C4::Overdues qw( checkoverdues );
>+use C4::Reserves qw( GetReserve GetReservesFromBorrowernumber );
> use C4::Accounts;
>-use C4::Biblio;
>-use C4::Letters;
>+use C4::Biblio qw( GetBiblioFromItemNumber GetBiblio );
>+use C4::Letters qw( GetPreparedLetter );
> use C4::Members::Attributes qw(SearchIdMatchingAttribute UpdateBorrowerAttribute);
>-use C4::NewsChannels; #get slip news
>+use C4::NewsChannels qw( GetNewsToDisplay );
> use DateTime;
> use Koha::Database;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Text::Unaccent qw( unac_string );
>-use Koha::AuthUtils qw(hash_password);
>+use Koha::AuthUtils qw( hash_password );
> use Koha::Database;
> use Koha::Holds;
> use Koha::List::Patron;
>diff --git a/C4/Message.pm b/C4/Message.pm
>index 30b71c827c..423514474a 100644
>--- a/C4/Message.pm
>+++ b/C4/Message.pm
>@@ -22,7 +22,7 @@ package C4::Message;
> use strict;
> use warnings;
> use C4::Context;
>-use C4::Letters;
>+use C4::Letters qw( GetPreparedLetter EnqueueLetter getletter );
> use YAML::Syck;
> use Carp;
> 
>diff --git a/C4/NewsChannels.pm b/C4/NewsChannels.pm
>index 62db2c97b2..4a15e0fc58 100644
>--- a/C4/NewsChannels.pm
>+++ b/C4/NewsChannels.pm
>@@ -20,7 +20,7 @@ package C4::NewsChannels;
> 
> use Modern::Perl;
> use C4::Context;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> 
> our ( @ISA, @EXPORT_OK );
> 
>diff --git a/C4/Overdues.pm b/C4/Overdues.pm
>index b0435914a9..ab5ddd37a5 100644
>--- a/C4/Overdues.pm
>+++ b/C4/Overdues.pm
>@@ -30,10 +30,10 @@ use Carp;
> 
> use C4::Circulation;
> use C4::Context;
>-use C4::Accounts;
>-use C4::Log; # logaction
>+use C4::Accounts qw( getnextacctno );
>+use C4::Log qw( logaction );
> use C4::Debug;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Account::Line;
> use Koha::Account::Lines;
> use Koha::IssuingRules;
>diff --git a/C4/Patroncards/Patroncard.pm b/C4/Patroncards/Patroncard.pm
>index 7678ac0d2a..f692e2ce1a 100644
>--- a/C4/Patroncards/Patroncard.pm
>+++ b/C4/Patroncards/Patroncard.pm
>@@ -26,7 +26,7 @@ use Text::Wrap qw(wrap);
> 
> use C4::Creators::Lib qw(get_font_types);
> use C4::Creators::PDF qw(StrWidth);
>-use C4::Patroncards::Lib qw(unpack_UTF8 text_alignment leading box get_borrower_attributes);
>+use C4::Patroncards::Lib qw( box get_borrower_attributes text_alignment leading );
> 
> 
> sub new {
>diff --git a/C4/Record.pm b/C4/Record.pm
>index 09e7835103..afe990e960 100644
>--- a/C4/Record.pm
>+++ b/C4/Record.pm
>@@ -28,13 +28,13 @@ use MARC::Record; # marc2marcxml, marcxml2marc, changeEncoding
> use MARC::File::XML; # marc2marcxml, marcxml2marc, changeEncoding
> use Biblio::EndnoteStyle;
> use Unicode::Normalize; # _entity_encode
>-use C4::Biblio; #marc2bibtex
>+use C4::Biblio qw( GetXmlBiblio GetBiblionumberFromItemnumber GetBiblio GetMarcBiblio EmbedItemsInMarcBiblio GetFrameworkCode );
> use C4::Koha; #marc2csv
>-use C4::XSLT ();
>+use C4::XSLT qw( engine );
> use YAML; #marcrecords2csv
> use Template;
> use Text::CSV::Encoded; #marc2csv
>-use Koha::SimpleMARC qw(read_field);
>+use Koha::SimpleMARC qw( delete_field read_field );
> use Koha::XSLT_Handler;
> use Koha::CsvProfiles;
> use Koha::AuthorisedValues;
>diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
>index 6aa354f90d..b6271872bf 100644
>--- a/C4/Reports/Guided.pm
>+++ b/C4/Reports/Guided.pm
>@@ -24,11 +24,11 @@ use JSON qw( from_json );
> 
> use C4::Context;
> use C4::Templates qw/themelanguage/;
>-use C4::Koha;
>-use Koha::DateUtils;
>+use C4::Koha qw( GetAuthorisedValues );
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use C4::Output;
> use C4::Debug;
>-use C4::Log;
>+use C4::Log qw( logaction );
> 
> use Koha::AuthorisedValues;
> use Koha::Patron::Categories;
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index 3b31e58776..d2de3e9101 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -24,19 +24,19 @@ package C4::Reserves;
> use strict;
> #use warnings; FIXME - Bug 2505
> use C4::Context;
>-use C4::Biblio;
>-use C4::Members;
>-use C4::Items;
>-use C4::Circulation;
>-use C4::Accounts;
>+use C4::Biblio qw( GetBiblioData GetBiblio );
>+use C4::Members qw( GetMember GetAge GetNoticeEmailAddress );
>+use C4::Items qw( GetItem GetItemnumbersForBiblio get_hostitemnumbers_of ModItem ModItemTransfer CartToShelf );
>+use C4::Circulation qw( GetAgeRestriction _GetCircControlBranch GetBranchItemRule );
>+use C4::Accounts qw( getnextacctno manualinvoice );
> 
> # for _koha_notify_reserve
>-use C4::Members::Messaging;
>-use C4::Members qw();
>-use C4::Letters;
>-use C4::Log;
>+use C4::Members qw( GetMember GetAge GetNoticeEmailAddress );
>+use C4::Members qw( GetMember GetAge GetNoticeEmailAddress );
>+use C4::Letters qw( GetPreparedLetter EnqueueLetter );
>+use C4::Log qw( logaction );
> 
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Calendar;
> use Koha::Database;
> use Koha::Hold;
>diff --git a/C4/Ris.pm b/C4/Ris.pm
>index 0cca87e979..6f930062e4 100644
>--- a/C4/Ris.pm
>+++ b/C4/Ris.pm
>@@ -65,7 +65,7 @@ use Modern::Perl;
> use List::MoreUtils qw/uniq/;
> 
> use C4::Biblio qw(GetMarcSubfieldStructureFromKohaField);
>-use Koha::SimpleMARC qw(read_field);
>+use Koha::SimpleMARC qw( read_field );
> 
> our ( @ISA, @EXPORT_OK );
> 
>diff --git a/C4/RotatingCollections.pm b/C4/RotatingCollections.pm
>index 9a4213e23d..1a9a44195c 100644
>--- a/C4/RotatingCollections.pm
>+++ b/C4/RotatingCollections.pm
>@@ -25,8 +25,8 @@ package C4::RotatingCollections;
> use Modern::Perl;
> 
> use C4::Context;
>-use C4::Circulation;
>-use C4::Reserves qw(CheckReserves);
>+use C4::Circulation qw( GetTransfers transferbook );
>+use C4::Reserves qw( CheckReserves );
> use Koha::Database;
> 
> use DBI;
>diff --git a/C4/Search.pm b/C4/Search.pm
>index 423b6865a6..6d83b1356f 100644
>--- a/C4/Search.pm
>+++ b/C4/Search.pm
>@@ -19,17 +19,17 @@ use strict;
> #use warnings; FIXME - Bug 2505
> 
> use C4::Context;
>-use C4::Biblio;    # GetMarcFromKohaField, GetBiblioData
>-use C4::Koha;      # getFacets
>-use Koha::DateUtils;
>+use C4::Biblio qw( TransformMarcToKoha GetMarcFromKohaField GetFrameworkCode GetRecordValue GetMarcBiblio GetAuthorisedValueDesc GetBiblioData GetBiblio );
>+use C4::Koha qw( getFacets GetVariationsOfISBN GetItemTypes getitemtypeimagelocation GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN );
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Libraries;
> use Lingua::Stem;
> use C4::Search::PazPar2;
> use XML::Simple;
>-use C4::XSLT;
>-use C4::Reserves;    # GetReserveStatus
>+use C4::XSLT qw( get_xslt_sysprefs XSLTParse4Display engine );
>+use C4::Reserves qw( GetReserve GetReserveStatus );
> use C4::Debug;
>-use C4::Charset;
>+use C4::Charset qw( SetUTF8Flag );
> use Koha::AuthorisedValues;
> use Koha::ItemTypes;
> use Koha::Libraries;
>diff --git a/C4/Search/History.pm b/C4/Search/History.pm
>index 8406f3086b..9b751c0921 100644
>--- a/C4/Search/History.pm
>+++ b/C4/Search/History.pm
>@@ -4,7 +4,7 @@ use Modern::Perl;
> 
> use C4::Auth qw( get_session );
> use C4::Context;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> 
> use JSON qw( encode_json decode_json );
> use URI::Escape;
>diff --git a/C4/Serials.pm b/C4/Serials.pm
>index 3dadf2eaa1..f534e70cf3 100644
>--- a/C4/Serials.pm
>+++ b/C4/Serials.pm
>@@ -20,18 +20,18 @@ package C4::Serials;
> 
> use Modern::Perl;
> 
>-use C4::Auth qw(haspermission);
>+use C4::Auth qw( haspermission );
> use C4::Context;
> use DateTime;
> use Date::Calc qw(:all);
> use POSIX qw(strftime);
>-use C4::Biblio;
>-use C4::Log;    # logaction
>+use C4::Biblio qw( GetBiblio GetMarcBiblio GetMarcFromKohaField ModBiblio );
>+use C4::Log qw( logaction );
> use C4::Debug;
>-use C4::Serials::Frequency;
>-use C4::Serials::Numberpattern;
>+use C4::Serials::Frequency qw( GetSubscriptionFrequency );
>+use C4::Serials::Numberpattern qw( GetSubscriptionNumberpattern );
> use Koha::AdditionalField;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Serial;
> use Koha::Subscriptions;
> use Koha::Subscription::Histories;
>diff --git a/C4/Service.pm b/C4/Service.pm
>index fa95a61cdb..965e667171 100644
>--- a/C4/Service.pm
>+++ b/C4/Service.pm
>@@ -43,8 +43,8 @@ use warnings;
> 
> use CGI qw ( -utf8 );
> use C4::Auth qw( check_api_auth );
>-use C4::Output qw( :ajax );
>-use C4::Output::JSONStream;
>+use C4::Output qw( output_with_http_headers );
>+use C4::Output qw( output_with_http_headers );
> use JSON;
> 
> our $debug;
>diff --git a/C4/ShelfBrowser.pm b/C4/ShelfBrowser.pm
>index e05f5f6a04..a570eaeb77 100644
>--- a/C4/ShelfBrowser.pm
>+++ b/C4/ShelfBrowser.pm
>@@ -22,9 +22,9 @@ package C4::ShelfBrowser;
> use strict;
> use warnings;
> 
>-use C4::Biblio;
>+use C4::Biblio qw( GetAuthorisedValueDesc GetMarcBiblio GetRecordValue GetFrameworkCode );
> use C4::Context;
>-use C4::Koha;
>+use C4::Koha qw( GetNormalizedUPC GetNormalizedOCLCNumber GetNormalizedISBN GetNormalizedEAN );
> use Koha::Libraries;
> 
> our (@ISA, @EXPORT_OK);
>diff --git a/C4/SocialData.pm b/C4/SocialData.pm
>index 218cf4e9f7..8217ccb49e 100644
>--- a/C4/SocialData.pm
>+++ b/C4/SocialData.pm
>@@ -19,7 +19,7 @@ use Modern::Perl;
> 
> use C4::Context;
> use Business::ISBN;
>-use C4::Koha;
>+use C4::Koha qw( GetNormalizedISBN );
> 
> =head1 NAME
> 
>diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
>index 1ea2339625..52e283317e 100644
>--- a/C4/Suggestions.pm
>+++ b/C4/Suggestions.pm
>@@ -26,8 +26,8 @@ use CGI qw ( -utf8 );
> use C4::Context;
> use C4::Output;
> use C4::Debug;
>-use C4::Letters;
>-use Koha::DateUtils;
>+use C4::Letters qw( GetPreparedLetter EnqueueLetter );
>+use Koha::DateUtils qw( dt_from_string output_pref );
> 
> use List::MoreUtils qw(any);
> use base qw(Exporter);
>diff --git a/C4/Templates.pm b/C4/Templates.pm
>index 17746e85cf..07acc1e648 100644
>--- a/C4/Templates.pm
>+++ b/C4/Templates.pm
>@@ -32,7 +32,7 @@ use List::MoreUtils qw/ any uniq /;
> use base qw(Class::Accessor);
> use Template;
> use Template::Constants qw( :debug );
>-use C4::Languages qw(getTranslatedLanguages get_bidi regex_lang_subtags language_get_description accept_language );
>+use C4::Languages qw( regex_lang_subtags get_bidi getTranslatedLanguages getlanguage );
> 
> use C4::Context;
> 
>diff --git a/C4/TmplToken.pm b/C4/TmplToken.pm
>index 045269b80b..77932cc1c0 100644
>--- a/C4/TmplToken.pm
>+++ b/C4/TmplToken.pm
>@@ -20,7 +20,7 @@ package C4::TmplToken;
> 
> use strict;
> use warnings;
>-use C4::TmplTokenType;
>+use C4::TmplTokenType qw( DIRECTIVE TAG CDATA TEXT TEXT_PARAMETRIZED );
> 
> =head1 NAME
> 
>diff --git a/C4/XISBN.pm b/C4/XISBN.pm
>index f824b1fb9e..32f2b8042f 100644
>--- a/C4/XISBN.pm
>+++ b/C4/XISBN.pm
>@@ -19,10 +19,10 @@ package C4::XISBN;
> 
> use XML::Simple;
> #use LWP::Simple;
>-use C4::Biblio;
>-use C4::Koha;
>-use C4::Search;
>-use C4::External::Syndetics qw(get_syndetics_editions);
>+use C4::Biblio qw( get_koha_field_from_marc GetBiblioData GetBiblio );
>+use C4::Koha qw( GetNormalizedISBN );
>+use C4::Search qw( new_record_from_zebra );
>+use C4::External::Syndetics qw( get_syndetics_editions );
> use LWP::UserAgent;
> use HTTP::Request::Common;
> 
>diff --git a/C4/XSLT.pm b/C4/XSLT.pm
>index 36d79436c5..6a664292a8 100644
>--- a/C4/XSLT.pm
>+++ b/C4/XSLT.pm
>@@ -24,11 +24,11 @@ package C4::XSLT;
> use Modern::Perl;
> 
> use C4::Context;
>-use C4::Items;
>-use C4::Koha;
>-use C4::Biblio;
>-use C4::Circulation;
>-use C4::Reserves;
>+use C4::Items qw( GetItem GetItemsInfo );
>+use C4::Koha qw( GetItemTypes xml_escape );
>+use C4::Biblio qw( GetFrameworkCode GetMarcStructure GetAuthorisedValueDesc );
>+use C4::Circulation qw( GetTransfers );
>+use C4::Reserves qw( GetReserve GetReserveStatus );
> use Koha::AuthorisedValues;
> use Koha::ItemTypes;
> use Koha::XSLT_Handler;
>diff --git a/Koha/ArticleRequest.pm b/Koha/ArticleRequest.pm
>index f114eed338..4d0c2b48c9 100644
>--- a/Koha/ArticleRequest.pm
>+++ b/Koha/ArticleRequest.pm
>@@ -27,7 +27,7 @@ use Koha::Biblios;
> use Koha::Items;
> use Koha::Libraries;
> use Koha::ArticleRequest::Status;
>-use Koha::DateUtils qw(dt_from_string);
>+use Koha::DateUtils qw( dt_from_string );
> 
> use base qw(Koha::Object);
> 
>diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm
>index aad43437e3..812c4fd77e 100644
>--- a/Koha/Biblio.pm
>+++ b/Koha/Biblio.pm
>@@ -21,7 +21,7 @@ use Modern::Perl;
> 
> use Carp;
> 
>-use C4::Biblio qw();
>+use C4::Biblio qw( GetRecordValue GetMarcBiblio );
> 
> use Koha::Database;
> use Koha::DateUtils qw( dt_from_string );
>diff --git a/Koha/BiblioUtils.pm b/Koha/BiblioUtils.pm
>index abb0721970..967f2b25b3 100644
>--- a/Koha/BiblioUtils.pm
>+++ b/Koha/BiblioUtils.pm
>@@ -32,7 +32,7 @@ the new thing that should be used.
> 
> =cut
> 
>-use C4::Biblio; # EmbedItemsInMarcBiblio
>+use C4::Biblio qw( GetMarcBiblio );
> use Koha::MetadataIterator;
> use Koha::Database;
> use Modern::Perl;
>diff --git a/Koha/BiblioUtils/Iterator.pm b/Koha/BiblioUtils/Iterator.pm
>index 0e719665a2..54aad99c9e 100644
>--- a/Koha/BiblioUtils/Iterator.pm
>+++ b/Koha/BiblioUtils/Iterator.pm
>@@ -43,7 +43,7 @@ Returns biblionumber and marc in list context.
> 
> =cut
> 
>-use C4::Biblio;    # :( - for EmbedItemsInMarcBiblio
>+use C4::Biblio qw( EmbedItemsInMarcBiblio );
> 
> use Carp;
> use MARC::Record;
>diff --git a/Koha/Config/SysPref.pm b/Koha/Config/SysPref.pm
>index 1e71b8c0e4..40b545a409 100644
>--- a/Koha/Config/SysPref.pm
>+++ b/Koha/Config/SysPref.pm
>@@ -23,7 +23,7 @@ use Carp;
> 
> use Koha::Database;
> 
>-use C4::Log;
>+use C4::Log qw( logaction );
> 
> use base qw(Koha::Object);
> 
>diff --git a/Koha/EDI.pm b/Koha/EDI.pm
>index 8f40471c60..f9f7279322 100644
>--- a/Koha/EDI.pm
>+++ b/Koha/EDI.pm
>@@ -27,10 +27,10 @@ use Business::ISBN;
> use DateTime;
> use C4::Context;
> use Koha::Database;
>-use C4::Acquisition qw( NewBasket CloseBasket ModOrder);
>+use C4::Acquisition qw( ModOrder NewBasket CloseBasket );
> use C4::Suggestions qw( ModSuggestion );
>-use C4::Items qw(AddItem);
>-use C4::Biblio qw( AddBiblio TransformKohaToMarc GetMarcBiblio );
>+use C4::Items qw( AddItem );
>+use C4::Biblio qw( AddBiblio TransformKohaToMarc );
> use Koha::Edifact::Order;
> use Koha::Edifact;
> use Log::Log4perl;
>diff --git a/Koha/Exporter/Record.pm b/Koha/Exporter/Record.pm
>index 193f87e988..b88ae0bfec 100644
>--- a/Koha/Exporter/Record.pm
>+++ b/Koha/Exporter/Record.pm
>@@ -5,8 +5,8 @@ use MARC::File::XML;
> use MARC::File::USMARC;
> 
> use C4::AuthoritiesMarc;
>-use C4::Biblio;
>-use C4::Record;
>+use C4::Biblio qw( RemoveAllNsb GetMarcBiblio EmbedItemsInMarcBiblio GetMarcFromKohaField GetFrameworkCode );
>+use C4::Record qw( marc2csv );
> use Koha::CsvProfiles;
> use Koha::Logger;
> 
>diff --git a/Koha/Hold.pm b/Koha/Hold.pm
>index d708054c5a..1449600d3a 100644
>--- a/Koha/Hold.pm
>+++ b/Koha/Hold.pm
>@@ -23,9 +23,9 @@ use Carp;
> use Data::Dumper qw(Dumper);
> 
> use C4::Context qw(preference);
>-use C4::Log;
>+use C4::Log qw( logaction );
> 
>-use Koha::DateUtils qw(dt_from_string output_pref);
>+use Koha::DateUtils qw( dt_from_string );
> use Koha::Patrons;
> use Koha::Biblios;
> use Koha::Items;
>diff --git a/Koha/I18N.pm b/Koha/I18N.pm
>index d6e90fc868..15dd3a4d8e 100644
>--- a/Koha/I18N.pm
>+++ b/Koha/I18N.pm
>@@ -21,7 +21,7 @@ use Modern::Perl;
> use base qw(Locale::Maketext Exporter);
> 
> use CGI;
>-use C4::Languages;
>+use C4::Languages qw( getlanguage );
> 
> use Locale::Maketext::Lexicon {
>     'en' => ['Auto'],
>diff --git a/Koha/ItemType.pm b/Koha/ItemType.pm
>index 24be0d2297..f2845060c9 100644
>--- a/Koha/ItemType.pm
>+++ b/Koha/ItemType.pm
>@@ -19,8 +19,8 @@ use Modern::Perl;
> 
> use Carp;
> 
>-use C4::Koha;
>-use C4::Languages;
>+use C4::Koha qw( getitemtypeimagelocation );
>+use C4::Languages qw( getlanguage );
> use Koha::Database;
> use Koha::Localizations;
> 
>diff --git a/Koha/MetaSearcher.pm b/Koha/MetaSearcher.pm
>index 65f72398a7..83416eb56a 100644
>--- a/Koha/MetaSearcher.pm
>+++ b/Koha/MetaSearcher.pm
>@@ -22,7 +22,7 @@ use Modern::Perl;
> use base 'Class::Accessor';
> 
> use C4::Charset qw( MarcToUTF8Record );
>-use C4::Search qw(); # Purely for new_record_from_zebra
>+use C4::Search qw( new_record_from_zebra );
> use DBIx::Class::ResultClass::HashRefInflator;
> use IO::Select;
> use Koha::Caches;
>diff --git a/Koha/MetadataRecord.pm b/Koha/MetadataRecord.pm
>index 9899e164c7..b4bbf9f18f 100644
>--- a/Koha/MetadataRecord.pm
>+++ b/Koha/MetadataRecord.pm
>@@ -35,7 +35,7 @@ and authority) records in Koha.
> use Modern::Perl;
> 
> use Carp;
>-use C4::Biblio;
>+use C4::Biblio qw( GetMarcSubfieldStructure );
> use Koha::Util::MARC;
> 
> use base qw(Class::Accessor);
>diff --git a/Koha/MetadataRecord/Authority.pm b/Koha/MetadataRecord/Authority.pm
>index c3b3314ce6..2841bfb379 100644
>--- a/Koha/MetadataRecord/Authority.pm
>+++ b/Koha/MetadataRecord/Authority.pm
>@@ -36,7 +36,7 @@ use warnings;
> use C4::Context;
> use MARC::Record;
> use MARC::File::XML;
>-use C4::Charset;
>+use C4::Charset qw( StripNonXmlChars );
> use Koha::Util::MARC;
> 
> use base qw(Koha::MetadataRecord);
>diff --git a/Koha/Patron.pm b/Koha/Patron.pm
>index 015cb41eba..ff82d49e98 100644
>--- a/Koha/Patron.pm
>+++ b/Koha/Patron.pm
>@@ -23,10 +23,10 @@ use Modern::Perl;
> use Carp;
> 
> use C4::Context;
>-use C4::Log;
>+use C4::Log qw( logaction );
> use Koha::Checkouts;
> use Koha::Database;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string );
> use Koha::Holds;
> use Koha::Old::Checkouts;
> use Koha::Patron::Categories;
>diff --git a/Koha/Patron/Category.pm b/Koha/Patron/Category.pm
>index 5a456b7164..fa944cb3aa 100644
>--- a/Koha/Patron/Category.pm
>+++ b/Koha/Patron/Category.pm
>@@ -22,7 +22,7 @@ use Carp;
> use C4::Members::Messaging;
> 
> use Koha::Database;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string );
> 
> use base qw(Koha::Object);
> 
>diff --git a/Koha/Patron/Discharge.pm b/Koha/Patron/Discharge.pm
>index 289fdb09a8..7c862bd8b3 100644
>--- a/Koha/Patron/Discharge.pm
>+++ b/Koha/Patron/Discharge.pm
>@@ -7,7 +7,7 @@ use Carp;
> 
> use C4::Templates qw ( gettemplate );
> use C4::Members qw( GetPendingIssues );
>-use C4::Reserves qw( GetReservesFromBorrowernumber CancelReserve );
>+use C4::Reserves qw( GetReserve GetReservesFromBorrowernumber CancelReserve );
> 
> use Koha::Database;
> use Koha::DateUtils qw( dt_from_string output_pref );
>diff --git a/Koha/Uploader.pm b/Koha/Uploader.pm
>index 844c166307..c71c19ebd8 100644
>--- a/Koha/Uploader.pm
>+++ b/Koha/Uploader.pm
>@@ -72,7 +72,6 @@ use Time::HiRes;
> use base qw(Class::Accessor);
> 
> use C4::Context;
>-use C4::Koha;
> use Koha::UploadedFile;
> use Koha::UploadedFiles;
> 
>diff --git a/Koha/Virtualshelf.pm b/Koha/Virtualshelf.pm
>index 4e45c3166c..2dd90a8b5e 100644
>--- a/Koha/Virtualshelf.pm
>+++ b/Koha/Virtualshelf.pm
>@@ -19,7 +19,7 @@ use Modern::Perl;
> 
> use Carp;
> 
>-use C4::Auth;
>+use C4::Auth qw( haspermission );
> 
> use Koha::Patrons;
> use Koha::Database;
>diff --git a/Koha/Virtualshelfshare.pm b/Koha/Virtualshelfshare.pm
>index 09e383f656..3fde727cd2 100644
>--- a/Koha/Virtualshelfshare.pm
>+++ b/Koha/Virtualshelfshare.pm
>@@ -22,7 +22,7 @@ use DateTime;
> use DateTime::Duration;
> 
> use Koha::Database;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string );
> use Koha::Exceptions;
> 
> use base qw(Koha::Object);
>diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm
>index f008f44394..623c427d11 100644
>--- a/acqui/pdfformat/layout2pages.pm
>+++ b/acqui/pdfformat/layout2pages.pm
>@@ -29,7 +29,7 @@ use warnings;
> use utf8;
> 
> use Koha::Number::Price;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Libraries;
> 
> our (@ISA, @EXPORT_OK);
>diff --git a/acqui/pdfformat/layout2pagesde.pm b/acqui/pdfformat/layout2pagesde.pm
>index f0b42e0be8..7113ab5fdf 100644
>--- a/acqui/pdfformat/layout2pagesde.pm
>+++ b/acqui/pdfformat/layout2pagesde.pm
>@@ -28,7 +28,7 @@ use warnings;
> use utf8;
> 
> use Koha::Number::Price;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Libraries;
> 
> our(@ISA, @EXPORT_OK);
>diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm
>index 4c9375c55d..5f4deb31e3 100644
>--- a/acqui/pdfformat/layout3pages.pm
>+++ b/acqui/pdfformat/layout3pages.pm
>@@ -30,7 +30,7 @@ use warnings;
> use utf8;
> 
> use Koha::Number::Price;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Libraries;
> 
> our (@ISA, @EXPORT_OK);
>diff --git a/acqui/pdfformat/layout3pagesfr.pm b/acqui/pdfformat/layout3pagesfr.pm
>index 3413bab2ff..3ddae173aa 100644
>--- a/acqui/pdfformat/layout3pagesfr.pm
>+++ b/acqui/pdfformat/layout3pagesfr.pm
>@@ -29,7 +29,7 @@ use warnings;
> use utf8;
> 
> use Koha::Number::Price;
>-use Koha::DateUtils;
>+use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Libraries;
> 
> our (@ISA, @EXPORT_OK);
>diff --git a/misc/translator/TmplTokenizer.pm b/misc/translator/TmplTokenizer.pm
>index 0bde8874e0..aafa6dae07 100644
>--- a/misc/translator/TmplTokenizer.pm
>+++ b/misc/translator/TmplTokenizer.pm
>@@ -2,7 +2,7 @@ package TmplTokenizer;
> 
> use strict;
> #use warnings; FIXME - Bug 2505
>-use C4::TmplTokenType;
>+use C4::TmplTokenType qw( CDATA UNKNOWN DIRECTIVE TEXT TAG TEXT_PARAMETRIZED to_string );
> use C4::TmplToken;
> use C4::TTParser;
> use VerboseWarnings qw( pedantic_p error_normal warn_normal warn_pedantic );
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 17600: 57394 | 57950 | 57951 | 57952 | 57953 | 57954 | 61994 | 61995 | 61996 | 61997 | 61998 | 62209 | 62210 | 62211 | 62212 | 62213 | 62940 | 62941 | 62942 | 62943 | 62958 | 62959 | 64387 | 64388 | 64389 | 64390 | 64391 | 64392 | 64466 | 64467 | 64468 | 64469 | 64470 | 64471 | 64472 | 64473 | 64474 | 64475 | 64476 | 121309 | 121310 | 121311 | 121312 | 121313 | 121314 | 122360 | 122361 | 122362 | 122363 | 122364 | 122365 | 122869 | 122884 | 122945 | 123194 | 123195 | 123196 | 123200 | 123210 | 123281 | 123283 | 123284 | 123325 | 123417 | 123418 | 123419 | 123420 | 123565 | 124866 | 125059 | 125063 | 125064 | 125066 | 126640 | 127056 | 127918