Attachment 67695 Details for Bug 15685 – Bug 15685: (followup) K:A:O->find and ->fetch are no longer used

[patch] Bug 15685: (followup) K:A:O->find and ->fetch are no longer used

Bug-15685-followup-KAO-find-and--fetch-are-no-long.patch (text/plain), 2.89 KB, created by Nick Clemens (kidclamp) on 2017-10-06 10:57:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2017-10-06 10:57:04 UTC

Size: 2.89 KB

patch

obsolete

>From ee818eb97a3b6d5e13eca4149b21f8ca0ef18682 Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Thu, 5 Oct 2017 11:12:35 -0300
>Subject: [PATCH] Bug 15685: (followup) K:A:O->find and ->fetch are no longer
> used
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> Koha/Edifact/Order.pm | 4 +++-
> acqui/orderreceive.pl | 3 ++-
> opac/opac-detail.pl   | 4 ++--
> 3 files changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/Koha/Edifact/Order.pm b/Koha/Edifact/Order.pm
>index 05169a5..ac63a94 100644
>--- a/Koha/Edifact/Order.pm
>+++ b/Koha/Edifact/Order.pm
>@@ -28,6 +28,8 @@ use Business::ISBN;
> use Koha::Database;
> use C4::Budgets qw( GetBudget );
> 
>+use Koha::Acquisition::Orders;
>+
> Readonly::Scalar my $seg_terminator      => q{'};
> Readonly::Scalar my $separator           => q{+};
> Readonly::Scalar my $component_separator => q{:};
>@@ -338,7 +340,7 @@ sub name_and_address {
> sub order_line {
>     my ( $self, $linenumber, $orderline ) = @_;
> 
>-    my $basket = Koha::Acquisition::Order->find( $orderline->ordernumber )->basket;
>+    my $basket = Koha::Acquisition::Orders->find( $orderline->ordernumber )->basket;
> 
>     my $schema = $self->{schema};
>     if ( !$orderline->biblionumber )
>diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
>index 4f9d4fd..7952e1d 100755
>--- a/acqui/orderreceive.pl
>+++ b/acqui/orderreceive.pl
>@@ -74,6 +74,7 @@ use C4::Suggestions;
> use C4::Koha;
> 
> use Koha::Acquisition::Booksellers;
>+use Koha::Acquisition::Orders;
> use Koha::DateUtils qw( dt_from_string );
> use Koha::ItemTypes;
> use Koha::Patrons;
>@@ -111,7 +112,7 @@ unless ( $results and @$results) {
> 
> # prepare the form for receiving
> my $order = $results->[0];
>-my $basket = Koha::Acquisition::Order->fetch({ordernumber => $ordernumber})->basket;
>+my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;
> 
> # Check if ACQ framework exists
> my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );
>diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
>index f7020a8..43e8ee6 100755
>--- a/opac/opac-detail.pl
>+++ b/opac/opac-detail.pl
>@@ -54,7 +54,7 @@ use Koha::RecordProcessor;
> use Koha::AuthorisedValues;
> use Koha::Biblios;
> use Koha::ItemTypes;
>-use Koha::Acquisition::Order;
>+use Koha::Acquisition::Orders;
> use Koha::Virtualshelves;
> use Koha::Patrons;
> use Koha::Ratings;
>@@ -640,7 +640,7 @@ if ( C4::Context->preference('OPACAcquisitionDetails' ) ) {
>     });
>     my $total_quantity = 0;
>     for my $order ( @$orders ) {
>-        my $basket = Koha::Acquisition::Order->find( $order->{ordernumber} )->basket;
>+        my $basket = Koha::Acquisition::Orders->find( $order->{ordernumber} )->basket;
>         if ( $basket->effective_create_items eq 'ordering' ) {
>             for my $itemnumber ( C4::Acquisition::GetItemnumbersFromOrder( $order->{ordernumber} ) ) {
>                 push @itemnumbers_on_order, $itemnumber;
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15685: 47783 | 55094 | 55096 | 57390 | 57392 | 57395 | 57424 | 57425 | 57426 | 57427 | 64918 | 64919 | 64920 | 64921 | 64922 | 65119 | 65120 | 65121 | 65122 | 65895 | 65896 | 65897 | 65898 | 65899 | 65900 | 66119 | 66120 | 66121 | 66122 | 66123 | 66124 | 67638 | 67639 | 67640 | 67641 | 67642 | 67643 | 67644 | 67645 | 67646 | 67647 | 67689 | 67690 | 67691 | 67692 | 67693 | 67694 | 67695 | 67696 | 67697 | 67698 | 67884 | 67898 | 67899 | 67900 | 67901 | 67902 | 67903 | 67904 | 67905 | 67906 | 67907 | 67908 | 67909 | 67910 | 67911