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

(-)a/installer/data/mysql/updatedatabase.pl (-1 / +6 lines)
Lines 4398-4403 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4398
    SetVersion($DBversion);
4398
    SetVersion($DBversion);
4399
}
4399
}
4400
4400
4401
<<<<<<< HEAD
4401
$DBversion = "3.05.00.009";
4402
$DBversion = "3.05.00.009";
4402
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4403
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4403
    $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate)
4404
    $dbh->do("INSERT INTO old_issues (borrowernumber, itemnumber, date_due, branchcode, issuingbranch, returndate, lastreneweddate, `return`, renewals, timestamp, issuedate)
Lines 4598-4603 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4598
    SetVersion($DBversion);
4599
    SetVersion($DBversion);
4599
}
4600
}
4600
4601
4602
$DBversion = "3.05.00.XXX";
4603
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4604
    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";
4605
    SetVersion($DBversion);
4606
}
4601
4607
4602
$DBversion = "3.07.00.007";
4608
$DBversion = "3.07.00.007";
4603
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4609
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4604
- 

Return to bug 6299