Change default value in overduerules table for delayn (NULL instead of 0) and fix GetBranchcodesWithOverdueRules function
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
sub GetBranchcodesWithOverdueRules {
my $dbh = C4::Context->dbh;
- my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> ''");
+ my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> '' ORDER BY branchcode");
$rqoverduebranches->execute;
my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref };
+ if (!$branches[0]) {
+ my $availbranches = C4::Branch::GetBranches();
+ @branches = keys %$availbranches;
+ }
return @branches;
}
CREATE TABLE `overduerules` (
`branchcode` varchar(10) NOT NULL default '',
`categorycode` varchar(10) NOT NULL default '',
- `delay1` int(4) default 0,
+ `delay1` int(4) default NULL,
`letter1` varchar(20) default NULL,
`debarred1` varchar(1) default 0,
- `delay2` int(4) default 0,
+ `delay2` int(4) default NULL,
`debarred2` varchar(1) default 0,
`letter2` varchar(20) default NULL,
- `delay3` int(4) default 0,
+ `delay3` int(4) default NULL,
`letter3` varchar(20) default NULL,
`debarred3` int(1) default 0,
PRIMARY KEY (`branchcode`,`categorycode`)
SetVersion ($DBversion);
}
+$DBversion = "3.03.00.046";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+ $dbh->do("ALTER TABLE overduerules ALTER delay1 SET DEFAULT NULL, ALTER delay2 SET DEFAULT NULL, ALTER delay3 SET DEFAULT NULL");
+ print "Upgrade to $DBversion done (Setting NULL default value for delayn columns in table overduerules)\n";
+ SetVersion($DBversion);
+}
+
=head1 FUNCTIONS
=head2 DropAllForeignKeys($table)
my $res = $sth_search->fetchrow_hashref();
if ($res->{'total'}>0) {
$sth_update->execute(
- ($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:0),
+ ($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:undef),
($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),
($temphash{$bor}->{"debarred1"}?$temphash{$bor}->{"debarred1"}:0),
- ($temphash{$bor}->{"delay2"}?$temphash{$bor}->{"delay2"}:0),
+ ($temphash{$bor}->{"delay2"}?$temphash{$bor}->{"delay2"}:undef),
($temphash{$bor}->{"letter2"}?$temphash{$bor}->{"letter2"}:""),
($temphash{$bor}->{"debarred2"}?$temphash{$bor}->{"debarred2"}:0),
- ($temphash{$bor}->{"delay3"}?$temphash{$bor}->{"delay3"}:0),
+ ($temphash{$bor}->{"delay3"}?$temphash{$bor}->{"delay3"}:undef),
($temphash{$bor}->{"letter3"}?$temphash{$bor}->{"letter3"}:""),
($temphash{$bor}->{"debarred3"}?$temphash{$bor}->{"debarred3"}:0),
$branch ,$bor