gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 7162: Factorize code for order cancellation (QA fixes) 

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Julian Maurice 2014-07-07 09:27:58 +02:00 committed by Tomas Cohen Arazi
parent 1f8c4453cb
commit 59bcdb0b25
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
acqui/addorder.pl
View File

@ -122,10 +122,10 @@ if it is an order from an existing suggestion : the id of this suggestion.
use strict;
use warnings;
use CGI;
use C4::Auth; # get_template_and_user
use C4::Auth; # get_template_and_user
use C4::Acquisition; # ModOrder
use C4::Suggestions; # ModStatus
use C4::Biblio; # AddBiblio TransformKohaToMarc
use C4::Suggestions; # ModStatus
use C4::Biblio; # AddBiblio TransformKohaToMarc
use C4::Budgets;
use C4::Items;
use C4::Output;

23
acqui/cancelorder.pl
View File

@ -1,20 +1,21 @@
#!/usr/bin/perl
# Copyright 2011 BibLibre SARL
# Copyright 2014 BibLibre
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
=head1 NAME

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
View File

@ -34,8 +34,8 @@
[% IF (del_biblio) %]
<input type="hidden" value="1" name="del_biblio" />
[% END %]
<input type="submit" class="approve" value="Yes, Cancel (Y)" accesskey="y" />
<input type="submit" class="deny" value="No, Don't Cancel (N)" accesskey="n" onclick="window.location='[% referrer %]';return false;" />
<input type="submit" class="approve" value="Yes, cancel (Y)" accesskey="y" />
<input type="submit" class="deny" value="No, don't cancel (N)" accesskey="n" onclick="window.location='[% referrer %]';return false;" />
</div>
</form>
[% ELSE %]

6
t/db_dependent/Acquisition.t
View File

@ -893,8 +893,8 @@ ok((defined $order1->{datecancellationprinted}), "order is cancelled");
ok((not defined $order1->{cancellationreason}), "order has no cancellation reason");
ok((defined GetBiblio($order1->{biblionumber})), "biblio still exists");
my $order2 = GetOrder($ordernumbers[1]);
my $error = DelOrder($order2->{biblionumber}, $order2->{ordernumber}, 1);
$order2 = GetOrder($ordernumbers[1]);
$error = DelOrder($order2->{biblionumber}, $order2->{ordernumber}, 1);
ok((not defined $error), "DelOrder does not fail");
$order2 = GetOrder($order2->{ordernumber});
ok((defined $order2->{datecancellationprinted}), "order is cancelled");
@ -902,7 +902,7 @@ ok((not defined $order2->{cancellationreason}), "order has no cancellation reaso
ok((not defined GetBiblio($order2->{biblionumber})), "biblio does not exist anymore");
my $order4 = GetOrder($ordernumbers[3]);
my $error = DelOrder($order4->{biblionumber}, $order4->{ordernumber}, 1, "foobar");
$error = DelOrder($order4->{biblionumber}, $order4->{ordernumber}, 1, "foobar");
ok((not defined $error), "DelOrder does not fail");
$order4 = GetOrder($order4->{ordernumber});
ok((defined $order4->{datecancellationprinted}), "order is cancelled");