From 4e50ef0fbd9ee4510d762700cb78d7742bd6443a Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 22 Mar 2013 03:35:41 -0700
Subject: [PATCH] Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup

---
 C4/Reserves.pm           |    3 +--
 t/db_dependent/Budgets.t |    7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index b1b1175..e254d64 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -257,7 +257,6 @@ sub GetReservesFromBiblionumber {
     my ($biblionumber) = shift or return (0, []);
     my ($all_dates) = shift;
     my ($itemnumber) = shift;
-    warn "ITEMNUMBER: $itemnumber";
     my $dbh   = C4::Context->dbh;
 
     # Find the desired items in the reserves
@@ -281,7 +280,7 @@ sub GetReservesFromBiblionumber {
         WHERE biblionumber = ? ";
     push( @params, $biblionumber );
     unless ( $all_dates ) {
-        $query .= " AND reservedate <= CURRENT_DATE() ";
+        $query .= " AND reservedate <= CAST(NOW() AS DATE) ";
     }
     if ( $itemnumber ) {
         $query .= " AND ( itemnumber IS NULL OR itemnumber = ? )";
diff --git a/t/db_dependent/Budgets.t b/t/db_dependent/Budgets.t
index 6ec8b57..25d8d3b 100755
--- a/t/db_dependent/Budgets.t
+++ b/t/db_dependent/Budgets.t
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More tests=>17;
+use Test::More tests=>18;
 
 BEGIN {use_ok('C4::Budgets') }
 use C4::Budgets;
@@ -86,6 +86,10 @@ ok($budget_id=AddBudget(
 #| budget_owner_id        | int(11)       | YES  |     | NULL              |       | 
 #| budget_permission      | int(1)        | YES  |     | 0                 |       | 
 
+C4::Context::dbh->do('INSERT INTO aqorders ( ordernumber, budget_id ) VALUES ( 987654321, ? )', {}, ( $budget_id ) );
+ok( GetBudgetByOrderNumber( '987654321' )->{'budget_id'} eq $budget_id, "GetBudgetByOrderNumber returns valid data" );
+C4::Context::dbh->do('DELETE FROM aqorders WHERE ordernumber = 987654321');
+
 my $budget;
 ok($budget=GetBudget($budget_id) ,"GetBudget OK");
 $$budget{budget_permission}=1;
@@ -102,4 +106,3 @@ ok(GetBudgets({budget_period_id=>GetBudgetPeriod($bpid)->{budget_period_id}},[{"
 ok($del_status=DelBudget($budget_id),
 	"DelBudget returned $del_status");
 
-
-- 
1.7.2.5