View | Details | Raw Unified | Return to bug 6064
Collapse All | Expand All

(-)a/C4/Overdues.pm (-1 / +5 lines)
Lines 957-965 returns a list of branch codes for branches with overdue rules defined. Link Here
957
957
958
sub GetBranchcodesWithOverdueRules {
958
sub GetBranchcodesWithOverdueRules {
959
    my $dbh               = C4::Context->dbh;
959
    my $dbh               = C4::Context->dbh;
960
    my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> ''");
960
    my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> '' ORDER BY branchcode");
961
    $rqoverduebranches->execute;
961
    $rqoverduebranches->execute;
962
    my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref };
962
    my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref };
963
    if (!$branches[0]) {
964
       my $availbranches = C4::Branch::GetBranches();
965
       @branches = keys %$availbranches;
966
    }
963
    return @branches;
967
    return @branches;
964
}
968
}
965
969
(-)a/installer/data/mysql/kohastructure.sql (-3 / +3 lines)
Lines 1407-1419 DROP TABLE IF EXISTS `overduerules`; Link Here
1407
CREATE TABLE `overduerules` (
1407
CREATE TABLE `overduerules` (
1408
  `branchcode` varchar(10) NOT NULL default '',
1408
  `branchcode` varchar(10) NOT NULL default '',
1409
  `categorycode` varchar(10) NOT NULL default '',
1409
  `categorycode` varchar(10) NOT NULL default '',
1410
  `delay1` int(4) default 0,
1410
  `delay1` int(4) default NULL,
1411
  `letter1` varchar(20) default NULL,
1411
  `letter1` varchar(20) default NULL,
1412
  `debarred1` varchar(1) default 0,
1412
  `debarred1` varchar(1) default 0,
1413
  `delay2` int(4) default 0,
1413
  `delay2` int(4) default NULL,
1414
  `debarred2` varchar(1) default 0,
1414
  `debarred2` varchar(1) default 0,
1415
  `letter2` varchar(20) default NULL,
1415
  `letter2` varchar(20) default NULL,
1416
  `delay3` int(4) default 0,
1416
  `delay3` int(4) default NULL,
1417
  `letter3` varchar(20) default NULL,
1417
  `letter3` varchar(20) default NULL,
1418
  `debarred3` int(1) default 0,
1418
  `debarred3` int(1) default 0,
1419
  PRIMARY KEY  (`branchcode`,`categorycode`)
1419
  PRIMARY KEY  (`branchcode`,`categorycode`)
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 4234-4239 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
4234
    SetVersion($DBversion);
4234
    SetVersion($DBversion);
4235
}
4235
}
4236
4236
4237
$DBversion = "3.03.00.045";
4238
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
4239
    $dbh->do("ALTER TABLE overduerules ALTER delay1 SET DEFAULT NULL, ALTER delay2 SET DEFAULT NULL, ALTER delay3 SET DEFAULT NULL");
4240
    print "Upgrade to $DBversion done (Setting NULL default value for delayn columns in table overduerules)\n";
4241
    SetVersion($DBversion);
4242
}
4243
4237
=head1 FUNCTIONS
4244
=head1 FUNCTIONS
4238
4245
4239
=head2 DropAllForeignKeys($table)
4246
=head2 DropAllForeignKeys($table)
(-)a/tools/overduerules.pl (-4 / +3 lines)
Lines 142-154 if ($op eq 'save') { Link Here
142
                    my $res = $sth_search->fetchrow_hashref();
142
                    my $res = $sth_search->fetchrow_hashref();
143
                    if ($res->{'total'}>0) {
143
                    if ($res->{'total'}>0) {
144
                        $sth_update->execute(
144
                        $sth_update->execute(
145
                            ($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:0),
145
                            ($temphash{$bor}->{"delay1"}?$temphash{$bor}->{"delay1"}:undef),
146
                            ($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),
146
                            ($temphash{$bor}->{"letter1"}?$temphash{$bor}->{"letter1"}:""),
147
                            ($temphash{$bor}->{"debarred1"}?$temphash{$bor}->{"debarred1"}:0),
147
                            ($temphash{$bor}->{"debarred1"}?$temphash{$bor}->{"debarred1"}:0),
148
                            ($temphash{$bor}->{"delay2"}?$temphash{$bor}->{"delay2"}:0),
148
                            ($temphash{$bor}->{"delay2"}?$temphash{$bor}->{"delay2"}:undef),
149
                            ($temphash{$bor}->{"letter2"}?$temphash{$bor}->{"letter2"}:""),
149
                            ($temphash{$bor}->{"letter2"}?$temphash{$bor}->{"letter2"}:""),
150
                            ($temphash{$bor}->{"debarred2"}?$temphash{$bor}->{"debarred2"}:0),
150
                            ($temphash{$bor}->{"debarred2"}?$temphash{$bor}->{"debarred2"}:0),
151
                            ($temphash{$bor}->{"delay3"}?$temphash{$bor}->{"delay3"}:0),
151
                            ($temphash{$bor}->{"delay3"}?$temphash{$bor}->{"delay3"}:undef),
152
                            ($temphash{$bor}->{"letter3"}?$temphash{$bor}->{"letter3"}:""),
152
                            ($temphash{$bor}->{"letter3"}?$temphash{$bor}->{"letter3"}:""),
153
                            ($temphash{$bor}->{"debarred3"}?$temphash{$bor}->{"debarred3"}:0),
153
                            ($temphash{$bor}->{"debarred3"}?$temphash{$bor}->{"debarred3"}:0),
154
                            $branch ,$bor
154
                            $branch ,$bor
155
- 

Return to bug 6064