Bugzilla – Attachment 67127 Details for
Bug 19293
Internal server error when receiving shipment with order with deleted biblio
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19293: Prevent error when receiving shipment with order with deleted biblio
Bug-19293-Prevent-error-when-receiving-shipment-wi.patch (text/plain), 5.89 KB, created by
Dilan Johnpullé
on 2017-09-14 01:34:35 UTC
(
hide
)
Description:
Bug 19293: Prevent error when receiving shipment with order with deleted biblio
Filename:
MIME Type:
Creator:
Dilan Johnpullé
Created:
2017-09-14 01:34:35 UTC
Size:
5.89 KB
patch
obsolete
>From 362f68495483c4f0c3304c8700378249e7c7443d Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Tue, 12 Sep 2017 05:15:36 +0000 >Subject: [PATCH] Bug 19293: Prevent error when receiving shipment with order > with deleted biblio >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Patch applies and works as described when test plan is followed. > >Signed-off-by: Dilan Johnpullé <dilan@calyx.net.au> >--- > acqui/parcel.pl | 88 +++++++++++++++++++++++++++++---------------------------- > 1 file changed, 45 insertions(+), 43 deletions(-) > >diff --git a/acqui/parcel.pl b/acqui/parcel.pl >index 5c73d97..15c04ea 100755 >--- a/acqui/parcel.pl >+++ b/acqui/parcel.pl >@@ -225,50 +225,52 @@ unless( defined $invoice->{closedate} ) { > for (my $i = 0 ; $i < $countpendings ; $i++) { > my $order = $pendingorders->[$i]; > >- if ( $bookseller->invoiceincgst ) { >- $order->{ecost} = $order->{ecost_tax_included}; >- } else { >- $order->{ecost} = $order->{ecost_tax_excluded}; >+ unless( !defined $order->{biblionumber} ){ # if this biblio has been deleted and the orderline hasn't been cancelled >+ if ( $bookseller->invoiceincgst ) { >+ $order->{ecost} = $order->{ecost_tax_included}; >+ } else { >+ $order->{ecost} = $order->{ecost_tax_excluded}; >+ } >+ $order->{total} = $order->{ecost} * $order->{quantity}; >+ >+ my %line = %$order; >+ >+ $line{invoice} = $invoice; >+ $line{booksellerid} = $booksellerid; >+ >+ my $biblionumber = $line{'biblionumber'}; >+ my $biblio = Koha::Biblios->find( $biblionumber ); >+ my $countbiblio = CountBiblioInOrders($biblionumber); >+ my $ordernumber = $line{'ordernumber'}; >+ my $cnt_subscriptions = $biblio->subscriptions->count; >+ my $itemcount = $biblio->items->count; >+ my $holds_count = $biblio->holds->count; >+ my @items = GetItemnumbersFromOrder( $ordernumber ); >+ my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@items } })->count : 0; >+ >+ my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber}); >+ $line{suggestionid} = $suggestion->{suggestionid}; >+ $line{surnamesuggestedby} = $suggestion->{surnamesuggestedby}; >+ $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby}; >+ >+ # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680 >+ $line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !($cnt_subscriptions) && !($holds_count); >+ $line{items} = ($itemcount) - (scalar @items); >+ $line{left_item} = 1 if $line{items} >= 1; >+ $line{left_biblio} = 1 if $countbiblio > 1; >+ $line{biblios} = $countbiblio - 1; >+ $line{left_subscription} = 1 if $cnt_subscriptions; >+ $line{subscriptions} = $cnt_subscriptions; >+ $line{left_holds} = ($holds_count >= 1) ? 1 : 0; >+ $line{left_holds_on_order} = 1 if $line{left_holds}==1 && ($line{items} == 0 || $itemholds ); >+ $line{holds} = $holds_count; >+ $line{holds_on_order} = $itemholds?$itemholds:$holds_count if $line{left_holds_on_order}; >+ >+ my $budget_name = GetBudgetName( $line{budget_id} ); >+ $line{budget_name} = $budget_name; >+ >+ push @loop_orders, \%line; > } >- $order->{total} = $order->{ecost} * $order->{quantity}; >- >- my %line = %$order; >- >- $line{invoice} = $invoice; >- $line{booksellerid} = $booksellerid; >- >- my $biblionumber = $line{'biblionumber'}; >- my $biblio = Koha::Biblios->find( $biblionumber ); >- my $countbiblio = CountBiblioInOrders($biblionumber); >- my $ordernumber = $line{'ordernumber'}; >- my $cnt_subscriptions = $biblio->subscriptions->count; >- my $itemcount = $biblio->items->count; >- my $holds_count = $biblio->holds->count; >- my @items = GetItemnumbersFromOrder( $ordernumber ); >- my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@items } })->count : 0; >- >- my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber}); >- $line{suggestionid} = $suggestion->{suggestionid}; >- $line{surnamesuggestedby} = $suggestion->{surnamesuggestedby}; >- $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby}; >- >- # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680 >- $line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !($cnt_subscriptions) && !($holds_count); >- $line{items} = ($itemcount) - (scalar @items); >- $line{left_item} = 1 if $line{items} >= 1; >- $line{left_biblio} = 1 if $countbiblio > 1; >- $line{biblios} = $countbiblio - 1; >- $line{left_subscription} = 1 if $cnt_subscriptions; >- $line{subscriptions} = $cnt_subscriptions; >- $line{left_holds} = ($holds_count >= 1) ? 1 : 0; >- $line{left_holds_on_order} = 1 if $line{left_holds}==1 && ($line{items} == 0 || $itemholds ); >- $line{holds} = $holds_count; >- $line{holds_on_order} = $itemholds?$itemholds:$holds_count if $line{left_holds_on_order}; >- >- my $budget_name = GetBudgetName( $line{budget_id} ); >- $line{budget_name} = $budget_name; >- >- push @loop_orders, \%line; > } > > $template->param( >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19293
:
67070
|
67127
|
67624
|
67625
|
67839