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

(-)a/C4/Acquisition.pm (-7 / +2 lines)
Lines 1768-1786 sub DelOrder { Link Here
1768
        SET    datecancellationprinted=now(), orderstatus='cancelled'
1768
        SET    datecancellationprinted=now(), orderstatus='cancelled'
1769
    ";
1769
    ";
1770
    if($reason) {
1770
    if($reason) {
1771
        $query .= "
1771
        $query .= ", cancellationreason = ? ";
1772
            , notes = IF(notes IS NULL,
1773
                CONCAT('Cancellation reason: ', ?),
1774
                CONCAT(notes, ' - Cancellation reason: ', ?)
1775
            )
1776
        ";
1777
    }
1772
    }
1778
    $query .= "
1773
    $query .= "
1779
        WHERE biblionumber=? AND ordernumber=?
1774
        WHERE biblionumber=? AND ordernumber=?
1780
    ";
1775
    ";
1781
    my $sth = $dbh->prepare($query);
1776
    my $sth = $dbh->prepare($query);
1782
    if($reason) {
1777
    if($reason) {
1783
        $sth->execute($reason, $reason, $bibnum, $ordernumber);
1778
        $sth->execute($reason, $bibnum, $ordernumber);
1784
    } else {
1779
    } else {
1785
        $sth->execute( $bibnum, $ordernumber );
1780
        $sth->execute( $bibnum, $ordernumber );
1786
    }
1781
    }
(-)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 7743-7748 if(CheckVersion($DBversion)) { Link Here
7743
    SetVersion($DBversion);
7743
    SetVersion($DBversion);
7744
}
7744
}
7745
7745
7746
$DBversion = "XXX";
7747
if ( CheckVersion($DBversion) ) {
7748
    $dbh->do("
7749
        ALTER TABLE aqorders
7750
        ADD COLUMN cancellationreason TEXT DEFAULT NULL AFTER datecancellationprinted
7751
    ");
7752
    print "Upgrade to $DBversion done (Bug 7162: Add aqorders.cancellationreason)\n";
7753
    SetVersion($DBversion);
7754
}
7755
7756
7746
=head1 FUNCTIONS
7757
=head1 FUNCTIONS
7747
7758
7748
=head2 TableExists($table)
7759
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (+4 lines)
Lines 528-533 Link Here
528
                        [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
528
                        [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
529
                        [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
529
                        [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
530
                        [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
530
                        [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
531
                        [% IF ( order.cancellationreason ) %]
532
                          <br />
533
                          Cancellation reason: [% order.cancellationreason %]
534
                        [% END %]
531
                      </p>
535
                      </p>
532
                      [% IF order.transferred_to %]
536
                      [% IF order.transferred_to %]
533
                        [% basket = order.transferred_to.basket %]
537
                        [% 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