Attachment #32897 for bug #7162

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




        SET    datecancellationprinted=now(), orderstatus='cancelled'
    ";
    if($reason) {
        $query .= ", cancellationreason = ? ";
            , notes = IF(notes IS NULL,
                CONCAT('Cancellation reason: ', ?),
                CONCAT(notes, ' - Cancellation reason: ', ?)
            )
        ";
    }
    $query .= "
        WHERE biblionumber=? AND ordernumber=?
    ";
    my $sth = $dbh->prepare($query);
    if($reason) {
        $sth->execute($reason, $bibnum, $ordernumber);
    } else {
        $sth->execute( $bibnum, $ordernumber );
    }

Lines 33-43 use Modern::Perl; Link Here

(-)a/acqui/cancelorder.pl (-5 lines)
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;

Lines 3026-3031 CREATE TABLE `aqorders` ( -- information related to the basket line items Link Here

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
3026	`unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item	3026	`unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item
3027	`quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far	3027	`quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far
3028	`datecancellationprinted` date default NULL, -- the date the line item was deleted	3028	`datecancellationprinted` date default NULL, -- the date the line item was deleted
		3029	`cancellationreason` text default NULL, -- reason of cancellation
3029	`order_internalnote` mediumtext, -- notes related to this order line, made for staff	3030	`order_internalnote` mediumtext, -- notes related to this order line, made for staff
3030	`order_vendornote` mediumtext, -- notes related to this order line, made for vendor	3031	`order_vendornote` mediumtext, -- notes related to this order line, made for vendor
3031	`supplierreference` mediumtext, -- not used? always NULL	3032	`supplierreference` mediumtext, -- not used? always NULL




    SetVersion($DBversion);
}

$DBversion = "XXX";
if ( CheckVersion($DBversion) ) {
    $dbh->do("
        ALTER TABLE aqorders
        ADD COLUMN cancellationreason TEXT DEFAULT NULL AFTER datecancellationprinted
    ");
    print "Upgrade to $DBversion done (Bug 7162: Add aqorders.cancellationreason)\n";
    SetVersion($DBversion);
}


=head1 FUNCTIONS

=head2 TableExists($table)

Lines 595-600 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (+4 lines)
595	[% IF ( order.publishercode ) %], [% order.publishercode %][% END %]	595	[% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
596	[% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]	596	[% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
597	[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]	597	[% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
		598	[% IF ( order.cancellationreason ) %]
		599	<br />
		600	Cancellation reason: [% order.cancellationreason %]
		601	[% END %]
598	</p>	602	</p>
599	[% IF order.transferred_to %]	603	[% IF order.transferred_to %]
600	[% basket = order.transferred_to.basket %]	604	[% basket = order.transferred_to.basket %]




      [% ELSE %]
        [% IF ( success_cancelorder ) %]
            <div class="dialog message">
                The order has been successfully cancelled
        [% ELSE %]
            <div class="dialog alert">
                An error has occurred.
                [% IF ( error_delitem ) %]
                    <p>The order has been cancelled, although one or more items could not have been deleted.</p>
                [% END %]
                [% IF ( error_delbiblio ) %]
                <p>The order has been cancelled, although the record has not been deleted.</p>
                [% END %]
        [% END %]
                <p><a href="[% referrer %]">OK</a></p>
            </div>
      [% END %]

- 

Return to bug 7162

Lines 1794-1812 sub DelOrder { Link Here

(-)a/C4/Acquisition.pm (-7 / +2 lines)
1794	SET datecancellationprinted=now(), orderstatus='cancelled'	1794	SET datecancellationprinted=now(), orderstatus='cancelled'
1795	";	1795	";
1796	if($reason) {	1796	if($reason) {
1797	$query .= "	1797	$query .= ", cancellationreason = ? ";
1798	, notes = IF(notes IS NULL,
1799	CONCAT('Cancellation reason: ', ?),
1800	CONCAT(notes, ' - Cancellation reason: ', ?)
1801	)
1802	";
1803	}	1798	}
1804	$query .= "	1799	$query .= "
1805	WHERE biblionumber=? AND ordernumber=?	1800	WHERE biblionumber=? AND ordernumber=?
1806	";	1801	";
1807	my $sth = $dbh->prepare($query);	1802	my $sth = $dbh->prepare($query);
1808	if($reason) {	1803	if($reason) {
1809	$sth->execute($reason, $reason, $bibnum, $ordernumber);	1804	$sth->execute($reason, $bibnum, $ordernumber);
1810	} else {	1805	} else {
1811	$sth->execute( $bibnum, $ordernumber );	1806	$sth->execute( $bibnum, $ordernumber );
1812	}	1807	}

Lines 8891-8896 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+11 lines)
8891	SetVersion($DBversion);	8891	SetVersion($DBversion);
8892	}	8892	}
8893		8893
		8894	$DBversion = "XXX";
		8895	if ( CheckVersion($DBversion) ) {
		8896	$dbh->do("
		8897	ALTER TABLE aqorders
		8898	ADD COLUMN cancellationreason TEXT DEFAULT NULL AFTER datecancellationprinted
		8899	");
		8900	print "Upgrade to $DBversion done (Bug 7162: Add aqorders.cancellationreason)\n";
		8901	SetVersion($DBversion);
		8902	}
		8903
		8904
8894	=head1 FUNCTIONS	8905	=head1 FUNCTIONS
8895		8906
8896	=head2 TableExists($table)	8907	=head2 TableExists($table)

Lines 41-58 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-6 / +5 lines)
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	-