[Koha-cvs] koha/C4 Accounts2.pm

[Chris Cormack]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         
Changes by:     Chris Cormack <address@hidden>  06/05/21 06:03:32

Modified files:
        C4             : Accounts2.pm 

Log message:
        Merging from dev_week

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Accounts2.pm.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: koha/C4/Accounts2.pm
diff -u koha/C4/Accounts2.pm:1.28 koha/C4/Accounts2.pm:1.29
--- koha/C4/Accounts2.pm:1.28   Tue Jan 17 16:06:43 2006
+++ koha/C4/Accounts2.pm        Sun May 21 06:03:32 2006
@@ -18,6 +18,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+# $Id: Accounts2.pm,v 1.29 2006/05/21 06:03:32 rangi Exp $
 use strict;
 require Exporter;
 use DBI;
@@ -28,8 +29,7 @@
 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: 1.29 $' =~ /\d+/g;
 
 =head1 NAME
 
@@ -344,11 +344,6 @@
     $amountleft=refund('',$bornum,$amount);
   }
   if ($itemnum ne ''){
-#FIXME to use ? before uncommenting
-#     my $sth=$dbh->prepare("Select * from items where barcode='$itemnum'");
-#     $sth->execute;
-#     my $data=$sth->fetchrow_hashref;
-#     $sth->finish;
     $desc.=" ".$itemnum;
     my $sth=$dbh->prepare("INSERT INTO  accountlines
                         (borrowernumber, accountno, date, amount, description, 
accounttype, amountoutstanding, itemnumber)
@@ -356,10 +351,9 @@
 #     $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, 
$data->{'itemnumber'});
      $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, 
$itemnum);
   } else {
-    $desc=$dbh->quote($desc);
-    my $sth=$dbh->prepare("INSERT INTO  accountlines
-                        (borrowernumber, accountno, date, amount, description, 
accounttype, amountoutstanding)
-                        VALUES (?, ?, now(), ?, ?, ?, ?)");
+    my $sth=$dbh->prepare("INSERT INTO accountlines
+                       (borrowernumber, accountno, date, amount, description, 
accounttype, amountoutstanding)
+                       VALUES (?, ?, now(), ?, ?, ?, ?)");
     $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft);
   }
 }