From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Thu, 6 May 2010 23:24:23 +0000 (+1200)
Subject: wr-70205 Rental discount not being respected
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=92f35aee3b05596077a003fb449a88f1e5e819db;p=koha.git

wr-70205 Rental discount not being respected

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 395494fb32..e270b56356 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -2288,7 +2288,7 @@ sub GetIssuingCharges {
         my $q2 = "SELECT rentaldiscount FROM borrowers
             LEFT JOIN issuingrules ON borrowers.categorycode = issuingrules.categorycode
             WHERE borrowers.borrowernumber = ?
-            AND issuingrules.itemtype = ?";
+            AND (issuingrules.itemtype = ? OR issuingrules.itemtype = '*')";
         my $sth2 = $dbh->prepare($q2);
         $sth2->execute( $borrowernumber, $item_type );
         if ( my $data2 = $sth2->fetchrow_hashref ) {