Bug 17600: Standardize our EXPORT_OK

[srvgit] / C4 / Accounts.pm

diff --git a/C4/Accounts.pm b/C4/Accounts.pm
index 6aa1bb4..ad0d34f 100644 (file)
--- a/C4/Accounts.pm
+++ b/C4/Accounts.pm
@@ -18,19 +18,15 @@ package C4::Accounts;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 use C4::Context;
 use C4::Stats;
 use C4::Members;
-use C4::Log qw(logaction);
 use Koha::Account;
 use Koha::Account::Lines;
 use Koha::Account::Offsets;
 use Koha::Items;
 
-use Mojo::Util qw(deprecated);
-use Data::Dumper qw(Dumper);
 
 use vars qw(@ISA @EXPORT);
 
@@ -38,8 +34,8 @@ BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-      &chargelostitem
-      &purge_zero_balance_fees
+      chargelostitem
+      purge_zero_balance_fees
     );
 }
 
@@ -108,7 +104,7 @@ sub chargelostitem {
                     user_id     => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
                     interface   => C4::Context->interface,
                     library_id  => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
-                    type        => 'processing',
+                    type        => 'PROCESSING',
                     item_id     => $itemnumber,
                     issue_id    => $issue_id,
                 }
@@ -124,7 +120,7 @@ sub chargelostitem {
                     user_id     => C4::Context->userenv ? C4::Context->userenv->{'number'} : undef,
                     interface   => C4::Context->interface,
                     library_id  => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
-                    type        => 'lost_item',
+                    type        => 'LOST',
                     item_id     => $itemnumber,
                     issue_id    => $issue_id,
                 }
@@ -133,83 +129,6 @@ sub chargelostitem {
     }
 }
 
-=head2 manualinvoice
-
-  &manualinvoice($borrowernumber, $itemnumber, $description, $type,
-                 $amount, $note);
-
-This function is now deprecated and not used anywhere within koha. It is due for complete removal in 19.11
-
-=cut
-
-sub manualinvoice {
-    my ( $borrowernumber, $itemnum, $desc, $type, $amount, $note ) = @_;
-
-    deprecated "C4::Accounts::manualinvoice is deprecated in favor of Koha::Account->add_debit";
-
-    my $manager_id = C4::Context->userenv ? C4::Context->userenv->{'number'} : undef;
-    my $dbh      = C4::Context->dbh;
-    my $insert;
-    my $amountleft = $amount;
-
-    my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
-
-    my $issue_id;
-    if ( $type eq 'LOST' && $itemnum ) {
-        my $checkouts = Koha::Checkouts->search(
-            { itemnumber => $itemnum, borrowernumber => $borrowernumber } );
-        my $checkout =
-            $checkouts->count
-          ? $checkouts->next
-          : Koha::Old::Checkouts->search(
-            { itemnumber => $itemnum, borrowernumber => $borrowernumber },
-            { order_by   => { -desc => 'returndate' }, rows => 1 }
-        )->next;
-        $issue_id = $checkout ? $checkout->issue_id : undef;
-    }
-
-    my $accountline = Koha::Account::Line->new(
-        {
-            borrowernumber    => $borrowernumber,
-            date              => \'NOW()',
-            amount            => $amount,
-            description       => $desc,
-            debit_type_code   => $type,
-            amountoutstanding => $amountleft,
-            itemnumber        => $itemnum || undef,
-            issue_id          => $issue_id,
-            note              => $note,
-            manager_id        => $manager_id,
-            interface         => C4::Context->interface,
-            branchcode        => $branchcode,
-        }
-    )->store();
-
-    my $account_offset = Koha::Account::Offset->new(
-        {
-            debit_id => $accountline->id,
-            type     => 'Manual Debit',
-            amount   => $amount,
-        }
-    )->store();
-
-    if ( C4::Context->preference("FinesLog") ) {
-        logaction("FINES", 'CREATE',$borrowernumber,Dumper({
-            action            => 'create_fee',
-            borrowernumber    => $borrowernumber,
-            amount            => $amount,
-            description       => $desc,
-            debit_type_code   => $type,
-            amountoutstanding => $amountleft,
-            note              => $note,
-            itemnumber        => $itemnum,
-            manager_id        => $manager_id,
-        }));
-    }
-
-    return 0;
-}
-
 =head2 purge_zero_balance_fees
 
   purge_zero_balance_fees( $days );