gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 21443: DBRev 19.12.00.052 

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Martin Renvoize 2020-03-24 11:12:51 +00:00
parent 17ec659f85
commit fe3817a8b7
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Koha.pm
View File

@ -29,7 +29,7 @@ use vars qw{ $VERSION };
# - #4 : the developer version. The 4th number is the database subversion.
# used by developers when the database changes. updatedatabase take care of the changes itself
# and is automatically called by Auth.pm when needed.
$VERSION = "19.12.00.051";
$VERSION = "19.12.00.052";
sub version {
return $VERSION;

26
installer/data/mysql/atomicupdate/bug_21443.perl
View File

@ -1,26 +0,0 @@
$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
if( !column_exists( 'itemtypes', 'rentalcharge_daily_calendar' ) ) {
$dbh->do(q{
ALTER TABLE itemtypes ADD COLUMN
rentalcharge_daily_calendar tinyint(1) NOT NULL DEFAULT 1
AFTER rentalcharge_daily;
});
}
if( !column_exists( 'itemtypes', 'rentalcharge_hourly_calendar' ) ) {
$dbh->do(q{
ALTER TABLE itemtypes ADD COLUMN
rentalcharge_hourly_calendar tinyint(1) NOT NULL DEFAULT 1
AFTER rentalcharge_hourly;
});
}
my $finesCalendar = C4::Context->preference('finesCalendar');
my $value = $finesCalendar eq 'noFinesWhenClosed' ? 1 : 0;
$dbh->do("UPDATE itemtypes SET rentalcharge_hourly_calendar = $value, rentalcharge_daily_calendar = $value");
# Always end with this (adjust the bug info)
SetVersion( $DBversion );
print "Upgrade to $DBversion done (Bug 21443: Add ability to exclude holidays when calculating rentals fees by time period)\n";
}

25
installer/data/mysql/updatedatabase.pl
View File

@ -21228,6 +21228,31 @@ if( CheckVersion( $DBversion ) ) {
NewVersion( $DBversion, 24759, "Cleanup OpacRenewalBranch");
}
$DBversion = '19.12.00.052';
if( CheckVersion( $DBversion ) ) {
if( !column_exists( 'itemtypes', 'rentalcharge_daily_calendar' ) ) {
$dbh->do(q{
ALTER TABLE itemtypes ADD COLUMN
rentalcharge_daily_calendar tinyint(1) NOT NULL DEFAULT 1
AFTER rentalcharge_daily;
});
}
if( !column_exists( 'itemtypes', 'rentalcharge_hourly_calendar' ) ) {
$dbh->do(q{
ALTER TABLE itemtypes ADD COLUMN
rentalcharge_hourly_calendar tinyint(1) NOT NULL DEFAULT 1
AFTER rentalcharge_hourly;
});
}
my $finesCalendar = C4::Context->preference('finesCalendar');
my $value = $finesCalendar eq 'noFinesWhenClosed' ? 1 : 0;
$dbh->do("UPDATE itemtypes SET rentalcharge_hourly_calendar = $value, rentalcharge_daily_calendar = $value");
NewVersion( $DBversion, 21443, "Add ability to exclude holidays when calculating rentals fees by time period");
}
# SEE bug 13068
# if there is anything in the atomicupdate, read and execute it.
my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/';