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

(-)a/Koha/Acquisition/Basket.pm (+17 lines)
Lines 96-101 sub orders { Link Here
96
    return Koha::Acquisition::Orders->_new_from_dbic( $orders_rs );
96
    return Koha::Acquisition::Orders->_new_from_dbic( $orders_rs );
97
}
97
}
98
98
99
=head3 edi_order
100
101
  my $edi_order = $basket->edi_order;
102
103
Returns the most recently attached EDI order object if one exists for the basket.
104
105
=cut
106
107
sub edi_order {
108
    my ($self) = @_;
109
110
    my $order_rs =
111
      $self->_result->edifact_messages( { message_type => 'ORDERS' },
112
        { order_by => { '-desc' => 'transfer_date' }, rows => 1 } );
113
    return $order_rs->single;
114
}
115
99
=head3 effective_create_items
116
=head3 effective_create_items
100
117
101
Returns C<create_items> for this basket, falling back to C<AcqCreateItem> if unset.
118
Returns C<create_items> for this basket, falling back to C<AcqCreateItem> if unset.
(-)a/acqui/basket.pl (+4 lines)
Lines 380-385 if ( $op eq 'list' ) { Link Here
380
        last;
380
        last;
381
    }
381
    }
382
382
383
    my $basket_obj = Koha::Acquisition::Baskets->find($basketno);
384
    my $edi_order = $basket_obj->edi_order;
385
383
    $template->param(
386
    $template->param(
384
        basketno             => $basketno,
387
        basketno             => $basketno,
385
        basket               => $basket,
388
        basket               => $basket,
Lines 391-396 if ( $op eq 'list' ) { Link Here
391
        basketcontractname   => $contract->{contractname},
394
        basketcontractname   => $contract->{contractname},
392
        branches_loop        => \@branches_loop,
395
        branches_loop        => \@branches_loop,
393
        creationdate         => $basket->{creationdate},
396
        creationdate         => $basket->{creationdate},
397
        edi_order            => $edi_order,
394
        authorisedby         => $basket->{authorisedby},
398
        authorisedby         => $basket->{authorisedby},
395
        authorisedbyname     => $basket->{authorisedbyname},
399
        authorisedbyname     => $basket->{authorisedbyname},
396
        users_ids            => join(':', @basketusers_ids),
400
        users_ids            => join(':', @basketusers_ids),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +7 lines)
Lines 314-319 Link Here
314
                        [% IF ( closedate ) %]
314
                        [% IF ( closedate ) %]
315
                            <li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>
315
                            <li><span class="label">Closed on:</span> [% closedate | $KohaDates %]</li>
316
                        [% END %]
316
                        [% END %]
317
                        [% IF ( ediaccount ) %]
318
                            [% IF ( edi_order && !edi_order.deleted ) %]
319
                            <li><span class="label">EDI status:</span> [% edi_order.status | html %] ([% edi_order.transfer_date | $KohaDates %])</li>
320
                            [% ELSE %]
321
                            <li><span class="label">EDI status:</span> Not ordered</li>
322
                            [% END %]
323
                        [% END %]
317
                        [% IF ( estimateddeliverydate ) %]
324
                        [% IF ( estimateddeliverydate ) %]
318
                            <li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li>
325
                            <li><span class="label">Estimated delivery date:</span> [% estimateddeliverydate | $KohaDates %]</li>
319
                        [% END %]
326
                        [% END %]
320
- 

Return to bug 28640