View | Details | Raw Unified | Return to bug 15685
Collapse All | Expand All

(-)a/Koha/Edifact/Order.pm (-1 / +3 lines)
Lines 28-33 use Business::ISBN; Link Here
28
use Koha::Database;
28
use Koha::Database;
29
use C4::Budgets qw( GetBudget );
29
use C4::Budgets qw( GetBudget );
30
30
31
use Koha::Acquisition::Orders;
32
31
Readonly::Scalar my $seg_terminator      => q{'};
33
Readonly::Scalar my $seg_terminator      => q{'};
32
Readonly::Scalar my $separator           => q{+};
34
Readonly::Scalar my $separator           => q{+};
33
Readonly::Scalar my $component_separator => q{:};
35
Readonly::Scalar my $component_separator => q{:};
Lines 338-344 sub name_and_address { Link Here
338
sub order_line {
340
sub order_line {
339
    my ( $self, $linenumber, $orderline ) = @_;
341
    my ( $self, $linenumber, $orderline ) = @_;
340
342
341
    my $basket = Koha::Acquisition::Order->find( $orderline->ordernumber )->basket;
343
    my $basket = Koha::Acquisition::Orders->find( $orderline->ordernumber )->basket;
342
344
343
    my $schema = $self->{schema};
345
    my $schema = $self->{schema};
344
    if ( !$orderline->biblionumber )
346
    if ( !$orderline->biblionumber )
(-)a/acqui/orderreceive.pl (-1 / +2 lines)
Lines 74-79 use C4::Suggestions; Link Here
74
use C4::Koha;
74
use C4::Koha;
75
75
76
use Koha::Acquisition::Booksellers;
76
use Koha::Acquisition::Booksellers;
77
use Koha::Acquisition::Orders;
77
use Koha::DateUtils qw( dt_from_string );
78
use Koha::DateUtils qw( dt_from_string );
78
use Koha::ItemTypes;
79
use Koha::ItemTypes;
79
use Koha::Patrons;
80
use Koha::Patrons;
Lines 111-117 unless ( $results and @$results) { Link Here
111
112
112
# prepare the form for receiving
113
# prepare the form for receiving
113
my $order = $results->[0];
114
my $order = $results->[0];
114
my $basket = Koha::Acquisition::Order->fetch({ordernumber => $ordernumber})->basket;
115
my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket;
115
116
116
# Check if ACQ framework exists
117
# Check if ACQ framework exists
117
my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );
118
my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } );
(-)a/opac/opac-detail.pl (-3 / +2 lines)
Lines 54-60 use Koha::RecordProcessor; Link Here
54
use Koha::AuthorisedValues;
54
use Koha::AuthorisedValues;
55
use Koha::Biblios;
55
use Koha::Biblios;
56
use Koha::ItemTypes;
56
use Koha::ItemTypes;
57
use Koha::Acquisition::Order;
57
use Koha::Acquisition::Orders;
58
use Koha::Virtualshelves;
58
use Koha::Virtualshelves;
59
use Koha::Patrons;
59
use Koha::Patrons;
60
use Koha::Ratings;
60
use Koha::Ratings;
Lines 640-646 if ( C4::Context->preference('OPACAcquisitionDetails' ) ) { Link Here
640
    });
640
    });
641
    my $total_quantity = 0;
641
    my $total_quantity = 0;
642
    for my $order ( @$orders ) {
642
    for my $order ( @$orders ) {
643
        my $basket = Koha::Acquisition::Order->find( $order->{ordernumber} )->basket;
643
        my $basket = Koha::Acquisition::Orders->find( $order->{ordernumber} )->basket;
644
        if ( $basket->effective_create_items eq 'ordering' ) {
644
        if ( $basket->effective_create_items eq 'ordering' ) {
645
            for my $itemnumber ( C4::Acquisition::GetItemnumbersFromOrder( $order->{ordernumber} ) ) {
645
            for my $itemnumber ( C4::Acquisition::GetItemnumbersFromOrder( $order->{ordernumber} ) ) {
646
                push @itemnumbers_on_order, $itemnumber;
646
                push @itemnumbers_on_order, $itemnumber;
647
- 

Return to bug 15685