[Koha-cvs] CVS: koha/C4 Acquisitions.pm,1.5.2.4,1.5.2.5

[Alan Millar]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv20208

Modified Files:
      Tag: rel-1-2
	Acquisitions.pm 
Log Message:
Fix biblioitems columns, minor bugfixes


Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -C2 -r1.5.2.4 -r1.5.2.5
*** Acquisitions.pm	29 May 2002 14:52:02 -0000	1.5.2.4
--- Acquisitions.pm	29 May 2002 14:59:11 -0000	1.5.2.5
***************
*** 5,9 ****
  use C4::Database;
  use warnings;
! use vars qw($VERSION @ISA @EXPORT);
  
  # set the version for version checking
--- 5,9 ----
  use C4::Database;
  use warnings;
! use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
  
  # set the version for version checking
***************
*** 790,793 ****
--- 790,794 ----
  sub curconvert {
    my ($currency,$price)=@_;
+   my $convertedprice;
    my $dbh=C4Connect;
    my $query="Select rate from currency where currency='$currency'";
***************
*** 801,806 ****
      $cur=1;
    }
!   my $price=$price / $cur;
!   return($price);
  }
  
--- 802,807 ----
      $cur=1;
    }
!   $convertedprice=$price / $cur;
!   return($convertedprice);
  }
  
***************
*** 915,926 ****
  booksellerid         = $item->{'booksellerid'},
  dateaccessioned      = NOW(),
! homebranch           = $item->{'branch'},
! holdingbranch        = $item->{'branch'},
  price                = $item->{'price'},
  replacementprice     = $item->{'replacementprice'},
  replacementpricedate = NOW(),
- notforloan           = $item->{'loan'},
  itemnotes            = $item->{'itemnotes'}";
  
      $sth = $dbh->prepare($query);
      $sth->execute;
--- 916,931 ----
  booksellerid         = $item->{'booksellerid'},
  dateaccessioned      = NOW(),
! homebranch           = $item->{'homebranch'},
! holdingbranch        = $item->{'homebranch'},
  price                = $item->{'price'},
  replacementprice     = $item->{'replacementprice'},
  replacementpricedate = NOW(),
  itemnotes            = $item->{'itemnotes'}";
  
+     if ($item->{'loan'}) {
+       $query .= ",
+ notforloan           = $item->{'loan'}";
+     } # if
+ 
      $sth = $dbh->prepare($query);
      $sth->execute;
***************
*** 1127,1131 ****
      # || die "Cannot execute $query\n" . $sth->errstr;
    while (my $data = $sth->fetchrow_hashref) {
!     @results[$count] = $data;
      $count++;
    } # while
--- 1132,1136 ----
      # || die "Cannot execute $query\n" . $sth->errstr;
    while (my $data = $sth->fetchrow_hashref) {
!     $results[$count] = $data;
      $count++;
    } # while