Bug 18736: Calculate tax depending on rounding
[koha.git] / C4 / Accounts.pm
index d2c597a..0339e68 100644 (file)
@@ -29,6 +29,7 @@ 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);
@@ -37,7 +38,6 @@ BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-      &manualinvoice
       &getnextacctno
       &chargelostitem
       &purge_zero_balance_fees
@@ -108,14 +108,12 @@ sub chargelostitem{
         $replacementprice = $defaultreplacecost;
     }
 
-    my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
-
+    my $account = Koha::Account->new({ patron_id => $borrowernumber });
     # first make sure the borrower hasn't already been charged for this item
     # FIXME this should be more exact
     #       there is no reason a user can't lose an item, find and return it, and lost it again
-    my $existing_charges = Koha::Account::Lines->search(
+    my $existing_charges = $account->lines->search(
         {
-            borrowernumber => $borrowernumber,
             itemnumber     => $itemnumber,
             accounttype    => 'L',
         }
@@ -127,86 +125,33 @@ sub chargelostitem{
         my $issue_id = $checkout ? $checkout->issue_id : undef;
         #add processing fee
         if ($processfee && $processfee > 0){
-            my $accountline = Koha::Account::Line->new(
+            my $accountline = $account->add_debit(
                 {
-                    borrowernumber    => $borrowernumber,
-                    issue_id          => $issue_id,
-                    accountno         => getnextacctno($borrowernumber),
-                    date              => \'NOW()',
-                    amount            => $processfee,
-                    description       => $description,
-                    accounttype       => 'PF',
-                    amountoutstanding => $processfee,
-                    itemnumber        => $itemnumber,
-                    note              => $processingfeenote,
-                    manager_id        => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
-                    branchcode        => $branchcode,
+                    amount      => $processfee,
+                    description => $description,
+                    note        => $processingfeenote,
+                    user_id     => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+                    library_id  => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
+                    type        => 'processing',
+                    item_id     => $itemnumber,
+                    issue_id    => $issue_id,
                 }
-            )->store();
-
-            my $account_offset = Koha::Account::Offset->new(
-                {
-                    debit_id => $accountline->id,
-                    type     => 'Processing Fee',
-                    amount   => $accountline->amount,
-                }
-            )->store();
-
-            if ( C4::Context->preference("FinesLog") ) {
-                logaction("FINES", 'CREATE',$borrowernumber,Dumper({
-                    action            => 'create_fee',
-                    borrowernumber    => $accountline->borrowernumber,,
-                    accountno         => $accountline->accountno,
-                    amount            => $accountline->amount,
-                    description       => $accountline->description,
-                    accounttype       => $accountline->accounttype,
-                    amountoutstanding => $accountline->amountoutstanding,
-                    note              => $accountline->note,
-                    itemnumber        => $accountline->itemnumber,
-                    manager_id        => $accountline->manager_id,
-                }));
-            }
+            );
         }
         #add replace cost
         if ($replacementprice > 0){
-            my $accountline = Koha::Account::Line->new(
+            my $accountline = $account->add_debit(
                 {
-                    borrowernumber    => $borrowernumber,
-                    issue_id          => $issue_id,
-                    accountno         => getnextacctno($borrowernumber),
-                    date              => \'NOW()',
-                    amount            => $replacementprice,
-                    description       => $description,
-                    accounttype       => 'L',
-                    amountoutstanding => $replacementprice,
-                    itemnumber        => $itemnumber,
-                    manager_id        => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
-                    branchcode        => $branchcode,
+                    amount      => $replacementprice,
+                    description => $description,
+                    note        => undef,
+                    user_id     => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+                    library_id  => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
+                    type        => 'lost_item',
+                    item_id     => $itemnumber,
+                    issue_id    => $issue_id,
                 }
-            )->store();
-
-            my $account_offset = Koha::Account::Offset->new(
-                {
-                    debit_id => $accountline->id,
-                    type     => 'Lost Item',
-                    amount   => $accountline->amount,
-                }
-            )->store();
-
-            if ( C4::Context->preference("FinesLog") ) {
-                logaction("FINES", 'CREATE',$borrowernumber,Dumper({
-                    action            => 'create_fee',
-                    borrowernumber    => $accountline->borrowernumber,,
-                    accountno         => $accountline->accountno,
-                    amount            => $accountline->amount,
-                    description       => $accountline->description,
-                    accounttype       => $accountline->accounttype,
-                    amountoutstanding => $accountline->amountoutstanding,
-                    note              => $accountline->note,
-                    itemnumber        => $accountline->itemnumber,
-                    manager_id        => $accountline->manager_id,
-                }));
-            }
+            );
         }
     }
 }
@@ -216,29 +161,15 @@ sub chargelostitem{
   &manualinvoice($borrowernumber, $itemnumber, $description, $type,
                  $amount, $note);
 
-C<$borrowernumber> is the patron's borrower number.
-C<$description> is a description of the transaction.
-C<$type> may be one of C<CS>, C<CB>, C<CW>, C<CF>, C<CL>, C<N>, C<L>,
-or C<REF>.
-C<$itemnumber> is the item involved, if pertinent; otherwise, it
-should be the empty string.
+This function is now deprecated and not used anywhere within koha. It is due for complete removal in 19.11
 
 =cut
 
-#'
-# FIXME: In Koha 3.0 , the only account adjustment 'types' passed to this function
-# are:
-#              'C' = CREDIT
-#              'FOR' = FORGIVEN  (Formerly 'F', but 'F' is taken to mean 'FINE' elsewhere)
-#              'N' = New Card fee
-#              'F' = Fine
-#              'A' = Account Management fee
-#              'M' = Sundry
-#              'L' = Lost Item
-#
-
 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 = 0;
     $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
     my $dbh      = C4::Context->dbh;