Merge branch 'bug_6428' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2012-11-09 20:37:26 -05:00
commit 25bc645c16
4 changed files with 13 additions and 1 deletions

View file

@ -440,6 +440,7 @@ my %default_values_for_mod_from_marc = (
booksellerid => undef,
ccode => undef,
'items.cn_source' => undef,
coded_location_qualifier => undef,
copynumber => undef,
damaged => 0,
# dateaccessioned => undef,
@ -2077,6 +2078,7 @@ sub _koha_new_item {
itemlost = ?,
wthdrawn = ?,
itemcallnumber = ?,
coded_location_qualifier = ?,
restricted = ?,
itemnotes = ?,
holdingbranch = ?,
@ -2118,6 +2120,7 @@ sub _koha_new_item {
$item->{'itemlost'},
$item->{'wthdrawn'},
$item->{'itemcallnumber'},
$item->{'coded_location_qualifier'},
$item->{'restricted'},
$item->{'itemnotes'},
$item->{'holdingbranch'},

View file

@ -1047,6 +1047,7 @@ CREATE TABLE `items` ( -- holdings/item information
`itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)
`wthdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
`itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)
`coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f)
`issues` smallint(6) default NULL, -- number of times this item has been checked out/issued
`renewals` smallint(6) default NULL, -- number of times this item has been renewed
`reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved

View file

@ -6041,6 +6041,14 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
$DBversion = "3.09.00.064";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do('ALTER TABLE items ADD coded_location_qualifier varchar(10) default NULL');
print "Upgrade to $DBversion done (Bug 6428: Added coded_location_qualifier to the items table)\n";
SetVersion ($DBversion);
}
=head1 FUNCTIONS
=head2 TableExists($table)

View file

@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
use strict;
sub kohaversion {
our $VERSION = '3.09.00.063';
our $VERSION = '3.09.00.064';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install