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

(-)a/admin/columns_settings.yml (+6 lines)
Lines 550-555 modules: Link Here
550
        -
550
        -
551
          columnname: title
551
          columnname: title
552
        -
552
        -
553
          columnname: record_type
554
        -
553
          columnname: item_type
555
          columnname: item_type
554
        -
556
        -
555
          columnname: collection
557
          columnname: collection
Lines 763-768 modules: Link Here
763
        -
765
        -
764
          columnname: title
766
          columnname: title
765
        -
767
        -
768
          columnname: record_type
769
        -
766
          columnname: item_type
770
          columnname: item_type
767
        -
771
        -
768
          columnname: collection
772
          columnname: collection
Lines 837-842 modules: Link Here
837
          columnname: dateaccessioned
841
          columnname: dateaccessioned
838
          is_hidden: 1
842
          is_hidden: 1
839
        -
843
        -
844
          columnname: record_type
845
        -
840
          columnname: itype
846
          columnname: itype
841
        -
847
        -
842
          columnname: borrower
848
          columnname: borrower
(-)a/circ/returns.pl (-1 / +3 lines)
Lines 587-592 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
587
        my $item = Koha::Items->find({ barcode => $bar_code });
587
        my $item = Koha::Items->find({ barcode => $bar_code });
588
        next unless $item; # FIXME The item has been deleted in the meantime,
588
        next unless $item; # FIXME The item has been deleted in the meantime,
589
                           # we could handle that better displaying a message in the template
589
                           # we could handle that better displaying a message in the template
590
590
        my $biblio = $item->biblio;
591
        my $biblio = $item->biblio;
591
        # FIXME pass $item to the template and we are done here...
592
        # FIXME pass $item to the template and we are done here...
592
        $ri{itembiblionumber}    = $biblio->biblionumber;
593
        $ri{itembiblionumber}    = $biblio->biblionumber;
Lines 594-600 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
594
        $ri{itemauthor}          = $biblio->author;
595
        $ri{itemauthor}          = $biblio->author;
595
        $ri{itemcallnumber}      = $item->itemcallnumber;
596
        $ri{itemcallnumber}      = $item->itemcallnumber;
596
        $ri{dateaccessioned}     = $item->dateaccessioned;
597
        $ri{dateaccessioned}     = $item->dateaccessioned;
597
        $ri{itemtype}            = $item->effective_itemtype;
598
        $ri{recordtype}          = $biblio->itemtype;
599
        $ri{itemtype}            = $item->itype;
598
        $ri{itemnote}            = $item->itemnotes;
600
        $ri{itemnote}            = $item->itemnotes;
599
        $ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;
601
        $ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;
600
        $ri{ccode}               = $item->ccode;
602
        $ri{ccode}               = $item->ccode;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
<tfoot>
1
<tfoot>
2
	<tr>
2
	<tr>
3
        <td colspan="13" style="text-align: right; font-weight:bold;">Totals:</td>
3
        <td colspan="14" style="text-align: right; font-weight:bold;">Totals:</td>
4
        <td id="totaldue" style="text-align: right;"></td>
4
        <td id="totaldue" style="text-align: right;"></td>
5
        <td id="totalfine" style="text-align: right;"></td>
5
        <td id="totalfine" style="text-align: right;"></td>
6
        <td id="totalprice" style="text-align: right;"></td>
6
        <td id="totalprice" style="text-align: right;"></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (+1 lines)
Lines 15-20 Link Here
15
                        <th scope="col">Due date</th>
15
                        <th scope="col">Due date</th>
16
                        <th scope="col">Due date</th>
16
                        <th scope="col">Due date</th>
17
                        <th scope="col">Title</th>
17
                        <th scope="col">Title</th>
18
                        <th scope="col">Record-level item type</th>
18
                        <th scope="col">Item type</th>
19
                        <th scope="col">Item type</th>
19
                        <th scope="col">Collection</th>
20
                        <th scope="col">Collection</th>
20
                        <th scope="col">Location</th>
21
                        <th scope="col">Location</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc (+1 lines)
Lines 7-12 Link Here
7
                    <th scope="col">Due date (unformatted, hidden)</th>
7
                    <th scope="col">Due date (unformatted, hidden)</th>
8
                    <th scope="col">Due date</th>
8
                    <th scope="col">Due date</th>
9
                    <th scope="col">Title</th>
9
                    <th scope="col">Title</th>
10
                    <th scope="col">Record-level item type</th>
10
                    <th scope="col">Item type</th>
11
                    <th scope="col">Item type</th>
11
                    <th scope="col">Collection code</th>
12
                    <th scope="col">Collection code</th>
12
                    <th scope="col">Location</th>
13
                    <th scope="col">Location</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +6 lines)
