Bug 21829: Correctly format dateexpiry in notices (date only)
[koha.git] / C4 / Accounts.pm
index 1adf8d4..d2c597a 100644 (file)
@@ -23,7 +23,6 @@ use strict;
 use C4::Context;
 use C4::Stats;
 use C4::Members;
-use C4::Circulation qw(ReturnLostItem);
 use C4::Log qw(logaction);
 use Koha::Account;
 use Koha::Account::Lines;
@@ -40,12 +39,7 @@ BEGIN {
     @EXPORT = qw(
       &manualinvoice
       &getnextacctno
-      &getcharges
-      &ModNote
-      &getcredits
-      &getrefunds
       &chargelostitem
-      &ReversePayment
       &purge_zero_balance_fees
     );
 }
@@ -89,37 +83,6 @@ sub getnextacctno {
     return ($sth->fetchrow || 1);
 }
 
-=head2 fixaccounts (removed)
-
-  &fixaccounts($accountlines_id, $borrowernumber, $accountnumber, $amount);
-
-#'
-# FIXME - I don't understand what this function does.
-sub fixaccounts {
-    my ( $accountlines_id, $borrowernumber, $accountno, $amount ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare(
-        "SELECT * FROM accountlines WHERE accountlines_id=?"
-    );
-    $sth->execute( $accountlines_id );
-    my $data = $sth->fetchrow_hashref;
-
-    # FIXME - Error-checking
-    my $diff        = $amount - $data->{'amount'};
-    my $outstanding = $data->{'amountoutstanding'} + $diff;
-    $sth->finish;
-
-    $dbh->do(<<EOT);
-        UPDATE  accountlines
-        SET     amount = '$amount',
-                amountoutstanding = '$outstanding'
-        WHERE   accountlines_id = $accountlines_id
-EOT
-       # FIXME: exceedingly bad form.  Use prepare with placholders ("?") in query and execute args.
-}
-
-=cut
-
 =head2 chargelostitem
 
 In a default install of Koha the following lost values are set
@@ -144,6 +107,9 @@ sub chargelostitem{
     if ($usedefaultreplacementcost && $amount == 0 && $defaultreplacecost){
         $replacementprice = $defaultreplacecost;
     }
+
+    my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+
     # 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
@@ -157,11 +123,14 @@ sub chargelostitem{
 
     # OK, they haven't
     unless ($existing_charges) {
+        my $checkout = Koha::Checkouts->find({ itemnumber => $itemnumber });
+        my $issue_id = $checkout ? $checkout->issue_id : undef;
         #add processing fee
         if ($processfee && $processfee > 0){
             my $accountline = Koha::Account::Line->new(
                 {
                     borrowernumber    => $borrowernumber,
+                    issue_id          => $issue_id,
                     accountno         => getnextacctno($borrowernumber),
                     date              => \'NOW()',
                     amount            => $processfee,
@@ -171,6 +140,7 @@ sub chargelostitem{
                     itemnumber        => $itemnumber,
                     note              => $processingfeenote,
                     manager_id        => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+                    branchcode        => $branchcode,
                 }
             )->store();
 
@@ -202,6 +172,7 @@ sub chargelostitem{
             my $accountline = Koha::Account::Line->new(
                 {
                     borrowernumber    => $borrowernumber,
+                    issue_id          => $issue_id,
                     accountno         => getnextacctno($borrowernumber),
                     date              => \'NOW()',
                     amount            => $replacementprice,
@@ -210,6 +181,7 @@ sub chargelostitem{
                     amountoutstanding => $replacementprice,
                     itemnumber        => $itemnumber,
                     manager_id        => C4::Context->userenv ? C4::Context->userenv->{'number'} : 0,
+                    branchcode        => $branchcode,
                 }
             )->store();
 
@@ -274,6 +246,8 @@ sub manualinvoice {
     my $accountno  = getnextacctno($borrowernumber);
     my $amountleft = $amount;
 
+    my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+
     my $accountline = Koha::Account::Line->new(
         {
             borrowernumber    => $borrowernumber,
@@ -286,6 +260,7 @@ sub manualinvoice {
             itemnumber        => $itemnum || undef,
             note              => $note,
             manager_id        => $manager_id,
+            branchcode        => $branchcode,
         }
     )->store();
 
@@ -315,117 +290,6 @@ sub manualinvoice {
     return 0;
 }
 
-sub getcharges {
-    my ( $borrowerno, $timestamp, $accountno ) = @_;
-    my $dbh        = C4::Context->dbh;
-    my $timestamp2 = $timestamp - 1;
-    my $query      = "";
-    my $sth = $dbh->prepare(
-            "SELECT * FROM accountlines WHERE borrowernumber=? AND accountno = ?"
-          );
-    $sth->execute( $borrowerno, $accountno );
-
-    my @results;
-    while ( my $data = $sth->fetchrow_hashref ) {
-        push @results,$data;
-    }
-    return (@results);
-}
-
-sub ModNote {
-    my ( $accountlines_id, $note ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare('UPDATE accountlines SET note = ? WHERE accountlines_id = ?');
-    $sth->execute( $note, $accountlines_id );
-}
-
-sub getcredits {
-       my ( $date, $date2 ) = @_;
-       my $dbh = C4::Context->dbh;
-       my $sth = $dbh->prepare(
-                               "SELECT * FROM accountlines,borrowers
-      WHERE amount < 0 AND accounttype not like 'Pay%' AND accountlines.borrowernumber = borrowers.borrowernumber
-         AND timestamp >=TIMESTAMP(?) AND timestamp < TIMESTAMP(?)"
-      );  
-
-    $sth->execute( $date, $date2 );
-    my @results;          
-    while ( my $data = $sth->fetchrow_hashref ) {
-               $data->{'date'} = $data->{'timestamp'};
-               push @results,$data;
-       }
-    return (@results);
-} 
-
-
-sub getrefunds {
-       my ( $date, $date2 ) = @_;
-       my $dbh = C4::Context->dbh;
-       
-       my $sth = $dbh->prepare(
-                               "SELECT *,timestamp AS datetime                                                                                      
-                  FROM accountlines,borrowers
-                  WHERE (accounttype = 'REF'
-                                         AND accountlines.borrowernumber = borrowers.borrowernumber
-                                                         AND date  >=?  AND date  <?)"
-    );
-
-    $sth->execute( $date, $date2 );
-
-    my @results;
-    while ( my $data = $sth->fetchrow_hashref ) {
-               push @results,$data;
-               
-       }
-    return (@results);
-}
-
-#FIXME: ReversePayment should be replaced with a Void Payment feature
-sub ReversePayment {
-    my ($accountlines_id) = @_;
-    my $dbh = C4::Context->dbh;
-
-    my $accountline        = Koha::Account::Lines->find($accountlines_id);
-    my $amount_outstanding = $accountline->amountoutstanding;
-
-    my $new_amountoutstanding =
-      $amount_outstanding <= 0 ? $accountline->amount * -1 : 0;
-
-    $accountline->description( $accountline->description . " Reversed -" );
-    $accountline->amountoutstanding($new_amountoutstanding);
-    $accountline->store();
-
-    my $account_offset = Koha::Account::Offset->new(
-        {
-            credit_id => $accountline->id,
-            type      => 'Reverse Payment',
-            amount    => $amount_outstanding - $new_amountoutstanding,
-        }
-    )->store();
-
-    if ( C4::Context->preference("FinesLog") ) {
-        my $manager_id = 0;
-        $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
-
-        logaction(
-            "FINES", 'MODIFY',
-            $accountline->borrowernumber,
-            Dumper(
-                {
-                    action                => 'reverse_fee_payment',
-                    borrowernumber        => $accountline->borrowernumber,
-                    old_amountoutstanding => $amount_outstanding,
-                    new_amountoutstanding => $new_amountoutstanding,
-                    ,
-                    accountlines_id => $accountline->id,
-                    accountno       => $accountline->accountno,
-                    manager_id      => $manager_id,
-                }
-            )
-        );
-    }
-}
-
 =head2 purge_zero_balance_fees
 
   purge_zero_balance_fees( $days );