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

(-)a/catalogue/detail.pl (-10 / +6 lines)
Lines 20-26 use strict; Link Here
20
use warnings;
20
use warnings;
21
21
22
use CGI;
22
use CGI;
23
use C4::Acquisition qw( GetHistory GetItemnumbersFromOrder );
23
use C4::Acquisition qw( GetHistory );
24
use C4::Auth;
24
use C4::Auth;
25
use C4::Dates qw/format_date/;
25
use C4::Dates qw/format_date/;
26
use C4::Koha;
26
use C4::Koha;
Lines 167-182 foreach my $subscription (@subscriptions) { Link Here
167
167
168
168
169
# Get acquisition details
169
# Get acquisition details
170
my ( $orders, $qty, $price, $received ) = C4::Acquisition::GetHistory( biblionumber => $biblionumber, get_canceled_order => 1 );
170
if ( C4::Context->preference('AcquisitionDetails') ) {
171
if ( C4::Context->preference('AcqCreateItem') eq 'ordering' ) {
171
    my ( $orders, $qty, $price, $received ) = C4::Acquisition::GetHistory( biblionumber => $biblionumber, get_canceled_order => 1 );
172
    for my $order ( @$orders ) {
172
    $template->param(
173
        $order->{itemnumbers} = [ C4::Acquisition::GetItemnumbersFromOrder( $order->{ordernumber} ) ];
173
        orders => $orders,
174
    }
174
    );
175
}
175
}
176
$template->param(
177
    orders => $orders,
178
    AcquisitionDetails => C4::Context->preference('AcquisitionDetails'),
179
);
180
176
181
if ( defined $dat->{'itemtype'} ) {
177
if ( defined $dat->{'itemtype'} ) {
182
    $dat->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtypes->{ $dat->{itemtype} }{imageurl} );
178
    $dat->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtypes->{ $dat->{itemtype} }{imageurl} );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-16 / +6 lines)
Lines 1-3 Link Here
1
[% USE Koha %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% USE AuthorisedValues %]
3
[% USE AuthorisedValues %]
3
[% USE KohaDates %]
4
[% USE KohaDates %]
Lines 256-262 function verify_images() { Link Here
256
            table.before(link);
257
            table.before(link);
257
            deactivate_filters(id);
258
            deactivate_filters(id);
258
        }
259
        }
259
        [% IF AcquisitionDetails %]
260
        [% IF Koha.Preference('AcquisitionDetails') %]
260
            $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
261
            $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
261
                'sDom': 't',
262
                'sDom': 't',
262
                'bPaginate': false,
263
                'bPaginate': false,
Lines 496-502 function verify_images() { Link Here
496
    [% END %]
497
    [% END %]
497
[% IF ( MARCNOTES || notes ) %]<li><a href="#description">Descriptions</a></li>[% END %]
498
[% IF ( MARCNOTES || notes ) %]<li><a href="#description">Descriptions</a></li>[% END %]
498
[% IF ( subscriptionsnumber ) %]<li><a href="#subscriptions">Subscriptions</a></li>[% END %]
499
[% IF ( subscriptionsnumber ) %]<li><a href="#subscriptions">Subscriptions</a></li>[% END %]
499
[% IF AcquisitionDetails %]<li><a href="#acq_details">Acquisition details</a></li>[% END %]
500
[% IF Koha.Preference('AcquisitionDetails') %]<li><a href="#acq_details">Acquisition details</a></li>[% END %]
500
[% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]<li><a href="#editions">Editions</a></li>[% END %][% END %]
501
[% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]<li><a href="#editions">Editions</a></li>[% END %][% END %]
501
[% IF ( LocalCoverImages ) %][% IF ( localimages || CAN_user_tools_upload_local_cover_images ) %]<li><a href="#images">Images</a></li>[% END %][% END %]
502
[% IF ( LocalCoverImages ) %][% IF ( localimages || CAN_user_tools_upload_local_cover_images ) %]<li><a href="#images">Images</a></li>[% END %][% END %]
502
[% IF ( HTML5MediaEnabled ) %][% IF ( HTML5MediaSets ) %]<li><a href="#html5media">Play media</a></li>[% END %][% END %]
503
[% IF ( HTML5MediaEnabled ) %][% IF ( HTML5MediaSets ) %]<li><a href="#html5media">Play media</a></li>[% END %][% END %]
Lines 825-831 function verify_images() { Link Here
825
</div>
826
</div>
826
[% END %]
827
[% END %]
827
828
828
[% IF AcquisitionDetails %]
829
[% IF Koha.Preference('AcquisitionDetails') %]
829
<div id="acq_details">
830
<div id="acq_details">
830
  [% IF orders %]
831
  [% IF orders %]
831
    <table id="orders">
832
    <table id="orders">
Lines 836-842 function verify_images() { Link Here
836
          <th>Creation date</th>
837
          <th>Creation date</th>
837
          <th>Receive date</th>
838
          <th>Receive date</th>
838
          <th>Status</th>
839
          <th>Status</th>
839
          <th>Quantity / items</th>
840
          <th>Quantity</th>
840
        </tr>
841
        </tr>
841
      </thead>
842
      </thead>
842
      <tbody>
843
      <tbody>
Lines 859-875 function verify_images() { Link Here
859
                [% CASE 'cancelled' %]Cancelled
860
                [% CASE 'cancelled' %]Cancelled
860
              [% END %]
861
              [% END %]
861
            </td>
862
            </td>
862
            <td>
863
            <td>[% order.quantity %]</th>
863
              [% order.quantity %]
864
              [% IF order.itemnumbers.size > 0 && order.orderstatus != 'cancelled' %]
865
                (
866
                  [% FOR itemnumber IN order.itemnumbers %]
867
                    <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber %]#item[% itemnumber %]">[% itemnumber %]</a>
868
                    [%- UNLESS loop.last %],[% END %]
869
                  [% END %]
870
                )
871
              [% END %]
872
            </th>
873
          </tr>
864
          </tr>
874
      [% END %]
865
      [% END %]
875
      </tbody>
866
      </tbody>
876
- 

Return to bug 11397