Bugzilla – Attachment 103686 Details for
Bug 20212
Improve performance of acquisitions receive page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20212: Clean parcel.pl
Bug-20212-Clean-parcelpl.patch (text/plain), 5.56 KB, created by
Tomás Cohen Arazi (tcohen)
on 2020-04-24 13:27:57 UTC
(
hide
)
Description:
Bug 20212: Clean parcel.pl
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2020-04-24 13:27:57 UTC
Size:
5.56 KB
patch
obsolete
>From dae59a6588381e77d9b9342d10793dff47e3d931 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Wed, 11 Mar 2020 17:10:10 -0300 >Subject: [PATCH] Bug 20212: Clean parcel.pl > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > acqui/parcel.pl | 100 ------------------------------------------------ > 1 file changed, 100 deletions(-) > >diff --git a/acqui/parcel.pl b/acqui/parcel.pl >index 8d094d8ffe..a6220cdc33 100755 >--- a/acqui/parcel.pl >+++ b/acqui/parcel.pl >@@ -181,105 +181,6 @@ for my $order ( @orders ) { > } > push @book_foot_loop, map { $_ } values %foot; > >-my @loop_orders = (); >-unless( defined $invoice->{closedate} ) { >- my $pendingorders; >- if ( $op eq "search" or $sticky_filters ) { >- my ( $search, $ean, $basketname, $orderno, $basketgroupname ); >- if ( $sticky_filters ) { >- $search = $input->cookie("filter_parcel_summary"); >- $ean = $input->cookie("filter_parcel_ean"); >- $basketname = $input->cookie("filter_parcel_basketname"); >- $orderno = $input->cookie("filter_parcel_orderno"); >- $basketgroupname = $input->cookie("filter_parcel_basketgroupname"); >- } else { >- $search = $input->param('summaryfilter') || ''; >- $ean = $input->param('eanfilter') || ''; >- $basketname = $input->param('basketfilter') || ''; >- $orderno = $input->param('orderfilter') || ''; >- $basketgroupname = $input->param('basketgroupnamefilter') || ''; >- } >- $pendingorders = SearchOrders({ >- booksellerid => $booksellerid, >- basketname => $basketname, >- ordernumber => $orderno, >- search => $search, >- ean => $ean, >- basketgroupname => $basketgroupname, >- pending => 1, >- ordered => 1, >- }); >- $template->param( >- summaryfilter => $search, >- eanfilter => $ean, >- basketfilter => $basketname, >- orderfilter => $orderno, >- basketgroupnamefilter => $basketgroupname, >- ); >- }else{ >- $pendingorders = SearchOrders({ >- booksellerid => $booksellerid, >- ordered => 1 >- }); >- } >- my $countpendings = scalar @$pendingorders; >- >- 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}; >- } >- $order->{total} = get_rounded_price($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 = $biblio ? $biblio->active_orders->count : 0; >- my $ordernumber = $line{'ordernumber'}; >- my $order_object = Koha::Acquisition::Orders->find($ordernumber); >- my $cnt_subscriptions = $biblio ? $biblio->subscriptions->count: 0; >- my $itemcount = $biblio ? $biblio->items->count : 0; >- my $holds_count = $biblio ? $biblio->holds->count : 0; >- my @itemnumbers = $order_object->items->get_column('itemnumber'); >- my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@itemnumbers } })->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 @itemnumbers && !($cnt_subscriptions) && !($holds_count); >- $line{items} = ($itemcount) - (scalar @itemnumbers); >- $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}; >- $line{basket} = Koha::Acquisition::Baskets->find( $line{basketno} ); >- >- my $budget_name = GetBudgetName( $line{budget_id} ); >- $line{budget_name} = $budget_name; >- >- push @loop_orders, \%line; >- } >- >- $template->param( >- loop_orders => \@loop_orders, >- ); >-} >- > $template->param( > invoiceid => $invoice->{invoiceid}, > invoice => $invoice->{invoicenumber}, >@@ -288,7 +189,6 @@ $template->param( > name => $bookseller->name, > booksellerid => $bookseller->id, > loop_received => \@loop_received, >- loop_orders => \@loop_orders, > book_foot_loop => \@book_foot_loop, > (uc(C4::Context->preference("marcflavour"))) => 1, > total_tax_excluded => $total_tax_excluded, >-- >2.26.2
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 20212
:
97545
|
97546
|
97547
|
97629
|
97630
|
97633
|
97634
|
97635
|
97745
|
98226
|
98230
|
98241
|
99724
|
99725
|
99727
|
100142
|
100475
|
100476
|
100477
|
100478
|
100552
|
100553
|
100554
|
100555
|
100600
|
100601
|
100602
|
100603
|
100605
|
100606
|
100643
|
101320
|
103684
|
103685
|
103686
|
103687
|
103688
|
109861
|
109862
|
109863
|
109864
|
109866
|
109867
|
109868
|
109869
|
109870
|
109936
|
110229
|
110234
|
110478
|
110482
|
111568
|
111569
|
112310
|
112521
|
112522
|
112523
|
112524
|
112686
|
112695
|
112698
|
112699
|
112700
|
112702
|
112703
|
112704
|
112705
|
112706
|
112868
|
112882
|
112987
|
113278
|
113279
|
114607
|
114608
|
114609
|
114610
|
114611
|
114612
|
114613
|
114614
|
114615
|
114616
|
114617
|
114942
|
114953
|
114954
|
114956
|
114959
|
114963
|
115050
|
115056
|
115057
|
115060
|
115062
|
115107
|
115108
|
115109
|
115817
|
115818
|
115819
|
115820
|
115821
|
115822
|
115886
|
115887
|
115888
|
115889
|
115890
|
115891
|
115892
|
115893
|
115894
|
115895
|
115896
|
115897
|
115898
|
115899
|
115900
|
115901
|
115902
|
115903
|
115904
|
115905
|
115906
|
115920
|
115921
|
115940
|
115941
|
115943
|
115944
|
115945
|
115946
|
115947
|
115948
|
115949
|
115950
|
115951
|
115952
|
115953
|
115954
|
115955
|
115956
|
115957
|
115958
|
115959
|
115960
|
115961
|
115962
|
115963
|
115964
|
115965
|
116139