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

(-)a/installer/data/mysql/updatedatabase.pl (-1 / +6 lines)
Lines 4399-4404 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4399
    SetVersion($DBversion);
4399
    SetVersion($DBversion);
4400
}
4400
}
4401
4401
4402
<<<<<<< HEAD
4402
$DBversion = "3.05.00.009";
4403
$DBversion = "3.05.00.009";
4403
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4404
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4404
    $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate)
4405
    $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate)
Lines 4446-4451 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4446
    SetVersion($DBversion);
4447
    SetVersion($DBversion);
4447
}
4448
}
4448
4449
4450
$DBversion = "3.05.00.XXX";
4451
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4452
    print "RELTERMS category available for relator terms. They are not loaded during upgrade but can be easily inserted using the provided marc21_relatorterms.sql SQL script.\n";
4453
    SetVersion($DBversion);
4454
}
4449
4455
4450
=head1 FUNCTIONS
4456
=head1 FUNCTIONS
4451
4457
4452
- 

Return to bug 6299