From 5285bb04fe3484a01e2d760a9ce526b3b53dc034 Mon Sep 17 00:00:00 2001
From: Andrew Moore <andrew.moore@liblime.com>
Date: Thu, 20 Mar 2008 17:32:12 -0500
Subject: [PATCH] bug: 1953. using placeholders in C4::Acquisition::NewOrder.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 C4/Acquisition.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 78382d259a..62c89c0503 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -403,18 +403,18 @@ sub NewOrder {
     my $month = localtime->mon() + 1;       # months starts at 0, add 1
 
     if ( !$budget || $budget eq 'now' ) {
-        $budget = "now()";
+        $budget = undef;
     }
 
     # if month is july or more, budget start is 1 jul, next year.
     elsif ( $month >= '7' ) {
         ++$year;                            # add 1 to year , coz its next year
-        $budget = "'$year-07-01'";
+        $budget = "$year-07-01";
     }
     else {
 
         # START OF NEW BUDGET, 1ST OF JULY, THIS YEAR
-        $budget = "'$year-07-01'";
+        $budget = "$year-07-01";
     }
 
     if ( $sub eq 'yes' ) {
@@ -434,14 +434,14 @@ sub NewOrder {
         INSERT INTO aqorders
            ( biblionumber,title,basketno,quantity,listprice,notes,
            biblioitemnumber,rrp,ecost,gst,unitprice,subscription,sort1,sort2,budgetdate,entrydate,purchaseordernumber)
-        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,$budget,now(),? )
+        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,COALESCE(?,NOW()),NOW(),? )
     ";
     my $sth = $dbh->prepare($query);
 
     $sth->execute(
         $bibnum, $title,      $basketno, $quantity, $listprice,
         $notes,  $bibitemnum, $rrp,      $ecost,    $gst,
-        $cost,   $sub,        $sort1,    $sort2,	$purchaseorder
+        $cost,   $sub,        $sort1,    $sort2,    $budget,    $purchaseorder
     );
     $sth->finish;
 
-- 
2.39.5