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

(-)a/C4/Acquisition.pm (-7 / +2 lines)
Lines 1769-1787 sub DelOrder { Link Here
1769
        SET    datecancellationprinted=now(), orderstatus='cancelled'
1769
        SET    datecancellationprinted=now(), orderstatus='cancelled'
1770
    ";
1770
    ";
1771
    if($reason) {
1771
    if($reason) {
1772
        $query .= "
1772
        $query .= ", cancellationreason = ? ";
1773
            , notes = IF(notes IS NULL,
1774
                CONCAT('Cancellation reason: ', ?),
1775
                CONCAT(notes, ' - Cancellation reason: ', ?)
1776
            )
1777
        ";
1778
    }
1773
    }
1779
    $query .= "
1774
    $query .= "
1780
        WHERE biblionumber=? AND ordernumber=?
1775
        WHERE biblionumber=? AND ordernumber=?
1781
    ";
1776
    ";
1782
    my $sth = $dbh->prepare($query);
1777
    my $sth = $dbh->prepare($query);
1783
    if($reason) {
1778
    if($reason) {
1784
        $sth->execute($reason, $reason, $bibnum, $ordernumber);
1779
        $sth->execute($reason, $bibnum, $ordernumber);
1785
    } else {
1780
    } else {
1786
        $sth->execute( $bibnum, $ordernumber );
1781
        $sth->execute( $bibnum, $ordernumber );
1787
    }
1782
    }
(-)a/acqui/cancelorder.pl (-5 lines)
Lines 33-43 use Modern::Perl; Link Here
33
use CGI;
33
use CGI;
34
use C4::Auth;
34
use C4::Auth;
35
use C4::Output;
35
use C4::Output;
36
# FIXME: C4::Search is needed by C4::Items::GetAnalyticsCount, which is called
37
# by C4::Acquisition::DelOrder. But C4::Search is not imported by C4::Items.
38
# Once this problem is resolved, the following line can be removed.
39
# See Bug 7847.
40
use C4::Search;
41
use C4::Acquisition;
36
use C4::Acquisition;
42
37
43
my $input = new CGI;
38
my $input = new CGI;
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 2988-2993 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here
2988
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
2988
  `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
2989
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
2989
  `cancelledby` varchar(10) default NULL, -- not used? always NULL
2990
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
2990
  `datecancellationprinted` date default NULL, -- the date the line item was deleted
2991
  cancellationreason text default NULL, -- reason of cancellation
2991
  `notes` mediumtext, -- notes related to this order line
2992
  `notes` mediumtext, -- notes related to this order line
2992
  `supplierreference` mediumtext, -- not used? always NULL
2993
  `supplierreference` mediumtext, -- not used? always NULL
2993
  `purchaseordernumber` mediumtext, -- not used? always NULL
2994
  `purchaseordernumber` mediumtext, -- not used? always NULL
(-)a/installer/data/mysql/updatedatabase.pl (+11 lines)
Lines 8065-8070 if ( CheckVersion($DBversion) ) { Link Here
8065
    SetVersion($DBversion);
8065
    SetVersion($DBversion);
8066
}
8066
}
8067
8067
8068
$DBversion = "XXX";
8069
if ( CheckVersion($DBversion) ) {
8070
    $dbh->do("
8071
        ALTER TABLE aqorders
8072
        ADD COLUMN cancellationreason TEXT DEFAULT NULL AFTER datecancellationprinted
8073
    ");
8074
    print "Upgrade to $DBversion done (Bug 7162: Add aqorders.cancellationreason)\n";
8075
    SetVersion($DBversion);
8076
}
8077
8078
8068
=head1 FUNCTIONS
8079
=head1 FUNCTIONS
8069
8080
8070
=head2 TableExists($table)
8081
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (+4 lines)
Lines 589-594 Link Here
589
                        [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
589
                        [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
590
                        [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
590
                        [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
591
                        [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
591
                        [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
592
                        [% IF ( order.cancellationreason ) %]
593
                          <br />
594
                          Cancellation reason: [% order.cancellationreason %]
595
                        [% END %]
592
                      </p>
596
                      </p>
593
                      [% IF order.transferred_to %]
597
                      [% IF order.transferred_to %]
594
                        [% basket = order.transferred_to.basket %]
598
                        [% basket = order.transferred_to.basket %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-6 / +5 lines)
Lines 41-58 Link Here
41
      [% ELSE %]
41
      [% ELSE %]
42
        [% IF ( success_cancelorder ) %]
42
        [% IF ( success_cancelorder ) %]
43
            <div class="dialog message">
43
            <div class="dialog message">
44
                The order has been successfully canceled
44
                The order has been successfully cancelled
45
        [% ELSE %]
45
        [% ELSE %]
46
            <div class="dialog alert">
46
            <div class="dialog alert">
47
                An error has occured.
47
                An error has occurred.
48
                [% IF ( error_delitem ) %]
48
                [% IF ( error_delitem ) %]
49
                    <p>The order has been canceled, although one or more items could not have been deleted.</p>
49
                    <p>The order has been cancelled, although one or more items could not have been deleted.</p>
50
                [% END %]
50
                [% END %]
51
                [% IF ( error_delbiblio ) %]
51
                [% IF ( error_delbiblio ) %]
52
                <p>The order has been canceled, although the record has not been deleted.</p>
52
                <p>The order has been cancelled, although the record has not been deleted.</p>
53
                [% END %]
53
                [% END %]
54
        [% END %]
54
        [% END %]
55
                <p>Click <a href="[% referrer %]">here</a> to return to previous page</p>
55
                <p><a href="[% referrer %]">OK</a></p>
56
            </div>
56
            </div>
57
      [% END %]
57
      [% END %]
58
58
59
- 

Return to bug 7162