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

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 3051-3056 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
3051
  KEY `basketno` (`basketno`),
3051
  KEY `basketno` (`basketno`),
3052
  KEY `biblionumber` (`biblionumber`),
3052
  KEY `biblionumber` (`biblionumber`),
3053
  KEY `budget_id` (`budget_id`),
3053
  KEY `budget_id` (`budget_id`),
3054
  CONSTRAINT `aqorders_budget_id_fk` FOREIGN KEY (`budget_id`) REFERENCES `aqbudgets` (`budget_id`) ON DELETE CASCADE ON UPDATE CASCADE,
3054
  CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE,
3055
  CONSTRAINT `aqorders_ibfk_1` FOREIGN KEY (`basketno`) REFERENCES `aqbasket` (`basketno`) ON DELETE CASCADE ON UPDATE CASCADE,
3055
  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE,
3056
  CONSTRAINT `aqorders_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE SET NULL ON UPDATE CASCADE,
3056
  CONSTRAINT aqorders_ibfk_3 FOREIGN KEY (invoiceid) REFERENCES aqinvoices (invoiceid) ON DELETE SET NULL ON UPDATE CASCADE,
3057
  CONSTRAINT aqorders_ibfk_3 FOREIGN KEY (invoiceid) REFERENCES aqinvoices (invoiceid) ON DELETE SET NULL ON UPDATE CASCADE,
(-)a/installer/data/mysql/updatedatabase.pl (+41 lines)
Lines 8820-8825 if ( CheckVersion($DBversion) ) { Link Here
8820
    SetVersion ($DBversion);
8820
    SetVersion ($DBversion);
8821
}
8821
}
8822
8822
8823
$DBversion = "3.17.00.030";
8824
if ( CheckVersion($DBversion) ) {
8825
    my $number_of_orders_not_linked = $dbh->selectcol_arrayref(q|
8826
        SELECT COUNT(*)
8827
        FROM aqorders o
8828
        WHERE NOT EXISTS (
8829
            SELECT NULL
8830
            FROM aqbudgets b
8831
            WHERE b.budget_id = o.budget_id
8832
        );
8833
    |);
8834
8835
    if ( $number_of_orders_not_linked->[0] > 0 ) {
8836
        $dbh->do(q|
8837
            INSERT INTO aqbudgetperiods(budget_period_startdate, budget_period_enddate, budget_period_active, budget_period_description, budget_period_total) VALUES ( CAST(NOW() AS date), CAST(NOW() AS date), 0, "WARNING: This budget has been automatically created by the updatedatabase script, please see bug 12601 for more information", 0)
8838
        |);
8839
        my $budget_period_id = $dbh->last_insert_id( undef, undef, 'aqbudgetperiods', undef );
8840
        $dbh->do(qq|
8841
            INSERT INTO aqbudgets(budget_code, budget_name, budget_amount, budget_period_id) VALUES ( "BACKUP_TMP", "WARNING: fund created by the updatedatabase script, please see bug 12601", 0, $budget_period_id );
8842
        |);
8843
        my $budget_id = $dbh->last_insert_id( undef, undef, 'aqbudgets', undef );
8844
        $dbh->do(qq|
8845
            UPDATE aqorders o
8846
            SET budget_id = $budget_id
8847
            WHERE NOT EXISTS (
8848
                SELECT NULL
8849
                FROM aqbudgets b
8850
                WHERE b.budget_id = o.budget_id
8851
            )
8852
        |);
8853
    }
8854
8855
    $dbh->do(q|
8856
        ALTER TABLE aqorders
8857
        ADD CONSTRAINT aqorders_budget_id_fk FOREIGN KEY (budget_id) REFERENCES aqbudgets(budget_id) ON DELETE CASCADE ON UPDATE CASCADE
8858
    |);
8859
8860
    print "Upgrade to $DBversion done (Bug 12601 - Add new foreign key aqorders.budget_id" . ( ( $number_of_orders_not_linked->[0] > 0 )  ? ' WARNING: temporary budget and fund have been created (search for "BACKUP_TMP"). At least one of your order was not linked to a budget' : '' ) . ")\n";
8861
    SetVersion($DBversion);
8862
}
8863
8823
=head1 FUNCTIONS
8864
=head1 FUNCTIONS
8824
8865
8825
=head2 TableExists($table)
8866
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-1 / +1 lines)
Lines 593-598 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
593
593
594
[% IF op == 'delete_confirm' %]
594
[% IF op == 'delete_confirm' %]
595
<div class="dialog alert"> <h3>Delete fund [% budget_name %]?</h3>
595
<div class="dialog alert"> <h3>Delete fund [% budget_name %]?</h3>
596
If you delete this fund, all orders linked to this fund will be deleted!
596
<table>
597
<table>
597
    <tr>
598
    <tr>
598
    <th scope="row">Fund amount:</th>
599
    <th scope="row">Fund amount:</th>
599
- 

Return to bug 12601