From 5b40c0114188631587b80027eef21fb4bc4c75af Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 15 Apr 2021 09:49:35 +0200 Subject: [PATCH] Bug 28150: Don't include Koha::Objects-based modules --- Koha/Account/Line.pm | 4 ++-- Koha/Acquisition/Invoice/Adjustments.pm | 2 -- Koha/AdditionalFieldValue.pm | 2 +- Koha/Club/Hold.pm | 2 +- Koha/Club/Holds.pm | 2 -- Koha/Illrequest.pm | 4 ++-- Koha/Illrequest/Logger.pm | 2 +- Koha/Item.pm | 2 +- Koha/Patron.pm | 4 ++-- Koha/Patron/HouseboundVisit.pm | 2 +- Koha/Patron/Modification.pm | 1 - Koha/Patron/Modifications.pm | 2 +- Koha/StockRotationItem.pm | 5 ++--- Koha/StockRotationStage.pm | 5 +++-- Koha/Uploader.pm | 1 - Koha/Virtualshelf.pm | 2 -- 16 files changed, 17 insertions(+), 25 deletions(-) diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm index 2cc81993ef1..034834e6f5d 100644 --- a/Koha/Account/Line.pm +++ b/Koha/Account/Line.pm @@ -23,8 +23,8 @@ use Data::Dumper; use C4::Log qw(logaction); use C4::Overdues qw(GetFine); -use Koha::Account::CreditType; -use Koha::Account::DebitType; +use Koha::Account::CreditTypes; +use Koha::Account::DebitTypes; use Koha::Account::Offsets; use Koha::Database; use Koha::DateUtils; diff --git a/Koha/Acquisition/Invoice/Adjustments.pm b/Koha/Acquisition/Invoice/Adjustments.pm index 3a43904b069..f44907d2c70 100644 --- a/Koha/Acquisition/Invoice/Adjustments.pm +++ b/Koha/Acquisition/Invoice/Adjustments.pm @@ -22,8 +22,6 @@ use Carp; use Koha::Database; -use Koha::Rating; - use base qw(Koha::Objects); =head1 NAME diff --git a/Koha/AdditionalFieldValue.pm b/Koha/AdditionalFieldValue.pm index 6af87a9d9d5..e3a25d4c7f1 100644 --- a/Koha/AdditionalFieldValue.pm +++ b/Koha/AdditionalFieldValue.pm @@ -1,7 +1,7 @@ package Koha::AdditionalFieldValue; use Modern::Perl; -use Koha::AdditionalField; +use Koha::AdditionalFields; use base 'Koha::Object'; diff --git a/Koha/Club/Hold.pm b/Koha/Club/Hold.pm index 378cd027f71..b60eb86a6cb 100644 --- a/Koha/Club/Hold.pm +++ b/Koha/Club/Hold.pm @@ -28,7 +28,7 @@ use Koha::Club::Template::Fields; use base qw(Koha::Object); use Koha::Exceptions; use Koha::Exceptions::ClubHold; -use Koha::Club::Hold::PatronHold; +use Koha::Club::Hold::PatronHolds; use Koha::Clubs; use Koha::Patrons; diff --git a/Koha/Club/Holds.pm b/Koha/Club/Holds.pm index 6ec9f413d19..18cc38a1cb0 100644 --- a/Koha/Club/Holds.pm +++ b/Koha/Club/Holds.pm @@ -23,8 +23,6 @@ use Carp; use Koha::Database; -use Koha::Club::Field; - use Koha::Club::Hold; use base qw(Koha::Objects); diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm index 74d9b84d10f..db62eefb4ee 100644 --- a/Koha/Illrequest.pm +++ b/Koha/Illrequest.pm @@ -32,9 +32,9 @@ use Koha::DateUtils qw/ dt_from_string /; use Koha::Exceptions::Ill; use Koha::Illcomments; use Koha::Illrequestattributes; -use Koha::AuthorisedValue; +use Koha::AuthorisedValues; use Koha::Illrequest::Logger; -use Koha::Patron; +use Koha::Patrons; use Koha::AuthorisedValues; use Koha::Biblios; use Koha::Items; diff --git a/Koha/Illrequest/Logger.pm b/Koha/Illrequest/Logger.pm index 971b3a8b761..9adf6eb0cc5 100644 --- a/Koha/Illrequest/Logger.pm +++ b/Koha/Illrequest/Logger.pm @@ -26,7 +26,7 @@ use C4::Context; use C4::Templates; use C4::Log qw( logaction ); use Koha::ActionLogs; -use Koha::Notice::Template; +use Koha::Notice::Templates; =head1 NAME diff --git a/Koha/Item.pm b/Koha/Item.pm index dcdcfbdff23..66a0d277b89 100644 --- a/Koha/Item.pm +++ b/Koha/Item.pm @@ -44,7 +44,7 @@ use Koha::ItemTypes; use Koha::Patrons; use Koha::Plugins; use Koha::Libraries; -use Koha::StockRotationItem; +use Koha::StockRotationItems; use Koha::StockRotationRotas; use base qw(Koha::Object); diff --git a/Koha/Patron.pm b/Koha/Patron.pm index a5385337264..a63ea445322 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -40,8 +40,8 @@ use Koha::Old::Checkouts; use Koha::Patron::Attributes; use Koha::Patron::Categories; use Koha::Patron::Debarments; -use Koha::Patron::HouseboundProfile; -use Koha::Patron::HouseboundRole; +use Koha::Patron::HouseboundProfiles; +use Koha::Patron::HouseboundRoles; use Koha::Patron::Images; use Koha::Patron::Modifications; use Koha::Patron::Relationships; diff --git a/Koha/Patron/HouseboundVisit.pm b/Koha/Patron/HouseboundVisit.pm index debc4416d4b..75585921c26 100644 --- a/Koha/Patron/HouseboundVisit.pm +++ b/Koha/Patron/HouseboundVisit.pm @@ -18,7 +18,7 @@ package Koha::Patron::HouseboundVisit; use Modern::Perl; use Koha::Database; -use Koha::Patron; +use Koha::Patrons; use base qw(Koha::Object); diff --git a/Koha/Patron/Modification.pm b/Koha/Patron/Modification.pm index 51f182a80b9..865a452381a 100644 --- a/Koha/Patron/Modification.pm +++ b/Koha/Patron/Modification.pm @@ -23,7 +23,6 @@ use Carp; use Koha::Database; use Koha::Exceptions::Patron::Modification; -use Koha::Patron::Attribute; use Koha::Patron::Attributes; use Koha::Patron::Modifications; diff --git a/Koha/Patron/Modifications.pm b/Koha/Patron/Modifications.pm index 1ca0ab11633..eb7863b1fdd 100644 --- a/Koha/Patron/Modifications.pm +++ b/Koha/Patron/Modifications.pm @@ -26,8 +26,8 @@ use Modern::Perl; use C4::Context; -use Koha::Patron::Attribute; use Koha::Patron::Modification; +use Koha::Patron::Attributes; use JSON; use List::Util qw /any none/; diff --git a/Koha/StockRotationItem.pm b/Koha/StockRotationItem.pm index 9ee92c10e61..6a740aeee9b 100644 --- a/Koha/StockRotationItem.pm +++ b/Koha/StockRotationItem.pm @@ -23,9 +23,8 @@ use DateTime; use DateTime::Duration; use Koha::Database; use Koha::DateUtils qw/dt_from_string/; -use Koha::Item::Transfer; -use Koha::Item; -use Koha::StockRotationStage; +use Koha::Items; +use Koha::StockRotationStages; use Try::Tiny; use base qw(Koha::Object); diff --git a/Koha/StockRotationStage.pm b/Koha/StockRotationStage.pm index 59f38b5c62b..d9fc7c96f30 100644 --- a/Koha/StockRotationStage.pm +++ b/Koha/StockRotationStage.pm @@ -20,8 +20,9 @@ package Koha::StockRotationStage; use Modern::Perl; use Koha::Database; -use Koha::Library; -use Koha::StockRotationRota; +use Koha::StockRotationStage; +use Koha::Libraries; +use Koha::StockRotationRotas; use base qw(Koha::Object); diff --git a/Koha/Uploader.pm b/Koha/Uploader.pm index 4cd6aafb6f7..a3ec9d3b818 100644 --- a/Koha/Uploader.pm +++ b/Koha/Uploader.pm @@ -77,7 +77,6 @@ use base qw(Class::Accessor); use C4::Context; use C4::Koha; -use Koha::UploadedFile; use Koha::UploadedFiles; __PACKAGE__->mk_ro_accessors( qw|| ); diff --git a/Koha/Virtualshelf.pm b/Koha/Virtualshelf.pm index c27c695ada6..26b4937399e 100644 --- a/Koha/Virtualshelf.pm +++ b/Koha/Virtualshelf.pm @@ -25,9 +25,7 @@ use Koha::Patrons; use Koha::Database; use Koha::DateUtils qw( dt_from_string ); use Koha::Exceptions; -use Koha::Virtualshelfshare; use Koha::Virtualshelfshares; -use Koha::Virtualshelfcontent; use Koha::Virtualshelfcontents; use base qw(Koha::Object); -- 2.20.1