rel_3_0 moved to HEAD
[koha.git] / C4 / Accounts2.pm
index a6d5286..94255ca 100755 (executable)
@@ -18,18 +18,19 @@ package C4::Accounts2; #assumes C4/Accounts2
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+# $Id$
+
 use strict;
 require Exporter;
 use C4::Context;
 use C4::Stats;
-use C4::Search;
-use C4::Circulation::Circ2;
 use C4::Members;
+#use C4::Circulation::Circ2;
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = 0.01;       # FIXME - Should probably be different from
-                       # the version for C4::Accounts
+$VERSION = do { my @v = '$Revision$' =~ /\d+/g; 
+shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
 
@@ -47,17 +48,13 @@ patron.
 
 =head1 FUNCTIONS
 
-=over 2
-
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw(&checkaccount     &recordpayment &fixaccounts &makepayment &manualinvoice
-                               &getnextacctno &manualcredit
-                               
-                               &dailyAccountBalance &addDailyAccountOp &getDailyAccountOp);
+@EXPORT = qw(&checkaccount &recordpayment &fixaccounts &makepayment &manualinvoice
+&getnextacctno &reconcileaccount);
 
-=item checkaccount
+=head2 checkaccount
 
   $owed = &checkaccount($env, $borrowernumber, $dbh, $date);
 
@@ -70,17 +67,18 @@ C<$dbh> is a DBI::db handle for the Koha database.
 C<$env> is ignored.
 
 =cut
+
 #'
 sub checkaccount  {
   #take borrower number
   #check accounts and list amounts owing
-       my ($env,$bornumber,$dbh,$date)=@_;
+       my ($env,$borrowernumber,$dbh,$date)=@_;
        my $select="SELECT SUM(amountoutstanding) AS total
                        FROM accountlines
                WHERE borrowernumber = ?
                        AND amountoutstanding<>0";
-       my @bind = ($bornumber);
-       if ($date ne ''){
+       my @bind = ($borrowernumber);
+       if ($date && $date ne ''){
        $select.=" AND date < ?";
        push(@bind,$date);
        }
@@ -88,20 +86,20 @@ sub checkaccount  {
        my $sth=$dbh->prepare($select);
        $sth->execute(@bind);
        my $data=$sth->fetchrow_hashref;
-       my $total = $data->{'total'};
+       my $total = $data->{'total'} || 0;
        $sth->finish;
        # output(1,2,"borrower owes $total");
        #if ($total > 0){
        #  # output(1,2,"borrower owes $total");
        #  if ($total > 5){
-       #    reconcileaccount($env,$dbh,$bornumber,$total);
+       #    reconcileaccount($env,$dbh,$borrowernumber,$total);
        #  }
        #}
        #  pause();
        return($total);
 }
 
-=item recordpayment
+=head2 recordpayment
 
   &recordpayment($env, $borrowernumber, $payment);
 
@@ -117,130 +115,125 @@ of $1.50, then the oldest fine will be paid off in full, and $0.50
 will be credited to the next one.
 
 =cut
+
 #'
 sub recordpayment{
   #here we update both the accountoffsets and the account lines
-  my ($env,$bornumber,$data)=@_;
+  my ($env,$borrowernumber,$data)=@_;
   my $dbh = C4::Context->dbh;
   my $newamtos = 0;
   my $accdata = "";
   my $branch=$env->{'branchcode'};
+    warn $branch;
   my $amountleft = $data;
   # begin transaction
-  my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
+  my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
   # get lines with outstanding amounts to offset
   my $sth = $dbh->prepare("select * from accountlines
   where (borrowernumber = ?) and (amountoutstanding<>0)
   order by date");
-  $sth->execute($bornumber);
+  $sth->execute($borrowernumber);
   # offset transactions
   while (($accdata=$sth->fetchrow_hashref) and ($amountleft>0)){
      if ($accdata->{'amountoutstanding'} < $amountleft) {
         $newamtos = 0;
-       $amountleft -= $accdata->{'amountoutstanding'};
+        $amountleft -= $accdata->{'amountoutstanding'};
      }  else {
         $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
-       $amountleft = 0;
+        $amountleft = 0;
      }
-     my $thisacct = $accdata->{accountid};
+     my $thisacct = $accdata->{accountno};
      my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
-     where accountid=?");
-     $usth->execute($newamtos,$thisacct);
+     where (borrowernumber = ?) and (accountno=?)");
+     $usth->execute($newamtos,$borrowernumber,$thisacct);
+     $usth->finish;
+     $usth = $dbh->prepare("insert into accountoffsets
+     (borrowernumber, accountno, offsetaccount,  offsetamount)
+     values (?,?,?,?)");
+     $usth->execute($borrowernumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
      $usth->finish;
   }
   # create new line
   my $usth = $dbh->prepare("insert into accountlines
   (borrowernumber, accountno,date,amount,description,accounttype,amountoutstanding)
   values (?,?,now(),?,'Payment,thanks','Pay',?)");
-  $usth->execute($bornumber,$nextaccntno,0-$data,0-$amountleft);
+  $usth->execute($borrowernumber,$nextaccntno,0-$data,0-$amountleft);
   $usth->finish;
-#  UpdateStats($env,$branch,'payment',$data,'','','',$bornumber);
+  UpdateStats($env,$branch,'payment',$data,'','','',$borrowernumber);
   $sth->finish;
 }
 
-=item makepayment
+=head2 makepayment
 
   &makepayment($borrowernumber, $acctnumber, $amount, $branchcode);
 
-Records the fact that a patron has paid off the an amount he or
+Records the fact that a patron has paid off the entire amount he or
 she owes.
 
 C<$borrowernumber> is the patron's borrower number. C<$acctnumber> is
 the account that was credited. C<$amount> is the amount paid (this is
-only used to record the payment. C<$branchcode> is the code of the branch where payment
+only used to record the payment. It is assumed to be equal to the
+amount owed). C<$branchcode> is the code of the branch where payment
 was made.
 
 =cut
+
 #'
 # FIXME - I'm not at all sure about the above, because I don't
 # understand what the acct* tables in the Koha database are for.
-
 sub makepayment{
-  #here we update  the account lines
+  #here we update both the accountoffsets and the account lines
   #updated to check, if they are paying off a lost item, we return the item
   # from their card, and put a note on the item record
-  my ($bornumber,$accountno,$amount,$user,$type)=@_;
-  my $env;
-my $desc;
-my $pay;
-if ($type eq "Pay"){
- $desc="Payment,received by -". $user;
- $pay="Pay";
-}else{
- $desc="Written-off -by". $user;
- $pay="W";
-}
+  my ($borrowernumber,$accountno,$amount,$user,$branch)=@_;
+  my %env;
+  $env{'branchcode'}=$branch;
   my $dbh = C4::Context->dbh;
   # begin transaction
-  my $nextaccntno = getnextacctno($env,$bornumber,$dbh);
+  my $nextaccntno = getnextacctno(\%env,$borrowernumber,$dbh);
   my $newamtos=0;
   my $sth=$dbh->prepare("Select * from accountlines where  borrowernumber=? and accountno=?");
-  $sth->execute($bornumber,$accountno);
+  $sth->execute($borrowernumber,$accountno);
   my $data=$sth->fetchrow_hashref;
   $sth->finish;
 
   $dbh->do(<<EOT);
-       UPDATE  accountlines
-       SET     amountoutstanding = amountoutstanding-$amount
-       WHERE   borrowernumber = $bornumber
-         AND   accountno = $accountno
+        UPDATE  accountlines
+        SET     amountoutstanding = 0
+        WHERE   borrowernumber = $borrowernumber
+          AND   accountno = $accountno
 EOT
 
-
+#  print $updquery;
+  $dbh->do(<<EOT);
+        INSERT INTO     accountoffsets
+                        (borrowernumber, accountno, offsetaccount,
+                         offsetamount)
+        VALUES          ($borrowernumber, $accountno, $nextaccntno, $newamtos)
+EOT
 
   # create new line
   my $payment=0-$amount;
-if ($data->{'itemnumber'}){
-$desc.=" ".$data->{'itemnumber'};
-
   $dbh->do(<<EOT);
-       INSERT INTO     accountlines
-                       (borrowernumber, accountno, itemnumber,date, amount,
-                        description, accounttype, amountoutstanding,offset)
-       VALUES          ($bornumber, $nextaccntno, $data->{'itemnumber'},now(), $payment,
-                       '$desc', '$pay', 0,$accountno)
+        INSERT INTO     accountlines
+                        (borrowernumber, accountno, date, amount,
+                         description, accounttype, amountoutstanding)
+        VALUES          ($borrowernumber, $nextaccntno, now(), $payment,
+                        'Payment,thanks - $user', 'Pay', 0)
 EOT
-}else{
-  $dbh->do(<<EOT);
-INSERT INTO    accountlines
-                       (borrowernumber, accountno, date, amount,
-                        description, accounttype, amountoutstanding,offset)
-       VALUES          ($bornumber, $nextaccntno, now(), $payment,
-                       '$desc', '$pay', 0,$accountno)
-EOT
-}
 
   # FIXME - The second argument to &UpdateStats is supposed to be the
   # branch code.
-#  UpdateStats($env,'MAIN',$pay,$amount,'','','',$bornumber);
+  # UpdateStats is now being passed $accountno too. MTJ
+  UpdateStats(\%env,$user,'payment',$amount,'','','',$borrowernumber,$accountno);
   $sth->finish;
   #check to see what accounttype
   if ($data->{'accounttype'} eq 'Rep' || $data->{'accounttype'} eq 'L'){
-    returnlost($bornumber,$data->{'itemnumber'});
+    returnlost($borrowernumber,$data->{'itemnumber'});
   }
 }
 
-=item getnextacctno
+=head2 getnextacctno
 
   $nextacct = &getnextacctno($env, $borrowernumber, $dbh);
 
@@ -252,15 +245,16 @@ C<$dbh> is a DBI::db handle to the Koha database.
 C<$env> is ignored.
 
 =cut
+
 #'
 # FIXME - Okay, so what does the above actually _mean_?
 sub getnextacctno {
-  my ($env,$bornumber,$dbh)=@_;
+  my ($env,$borrowernumber,$dbh)=@_;
   my $nextaccntno = 1;
   my $sth = $dbh->prepare("select * from accountlines
   where (borrowernumber = ?)
   order by accountno desc");
-  $sth->execute($bornumber);
+  $sth->execute($borrowernumber);
   if (my $accdata=$sth->fetchrow_hashref){
     $nextaccntno = $accdata->{'accountno'} + 1;
   }
@@ -268,13 +262,14 @@ sub getnextacctno {
   return($nextaccntno);
 }
 
-=item fixaccounts
+=head2 fixaccounts
 
   &fixaccounts($borrowernumber, $accountnumber, $amount);
 
 =cut
+
 #'
-# FIXME - I don't know whether used
+# FIXME - I don't understand what this function does.
 sub fixaccounts {
   my ($borrowernumber,$accountno,$amount)=@_;
   my $dbh = C4::Context->dbh;
@@ -282,168 +277,206 @@ sub fixaccounts {
      and accountno=?");
   $sth->execute($borrowernumber,$accountno);
   my $data=$sth->fetchrow_hashref;
-       # FIXME - Error-checking
+        # 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   borrowernumber = $borrowernumber
-         AND   accountno = $accountno
+        UPDATE  accountlines
+        SET     amount = '$amount',
+                amountoutstanding = '$outstanding'
+        WHERE   borrowernumber = $borrowernumber
+          AND   accountno = $accountno
 EOT
  }
 
 # FIXME - Never used, but not exported, either.
 sub returnlost{
-  my ($borrnum,$itemnum)=@_;
+  my ($borrowernumber,$itemnum)=@_;
   my $dbh = C4::Context->dbh;
-  my $borrower=C4::Members::borrdata('',$borrnum); #from C4::Members;
+  my $borrower=borrdata('',$borrowernumber);
   my $sth=$dbh->prepare("Update issues set returndate=now() where
   borrowernumber=? and itemnumber=? and returndate is null");
-  $sth->execute($borrnum,$itemnum);
+  $sth->execute($borrowernumber,$itemnum);
+  $sth->finish;
+  my @datearr = localtime(time);
+  my $date = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
+  my $bor="$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}";
+  $sth=$dbh->prepare("Update items set paidfor=? where itemnumber=?");
+  $sth->execute("Paid for by $bor $date",$itemnum);
   $sth->finish;
 }
 
-=item manualinvoice
+=head2 manualinvoice
 
-  &manualinvoice($borrowernumber, $description, $type,
+  &manualinvoice($borrowernumber, $itemnumber, $description, $type,
                  $amount, $user);
 
 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.
 
 =cut
-#'
 
+#'
+# FIXME - Okay, so what does this function do, really?
 sub manualinvoice{
-  my ($bornum,$desc,$type,$amount,$user)=@_;
+  my ($borrowernumber,$itemnum,$desc,$type,$amount,$user)=@_;
   my $dbh = C4::Context->dbh;
+  my $notifyid;
   my $insert;
+  $itemnum=~ s/ //g;
   my %env;
-  my $accountno=getnextacctno('',$bornum,$dbh);
+  my $accountno=getnextacctno('',$borrowernumber,$dbh);
   my $amountleft=$amount;
 
-
+  if ($type eq 'CS' || $type eq 'CB' || $type eq 'CW'
+  || $type eq 'CF' || $type eq 'CL'){
+    my $amount2=$amount*-1;     # FIXME - $amount2 = -$amount
+    $amountleft=fixcredit(\%env,$borrowernumber,$amount2,$itemnum,$type,$user);
+  }
   if ($type eq 'N'){
     $desc.="New Card";
   }
-
+  if ($type eq 'F'){
+    $desc.="Fine";
+  }
+  if ($type eq 'A'){
+    $desc.="Account Management fee";
+  }
+  if ($type eq 'M'){
+    $desc.="Sundry";
+  }            
+               
   if ($type eq 'L' && $desc eq ''){
+    
     $desc="Lost Item";
   }
- if ($type eq 'REF'){
- $desc="Cash refund";
+  if ($type eq 'REF'){
+       $desc.="Cash Refund";    
+       $amountleft=refund('',$borrowernumber,$amount);
   }
- $amountleft=refund('',$bornum,$amount);
-    my $sth=$dbh->prepare("INSERT INTO accountlines
-                       (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding)
-                       VALUES (?, ?, now(), ?, ?, ?, ?)");
-    $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft);
-  
-}
-
-sub manualcredit{
-  my ($bornum,$accountid,$desc,$type,$amount,$user,$oldaccount)=@_;
-  my $dbh = C4::Context->dbh;
-  my $insert;
-  my $accountno=getnextacctno('',$bornum,$dbh);
-#  my $amountleft=$amount;
-my $amountleft;
-my $noerror;
-  if ($type eq 'CN' || $type eq 'CA'  || $type eq 'CR' 
-  || $type eq 'CF' || $type eq 'CL' || $type eq 'CM'){
-    my $amount2=$amount*-1;    
-   ( $amountleft, $noerror,$oldaccount)=fixcredit($dbh,$bornum,$amount2,$accountid,$type,$user);
+  if(($type eq 'L') or ($type eq 'F') or ($type eq 'A') or ($type eq 'N') or ($type eq 'M') ){
+  $notifyid=1; 
   }
- if ($noerror>0){
-       
-## find the accountline desc
-my $sth2=$dbh->prepare("select description from accountlines where accountid=?");
-$sth2->execute($accountid);
-my $desc2=$sth2->fetchrow;
-$desc.=" Credited for ".$desc2." by ".$user;
-$sth2->finish;
-
-        my $sth=$dbh->prepare("INSERT INTO     accountlines
-                       (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,offset)
+       
+  if ($itemnum ne ''){
+    $desc.=" ".$itemnum;
+    my $sth=$dbh->prepare("INSERT INTO  accountlines
+                        (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding, itemnumber,notify_id)
+        VALUES (?, ?, now(), ?,?, ?,?,?,?)");
+#     $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $data->{'itemnumber'});
+     $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft, $itemnum,$notifyid);
+  } else {
+    my $sth=$dbh->prepare("INSERT INTO accountlines
+                       (borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding,notify_id)
                        VALUES (?, ?, now(), ?, ?, ?, ?,?)");
-       $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft,$oldaccount);
-       
-return ("0");
-} else {
-       return("1");
-}
+    $sth->execute($borrowernumber, $accountno, $amount, $desc, $type, $amountleft,$notifyid);
+  }
 }
-# fixcredit
+
+=head2 fixcredit
+
+ $amountleft = &fixcredit($env, $borrowernumber, $data, $barcode, $type, $user);
+
+ This function is only used internally, not exported.
+ FIXME - Figure out what this function does, and write it down.
+
+=cut
+
 sub fixcredit{
   #here we update both the accountoffsets and the account lines
-  my ($dbh,$bornumber,$data,$accountid,$type,$user)=@_;
+  my ($env,$borrowernumber,$data,$barcode,$type,$user)=@_;
+  my $dbh = C4::Context->dbh;
   my $newamtos = 0;
   my $accdata = "";
   my $amountleft = $data;
- my $env;
-    my $query="Select * from accountlines where accountid=? and amountoutstanding > 0";
- my $sth=$dbh->prepare($query);
-$sth->execute($accountid);
+  if ($barcode ne ''){
+    my $item=getiteminformation('',$barcode);
+    my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
+    my $query="Select * from accountlines where (borrowernumber=?
+    and itemnumber=? and amountoutstanding > 0)";
+    if ($type eq 'CL'){
+      $query.=" and (accounttype = 'L' or accounttype = 'Rep')";
+    } elsif ($type eq 'CF'){
+      $query.=" and (accounttype = 'F' or accounttype = 'FU' or
+      accounttype='Res' or accounttype='Rent')";
+    } elsif ($type eq 'CB'){
+      $query.=" and accounttype='A'";
+    }
+#    print $query;
+    my $sth=$dbh->prepare($query);
+    $sth->execute($borrowernumber,$item->{'itemnumber'});
     $accdata=$sth->fetchrow_hashref;
     $sth->finish;
-
-if ($accdata){
-         if ($accdata->{'amountoutstanding'} < $amountleft) {
-             $newamtos = 0;
-               $amountleft -= $accdata->{'amountoutstanding'};
-          }  else {
-             $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
-       $amountleft = 0;
-          }
-          my $thisacct = $accdata->{accountid};
+    if ($accdata->{'amountoutstanding'} < $amountleft) {
+        $newamtos = 0;
+        $amountleft -= $accdata->{'amountoutstanding'};
+     }  else {
+        $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
+        $amountleft = 0;
+     }
+          my $thisacct = $accdata->{accountno};
      my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
-     where accountid=?");
-     $usth->execute($newamtos,$thisacct);
+     where (borrowernumber = ?) and (accountno=?)");
+     $usth->execute($newamtos,$borrowernumber,$thisacct);
      $usth->finish;
-
+     $usth = $dbh->prepare("insert into accountoffsets
+     (borrowernumber, accountno, offsetaccount,  offsetamount)
+     values (?,?,?,?)");
+     $usth->execute($borrowernumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
+     $usth->finish;
+  }
   # begin transaction
+  my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
   # get lines with outstanding amounts to offset
   my $sth = $dbh->prepare("select * from accountlines
   where (borrowernumber = ?) and (amountoutstanding >0)
   order by date");
-  $sth->execute($bornumber);
+  $sth->execute($borrowernumber);
 #  print $query;
   # offset transactions
   while (($accdata=$sth->fetchrow_hashref) and ($amountleft>0)){
-        if ($accdata->{'amountoutstanding'} < $amountleft) {
-         $newamtos = 0;
-         $amountleft -= $accdata->{'amountoutstanding'};
-        }  else {
-         $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
-       $amountleft = 0;
-        }
-     my $thisacct = $accdata->{accountid};
+     if ($accdata->{'amountoutstanding'} < $amountleft) {
+        $newamtos = 0;
+        $amountleft -= $accdata->{'amountoutstanding'};
+     }  else {
+        $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
+        $amountleft = 0;
+     }
+     my $thisacct = $accdata->{accountno};
      my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
-     where accountid=?");
-     $usth->execute($newamtos,$thisacct);
+     where (borrowernumber = ?) and (accountno=?)");
+     $usth->execute($newamtos,$borrowernumber,$thisacct);
+     $usth->finish;
+     $usth = $dbh->prepare("insert into accountoffsets
+     (borrowernumber, accountno, offsetaccount,  offsetamount)
+     values (?,?,?,?)");
+     $usth->execute($borrowernumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
      $usth->finish;
-  }##  while account
+  }
   $sth->finish;
-
+  $env->{'branch'}=$user;
+  $type="Credit ".$type;
+  UpdateStats($env,$user,$type,$data,$user,'','',$borrowernumber);
   $amountleft*=-1;
-  return($amountleft,1,$accdata->{'accountno'});
-}else{
-return("",0);
-}
+  return($amountleft);
+
 }
 
+=head2 refund
+
+# FIXME - Figure out what this function does, and write it down.
+
+=cut 
 
-# 
 sub refund{
   #here we update both the accountoffsets and the account lines
-  my ($env,$bornumber,$data)=@_;
+  my ($env,$borrowernumber,$data)=@_;
   my $dbh = C4::Context->dbh;
   my $newamtos = 0;
   my $accdata = "";
@@ -451,143 +484,48 @@ sub refund{
   my $amountleft = $data *-1;
 
   # begin transaction
+  my $nextaccntno = getnextacctno($env,$borrowernumber,$dbh);
   # get lines with outstanding amounts to offset
   my $sth = $dbh->prepare("select * from accountlines
   where (borrowernumber = ?) and (amountoutstanding<0)
   order by date");
-  $sth->execute($bornumber);
+  $sth->execute($borrowernumber);
 #  print $amountleft;
   # offset transactions
   while (($accdata=$sth->fetchrow_hashref) and ($amountleft<0)){
      if ($accdata->{'amountoutstanding'} > $amountleft) {
         $newamtos = 0;
-       $amountleft -= $accdata->{'amountoutstanding'};
+        $amountleft -= $accdata->{'amountoutstanding'};
      }  else {
         $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
-       $amountleft = 0;
+        $amountleft = 0;
      }
 #     print $amountleft;
-     my $thisacct = $accdata->{accountid};
+     my $thisacct = $accdata->{accountno};
      my $usth = $dbh->prepare("update accountlines set amountoutstanding= ?
-     where accountid=?");
-     $usth->execute($newamtos,$thisacct);
+     where (borrowernumber = ?) and (accountno=?)");
+     $usth->execute($newamtos,$borrowernumber,$thisacct);
+     $usth->finish;
+     $usth = $dbh->prepare("insert into accountoffsets
+     (borrowernumber, accountno, offsetaccount,  offsetamount)
+     values (?,?,?,?)");
+     $usth->execute($borrowernumber,$accdata->{'accountno'},$nextaccntno,$newamtos);
      $usth->finish;
-
   }
   $sth->finish;
-  return($amountleft*-1);
+  return($amountleft);
 }
 
-#Funtion to manage the daily account#
-
-sub dailyAccountBalance {
-       my ($date) = @_;
-       my $dbh = C4::Context->dbh;
-       my $sth;
-       
-       if ($date) {
-
-               $sth = $dbh->prepare("SELECT * FROM dailyaccountbalance WHERE balanceDate = ?");
-               $sth->execute($date);
-               my $data = $sth->fetchrow_hashref;
-               if (!$data->{'balanceDate'}) {
-                       $data->{'noentry'} = 1;
-               }
-               return ($data);
-
-       } else {
-               
-               $sth = $dbh->prepare("SELECT * FROM dailyaccountbalance WHERE balanceDate = CURRENT_DATE()");
-               $sth->execute();
-       
-               if ($sth->rows) {
-                       return ($sth->fetchrow_hashref);        
-               } else  {
-                       my %hash;
-               
-                       $sth = $dbh->prepare("SELECT currentBalanceInHand FROM dailyaccountbalance ORDER BY balanceDate DESC LIMIT 1");
-                       $sth->execute();
-                       if ($sth->rows) {
-                               ($hash{'initialBalanceInHand'}) = $sth->fetchrow_array;
-                               $hash{'currentBalanceInHand'} = $hash{'initialBalanceInHand'};
-                       } else {
-                               $hash{'initialBalanceInHand'} = 0;
-                               $hash{'currentBalanceInHand'} = 0;
-                       }
-                       #gets the current date.
-                       my @nowarr = localtime();
-                       my $date = (1900+$nowarr[5])."-".($nowarr[4]+1)."-".$nowarr[3]; 
-
-                       $hash{'balanceDate'} = $date;
-                       $hash{'initialBalanceInHand'} = sprintf  ("%.2f", $hash{'initialBalanceInHand'});
-                       $hash{'currentBalanceInHand'} = sprintf  ("%.2f", $hash{'currentBalanceInHand'});
-                       return \%hash;
-               }
-
-       }
-}
-
-sub addDailyAccountOp {
-       my ($description, $amount, $type, $invoice) = @_;
-       my $dbh = C4::Context->dbh;
-       unless ($invoice) { $invoice = undef};
-       my $sth = $dbh->prepare("INSERT INTO dailyaccount (date, description, amount, type, invoice) VALUES (CURRENT_DATE(), ?, ?, ?, ?)");
-       $sth->execute($description, $amount, $type, $invoice);
-       my $accountop = $dbh->{'mysql_insertid'};
-       $sth = $dbh->prepare("SELECT * FROM dailyaccountbalance WHERE balanceDate = CURRENT_DATE()");
-       $sth->execute();
-       if (!$sth->rows) {
-               $sth = $dbh->prepare("SELECT currentBalanceInHand FROM dailyaccountbalance ORDER BY balanceDate DESC LIMIT 1");
-               $sth->execute();
-               my ($blc) = $sth->fetchrow_array;
-               unless ($blc) {$blc = 0}
-               $sth = $dbh->prepare("INSERT INTO dailyaccountbalance (balanceDate, initialBalanceInHand, currentBalanceInHand) VALUES (CURRENT_DATE(), ?, ?)");
-               $sth->execute($blc, $blc);
-       }
-       if ($type eq 'D') {
-               $amount = -1 * $amount;
-       } 
-       $sth = $dbh->prepare("UPDATE dailyaccountbalance SET currentBalanceInHand = currentBalanceInHand + ? WHERE balanceDate = CURRENT_DATE()");
-       $sth->execute($amount);
-       return $accountop; 
-}
-
-sub getDailyAccountOp {
-       my ($date) = @_;
-       my $dbh = C4::Context->dbh;
-       my $sth;
-       if ($date) {
-               $sth = $dbh->prepare("SELECT * FROM dailyaccount WHERE date = ?");
-               $sth->execute($date);   
-       } else {
-               $sth = $dbh->prepare("SELECT * FROM dailyaccount WHERE date = CURRENT_DATE()");
-               $sth->execute();
-       }
-       my @operations; 
-       my $count = 1;
-       while (my $row = $sth->fetchrow_hashref) {
-               $row->{'num'} = $count++; 
-               $row->{$row->{'type'}} = 1;
-               
-               $row->{'invoice'} =~ /(\w*)\-(\w*)\-(\w*)/; 
-               $row->{'invoiceNumber'} = $1;
-               $row->{'invoiceSupplier'} = $2;
-               $row->{'invoiceType'} = $3;
-                       
-               push @operations, $row;
-       }
-       return (scalar(@operations), \@operations);
-}
 
 END { }       # module clean-up code here (global destructor)
 
 1;
 __END__
 
-=back
 
 =head1 SEE ALSO
 
 DBI(3)
 
 =cut
+