Attachment 22300 Details for Bug 10869 – [PATCH] Bug 10869: Allow the deletion of order line if the record is deleted

[patch] [PATCH] Bug 10869: Allow the deletion of order line if the record is deleted

0001-Bug-10869-Allow-the-deletion-of-order-line-if-the-re.patch (text/plain), 10.29 KB, created by Mathieu Saby on 2013-10-22 22:02:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Saby

Created: 2013-10-22 22:02:54 UTC

Size: 10.29 KB

patch

obsolete

>From edf1bf346f7791065b0db48ab12e919f573cbc92 Mon Sep 17 00:00:00 2001
>From: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
>Date: Sat, 14 Sep 2013 12:28:21 +0200
>Subject: [PATCH] Bug 10869: Allow the deletion of order line if the record is deleted
>Content-Type: text/plain; charset="utf-8"
>
>[I integrated a small followup by P. Poulain, changing the name of $bibnum to $biblionumber in DelOrder
>It was more simple for rebasing]
>
>This patch fixes 2 issues :
>(medium issue) It is not possible to delete an order in a basket if the biblio record is deleted.
>(minor issue) There is a useless hyperlink around "Deleted bibliographic notice", and "notice" is a frenchism for "record"
>
>I had to change the behavior of Acquisitions::DelOrder (which is used only by addorder.pl file), a line in addorder.pl, and a few lines in template basket.tt.
>
>To test :
>1. Fill a basket with some records (some records with items or holds, some without items)
>2. Supress one of the record
>3. In the basket (refresh the screen) check that "Deleted bibliographic notice" line was replaced with "Deleted bibliographic record", without hyperlink arround
>4. Delete this order with the link "Delete order" to the right column of the table
>5. Check there is a new line in the "Deleted orders" table
>6. Check there is no regression : felete an other order (one with no item), then check you cannot delete an order with an item (like before patch)
>
>Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
>
>---
> C4/Acquisition.pm | 18 +++----
> acqui/addorder.pl | 2 +-
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 54 +++++++++++---------
> 3 files changed, 41 insertions(+), 33 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 8c40dcd..346ab80 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -1579,7 +1579,7 @@ sub SearchOrders {
> 
> =head3 DelOrder
> 
>- &DelOrder($biblionumber, $ordernumber);
>+ &DelOrder($ordernumber, $biblionumber);
> 
> Cancel the order with the given order and biblio numbers. It does not
> delete any entries in the aqorders table, it merely marks them as
>@@ -1588,21 +1588,22 @@ cancelled.
> =cut
> 
> sub DelOrder {
>- my ( $bibnum, $ordernumber ) = @_;
>+ my ($ordernumber,$biblionumber) = @_;
> my $dbh = C4::Context->dbh;
> my $query = "
> UPDATE aqorders
> SET datecancellationprinted=now(), orderstatus='cancelled'
>- WHERE biblionumber=? AND ordernumber=?
>+ WHERE ordernumber=?
> ";
> my $sth = $dbh->prepare($query);
>- $sth->execute( $bibnum, $ordernumber );
>+ $sth->execute($ordernumber );
> $sth->finish;
>- my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
>- foreach my $itemnumber (@itemnumbers){
>- 	C4::Items::DelItem( $dbh, $bibnum, $itemnumber );
>+ if ($biblionumber) {
>+ my @itemnumbers = GetItemnumbersFromOrder( $ordernumber );
>+ foreach my $itemnumber (@itemnumbers){
>+ C4::Items::DelItem( $dbh, $biblionumber, $itemnumber );
>+ }
> }
>- 
> }
> 
> =head3 TransferOrder
>@@ -2059,7 +2060,6 @@ sub GetHistory {
> LEFT JOIN deletedbiblio ON deletedbiblio.biblionumber=aqorders.biblionumber
> LEFT JOIN deletedbiblioitems ON deletedbiblioitems.biblionumber=aqorders.biblionumber
> ";
>-
> if ( C4::Context->preference("IndependentBranches") ) {
> $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber";
> }
>diff --git a/acqui/addorder.pl b/acqui/addorder.pl
>index 42324aa..ebbb96a 100755
>--- a/acqui/addorder.pl
>+++ b/acqui/addorder.pl
>@@ -251,7 +251,7 @@ if ( $orderinfo->{quantity} ne '0' ) {
> 
> else { # qty=0, delete the line
> my $biblionumber = $input->param('biblionumber');
>- DelOrder( $biblionumber, $$orderinfo{ordernumber} );
>+ DelOrder($$orderinfo{ordernumber}, $biblionumber );
> if ($orderinfo->{delbiblio} == 1){
> DelBiblio($biblionumber);
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index 67e299d..0f12485 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -336,8 +336,12 @@
> [% IF ( books_loo.order_received ) %]<tr class="disabled">[% ELSE %][% IF ( books_loo.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %][% END %]
> <td>
> [% IF ( books_loo.order_received ) %] (rcvd)[% END %]
>- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
>- 
>+ [% IF (books_loo.biblionumber) %]
>+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %]
>+ 
>+ [% ELSE %]
>+ Deleted bibliographic record, can't find title 
>+ [% END %]
> [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %]
> [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %]
> [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %]
>@@ -387,27 +391,31 @@
> [% END %]
> </td>
> <td>
>- [% IF ( books_loo.left_holds_on_order ) %]
>- Can't delete order 
>+ [% UNLESS (books_loo.biblionumber) %]
>+ <a href="javascript:confirm_delete_item([% books_loo.ordernumber %])" class="button">Delete order</a> 
> [% ELSE %]
>- <a href="javascript:confirm_delete_item([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order</a> 
>- [% END %]
>- [% IF ( books_loo.can_del_bib ) %]
>- <a href="javascript:confirm_delete_biblio([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order and catalog record</a> 
>- [% ELSE %]
>- Can't delete order and catalog record 
>- [% END %]
>- [% IF ( books_loo.left_item ) %]
>- [% books_loo.items %] item(s) left 
>- [% END %]
>- [% IF ( books_loo.left_biblio ) %]
>- [% books_loo.biblios %] order(s) left 
>- [% END %]
>- [% IF ( books_loo.left_subscription ) %]
>- [% books_loo.subscriptions %] subscription(s) left 
>- [% END %]
>- [% IF ( books_loo.left_holds ) %]
>- [% books_loo.holds %] hold(s) left
>+ [% IF ( books_loo.left_holds_on_order ) %]
>+ Can't delete order 
>+ [% ELSE %]
>+ <a href="javascript:confirm_delete_item([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order</a> 
>+ [% END %]
>+ [% IF ( books_loo.can_del_bib ) %]
>+ <a href="javascript:confirm_delete_biblio([% books_loo.ordernumber %],[% books_loo.biblionumber %])" class="button">Delete order and catalog record</a> 
>+ [% ELSE %]
>+ Can't delete order and catalog record 
>+ [% END %]
>+ [% IF ( books_loo.left_item ) %]
>+ [% books_loo.items %] item(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_biblio ) %]
>+ [% books_loo.biblios %] order(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_subscription ) %]
>+ [% books_loo.subscriptions %] subscription(s) left 
>+ [% END %]
>+ [% IF ( books_loo.left_holds ) %]
>+ [% books_loo.holds %] hold(s) left
>+ [% END %]
> [% END %]
> </td>
> [% END %]
>@@ -445,7 +453,7 @@
> <td>
> 
> [% IF ( order.order_received ) %] (rcvd)[% END %]
>- [% IF (order.title) %]
>+ [% IF (order.biblionumber) %]
> [% order.title |html %] by [% order.author %] 
> [% ELSE %]
> Deleted bibliographic record, can't find title 
>-- 
>1.7.9.5
>

Actions: View | Diff | Splinter Review

Attachments on bug 10869: 20970 | 21106 | 21294 | 21295 | 21480 | 22104 | 22299 | 22300 | 22342 | 22676 | 23839 | 24743 | 24744 | 24992 | 25000 | 25001 | 25002 | 25003 | 26692 | 26693 | 27270 | 27292 | 28516 | 29668 | 78862 | 78863 | 78864