Lines 767-773 Link Here
767
                                        <th class="ci-shelvinglocation">Shelving location</th>
767
                                        <th class="ci-shelvinglocation">Shelving location</th>
768
                                        <th class="ci-callnumber">Call number</th>
768
                                        <th class="ci-callnumber">Call number</th>
769
                                        <th class="ci-dateaccessioned">Date acquired</th>
769
                                        <th class="ci-dateaccessioned">Date acquired</th>
770
                                        <th class="ci-type">Type</th>
770
                                        <th class="ci-recordlevelitemtype">Record-level itemtype</th>
771
                                        <th class="ci-itemtype">Item type</th>
771
                                        <th class="ci-patron">Patron</th>
772
                                        <th class="ci-patron">Patron</th>
772
                                        <th class="ci-note">Note</th>
773
                                        <th class="ci-note">Note</th>
773
                                    </tr>
774
                                    </tr>
Lines 814-820 Link Here
814
                                        <td class="ci-dateaccessioned">
815
                                        <td class="ci-dateaccessioned">
815
                                            [% riloo.dateaccessioned | $KohaDates %]
816
                                            [% riloo.dateaccessioned | $KohaDates %]
816
                                        </td>
817
                                        </td>
817
                                        <td class="ci-type">
818
                                        <td class="ci-recordlevelitemtype">
819
                                            [% ItemTypes.GetDescription( riloo.recordtype ) | html %]
820
                                        </td>
821
                                        <td class="ci-itemtype">
818
                                            [% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]
822
                                            [% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]
819
                                        </td>
823
                                        </td>
820
                                        <td class="ci-patron">
824
                                        <td class="ci-patron">
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +11 lines)
Lines 344-349 $(document).ready(function() { Link Here
344
                },
344
                },
345
                {
345
                {
346
                    "mDataProp": function ( oObj ) {
346
                    "mDataProp": function ( oObj ) {
347
                        return oObj.recordtype_description.escapeHtml();
348
                    }
349
                },
350
                {
351
                    "mDataProp": function ( oObj ) {
347
                        return oObj.itemtype_description.escapeHtml();
352
                        return oObj.itemtype_description.escapeHtml();
348
                    }
353
                    }
349
                },
354
                },
Lines 589-595 $(document).ready(function() { Link Here
589
594
590
                // Build a summary of checkouts grouped by itemtype
595
                // Build a summary of checkouts grouped by itemtype
591
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
596
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
592
                    obj[row.itemtype_description] = (obj[row.itemtype_description] || 0) + 1;
597
                    obj[row.type_for_stat] = (obj[row.type_for_stat] || 0) + 1;
593
                    return obj;
598
                    return obj;
594
                }, {});
599
                }, {});
595
                var ul = $('<ul>');
600
                var ul = $('<ul>');
Lines 708-713 $(document).ready(function() { Link Here
708
                    },
713
                    },
709
                    {
714
                    {
710
                        "mDataProp": function ( oObj ) {
715
                        "mDataProp": function ( oObj ) {
716
                            return oObj.recordtype_description.escapeHtml();
717
                        }
718
                    },
719
                    {
720
                        "mDataProp": function ( oObj ) {
711
                            return oObj.itemtype_description.escapeHtml();
721
                            return oObj.itemtype_description.escapeHtml();
712
                        }
722
                        }
713
                    },
723
                    },
(-)a/svc/checkouts (-3 / +5 lines)
Lines 153-159 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
153
    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
153
    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
154
      GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
154
      GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
155
155
156
    my $itemtype = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );
156
    my $type_for_stat = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );
157
    my $itemtype = Koha::ItemTypes->find( $c->{itype} );
158
    my $recordtype = Koha::ItemTypes->find( $c->{itemtype} );
157
    my $location;
159
    my $location;
158
    if ( $c->{location} ) {
160
    if ( $c->{location} ) {
159
        my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
161
        my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
Lines 184-191 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
184
        part_name            => $c->{part_name} // '',
186
        part_name            => $c->{part_name} // '',
185
        author               => $c->{author},
187
        author               => $c->{author},
186
        barcode              => $c->{barcode},
188
        barcode              => $c->{barcode},
187
        itemtype             => $item_level_itypes ? $c->{itype} : $c->{itemtype},
189
        type_for_stat        => $type_for_stat ? $type_for_stat->translated_description : q{},
188
        itemtype_description => $itemtype ? $itemtype->translated_description : q{},
190
        itemtype_description => $itemtype ? $itemtype->translated_description : q{},
191
        recordtype_description => $recordtype ? $recordtype->translated_description : q{},
189
        collection           => $collection,
192
        collection           => $collection,
190
        location             => $location,
193
        location             => $location,
191
        homebranch           => $c->{homebranch},
194
        homebranch           => $c->{homebranch},
192
- 

Return to bug 20194