Merge branch 'bug_7243' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-01-24 09:26:37 -05:00
commit ce6f2cb74f
2 changed files with 2 additions and 2 deletions

View File

@ -6339,7 +6339,7 @@ if ( CheckVersion($DBversion) ) {
SetVersion ($DBversion);
}
$DBversion = "3.11.00.XXX";
$DBversion = "3.11.00.015";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('RentalsInNoissuesCharge', '1', 'Rental charges block checkouts (added to noissuescharge).',NULL,'YesNo');");
$dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ManInvInNoissuesCharge', '1', 'MANUAL_INV charges block checkouts (added to noissuescharge).',NULL,'YesNo');");

View File

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