From c709786efa962c317bdb1657e7899ebeecb61b9f Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Mon, 3 Sep 2012 17:03:09 +0200 Subject: [PATCH 1/2] Bug 7412 follow-up * DBRev number * removing useless `` in table name Signed-off-by: Paul Poulain --- installer/data/mysql/updatedatabase.pl | 2 +- kohaversion.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 03702bf61e..c6b6063091 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5675,7 +5675,7 @@ if(C4::Context->preference("Version") < TransformToNum($DBversion) ) { $DBversion = "3.09.00.035"; if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $dbh->do(" - INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PrefillItem','0','When a new item is added, should it be prefilled with last created item values?','','YesNo'); + INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('PrefillItem','0','When a new item is added, should it be prefilled with last created item values?','','YesNo'); "); $dbh->do( "INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free'); diff --git a/kohaversion.pl b/kohaversion.pl index b58966bac1..9b09a7e401 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts : use strict; sub kohaversion { - our $VERSION = '3.09.00.034'; + our $VERSION = '3.09.00.035'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install From a659d02dbe2e95659f8abcc5cdd985bbb89b89d3 Mon Sep 17 00:00:00 2001 From: Adrien Saurat Date: Fri, 1 Jun 2012 11:08:28 +0200 Subject: [PATCH 2/2] Bug 7241: fix for the CIRC logs -> itemnumber stored correctly Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain --- C4/Circulation.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 8647943265..0450e19817 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1129,7 +1129,7 @@ sub AddIssue { } } - logaction("CIRCULATION", "ISSUE", $borrower->{'borrowernumber'}, $biblio->{'biblionumber'}) + logaction("CIRCULATION", "ISSUE", $borrower->{'borrowernumber'}, $biblio->{'itemnumber'}) if C4::Context->preference("IssueLog"); } return ($datedue); # not necessarily the same as when it came in! @@ -1693,7 +1693,7 @@ sub AddReturn { }); } - logaction("CIRCULATION", "RETURN", $borrowernumber, $item->{'biblionumber'}) + logaction("CIRCULATION", "RETURN", $borrowernumber, $item->{'itemnumber'}) if C4::Context->preference("ReturnLog"); # FIXME: make this comment intelligible.