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

(-)a/admin/columns_settings.yml (+6 lines)
Lines 329-334 modules: Link Here
329
        -
329
        -
330
          columnname: title
330
          columnname: title
331
        -
331
        -
332
          columnname: record_type
333
        -
332
          columnname: item_type
334
          columnname: item_type
333
        -
335
        -
334
          columnname: collection
336
          columnname: collection
Lines 486-491 modules: Link Here
486
        -
488
        -
487
          columnname: title
489
          columnname: title
488
        -
490
        -
491
          columnname: record_type
492
        -
489
          columnname: item_type
493
          columnname: item_type
490
        -
494
        -
491
          columnname: collection
495
          columnname: collection
Lines 538-543 modules: Link Here
538
          columnname: dateaccessioned
542
          columnname: dateaccessioned
539
          is_hidden: 1
543
          is_hidden: 1
540
        -
544
        -
545
          columnname: record_type
546
        -
541
          columnname: itype
547
          columnname: itype
542
        -
548
        -
543
          columnname: borrower
549
          columnname: borrower
(-)a/circ/returns.pl (-1 / +3 lines)
Lines 582-587 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
582
        my $item = Koha::Items->find({ barcode => $bar_code });
582
        my $item = Koha::Items->find({ barcode => $bar_code });
583
        next unless $item; # FIXME The item has been deleted in the meantime,
583
        next unless $item; # FIXME The item has been deleted in the meantime,
584
                           # we could handle that better displaying a message in the template
584
                           # we could handle that better displaying a message in the template
585
585
        my $biblio = $item->biblio;
586
        my $biblio = $item->biblio;
586
        # FIXME pass $item to the template and we are done here...
587
        # FIXME pass $item to the template and we are done here...
587
        $ri{itembiblionumber}    = $biblio->biblionumber;
588
        $ri{itembiblionumber}    = $biblio->biblionumber;
Lines 589-595 foreach ( sort { $a <=> $b } keys %returneditems ) { Link Here
589
        $ri{itemauthor}          = $biblio->author;
590
        $ri{itemauthor}          = $biblio->author;
590
        $ri{itemcallnumber}      = $item->itemcallnumber;
591
        $ri{itemcallnumber}      = $item->itemcallnumber;
591
        $ri{dateaccessioned}     = $item->dateaccessioned;
592
        $ri{dateaccessioned}     = $item->dateaccessioned;
592
        $ri{itemtype}            = $item->effective_itemtype;
593
        $ri{recordtype}          = $biblio->itemtype;
594
        $ri{itemtype}            = $item->itype;
593
        $ri{itemnote}            = $item->itemnotes;
595
        $ri{itemnote}            = $item->itemnotes;
594
        $ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;
596
        $ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;
595
        $ri{ccode}               = $item->ccode;
597
        $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="11" style="text-align: right; font-weight:bold;">Totals:</td>
3
        <td colspan="13" style="text-align: right; font-weight:bold;">Totals:</td>
4
        <td id="totaldue" style="text-align: right;">[% totaldue | html %]</td>
4
        <td id="totaldue" style="text-align: right;">[% totaldue | html %]</td>
5
        <td id="totalfine" style="text-align: right;">[% finetotal | html %]</td>
5
        <td id="totalfine" style="text-align: right;">[% finetotal | html %]</td>
6
        <td id="totalprice" style="text-align: right;">[% totalprice | html %]</td>
6
        <td id="totalprice" style="text-align: right;">[% totalprice | html %]</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 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/modules/circ/circulation.tt (+1 lines)
Lines 851-856 No patron matched <span class="ex">[% message | html %]</span> Link Here
851
                    <th scope="col">Due date (unformatted, hidden)</th>
851
                    <th scope="col">Due date (unformatted, hidden)</th>
852
                    <th scope="col">Due date</th>
852
                    <th scope="col">Due date</th>
853
                    <th scope="col">Title</th>
853
                    <th scope="col">Title</th>
854
                    <th scope="col">Record type</th>
854
                    <th scope="col">Item type</th>
855
                    <th scope="col">Item type</th>
855
                    <th scope="col">Collection code</th>
856
                    <th scope="col">Collection code</th>
856
                    <th scope="col">Location</th>
857
                    <th scope="col">Location</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +3 lines)
Lines 683-689 Link Here
683
[% IF ( riloop ) %]
683
[% IF ( riloop ) %]
684
    <h2>Checked-in items</h2>
684
    <h2>Checked-in items</h2>
685
    <table id="checkedintable">
685
    <table id="checkedintable">
686
    <thead><tr><th class="ci-duedate">Due date</th><th class="ci-title">Title</th><th class="ci-author">Author</th><th class="ci-barcode">Barcode</th><th class="ci-homelibrary">Home library</th><th class="ci-holdinglibrary">Holding library</th><th class="ci-shelvinglocation">Shelving location</th><th class="ci-callnumber">Call number</th><th class="ci-dateaccessioned">Date acquired</th><th class="ci-type">Type</th><th class="ci-patron">Patron</th><th class="ci-note">Note</th></tr></thead>
686
    <thead><tr><th class="ci-duedate">Due date</th><th class="ci-title">Title</th><th class="ci-author">Author</th><th class="ci-barcode">Barcode</th><th class="ci-homelibrary">Home library</th><th class="ci-holdinglibrary">Holding library</th><th class="ci-shelvinglocation">Shelving location</th><th class="ci-callnumber">Call number</th><th class="ci-dateaccessioned">Date acquired</th><th class="ci-recodtype">Record type</th><th class="ci-itemtype">Item type</th><th class="ci-patron">Patron</th><th class="ci-note">Note</th></tr></thead>
687
687
688
        [% FOREACH riloo IN riloop %]
688
        [% FOREACH riloo IN riloop %]
689
            <tr>
689
            <tr>
Lines 710-716 Link Here
710
            <td class="ci-shelvinglocation">[% riloo.location | html %]</td>
710
            <td class="ci-shelvinglocation">[% riloo.location | html %]</td>
711
            <td class="ci-callnumber">[% riloo.itemcallnumber | html %]</td>
711
            <td class="ci-callnumber">[% riloo.itemcallnumber | html %]</td>
712
            <td class="ci-dateaccessioned">[% riloo.dateaccessioned | $KohaDates %]</td>
712
            <td class="ci-dateaccessioned">[% riloo.dateaccessioned | $KohaDates %]</td>
713
            <td class="ci-type">[% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]</td>
713
            <td class="ci-recordtype">[% ItemTypes.GetDescription( riloo.recordtype ) | html %]</td>
714
            <td class="ci-itemtype">[% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]</td>
714
            <td class="ci-patron">[% IF ( riloo.duedate ) %]
715
            <td class="ci-patron">[% IF ( riloo.duedate ) %]
715
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | html %]">
716
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | html %]">
716
                    [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %])
717
                    [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %])
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+2 lines)
Lines 690-696 Link Here
690
                                            <th scope="col">Due date hidden not formatted</th>
690
                                            <th scope="col">Due date hidden not formatted</th>
691
                                            <th scope="col">Due date</th>
691
                                            <th scope="col">Due date</th>
692
                                            <th scope="col">Title</th>
692
                                            <th scope="col">Title</th>
693
                                            <th scope="col">Record type</th>
693
                                            <th scope="col">Item type</th>
694
                                            <th scope="col">Item type</th>
695
                                            <th scope="col">Collection</th>
694
                                            <th scope="col">Location</th>
696
                                            <th scope="col">Location</th>
695
                                            <th scope="col">Checked out on</th>
697
                                            <th scope="col">Checked out on</th>
696
                                            <th scope="col">Checked out from</th>
698
                                            <th scope="col">Checked out from</th>
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +11 lines)
Lines 292-297 $(document).ready(function() { Link Here
292
                },
292
                },
293
                {
293
                {
294
                    "mDataProp": function ( oObj ) {
294
                    "mDataProp": function ( oObj ) {
295
                        return oObj.recordtype_description.escapeHtml();
296
                    }
297
                },
298
                {
299
                    "mDataProp": function ( oObj ) {
295
                        return oObj.itemtype_description.escapeHtml();
300
                        return oObj.itemtype_description.escapeHtml();
296
                    }
301
                    }
297
                },
302
                },
Lines 516-522 $(document).ready(function() { Link Here
516
521
517
                // Build a summary of checkouts grouped by itemtype
522
                // Build a summary of checkouts grouped by itemtype
518
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
523
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
519
                    obj[row.itemtype_description] = (obj[row.itemtype_description] || 0) + 1;
524
                    obj[row.type_for_stat] = (obj[row.type_for_stat] || 0) + 1;
520
                    return obj;
525
                    return obj;
521
                }, {});
526
                }, {});
522
                var ul = $('<ul>');
527
                var ul = $('<ul>');
Lines 633-638 $(document).ready(function() { Link Here
633
                    },
638
                    },
634
                    {
639
                    {
635
                        "mDataProp": function ( oObj ) {
640
                        "mDataProp": function ( oObj ) {
641
                            return oObj.recordtype_description.escapeHtml();
642
                        }
643
                    },
644
                    {
645
                        "mDataProp": function ( oObj ) {
636
                            return oObj.itemtype_description.escapeHtml();
646
                            return oObj.itemtype_description.escapeHtml();
637
                        }
647
                        }
638
                    },
648
                    },
(-)a/svc/checkouts (-3 / +5 lines)
Lines 150-156 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
150
    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
150
    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
151
      GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
151
      GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
152
152
153
    my $itemtype = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );
153
    my $type_for_stat = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );
154
    my $itemtype = Koha::ItemTypes->find( $c->{itype} );
155
    my $recordtype = Koha::ItemTypes->find( $c->{itemtype} );
154
    my $location;
156
    my $location;
155
    if ( $c->{location} ) {
157
    if ( $c->{location} ) {
156
        my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
158
        my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
Lines 176-183 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
176
        title                => $c->{title},
178
        title                => $c->{title},
177
        author               => $c->{author},
179
        author               => $c->{author},
178
        barcode              => $c->{barcode},
180
        barcode              => $c->{barcode},
179
        itemtype             => $item_level_itypes ? $c->{itype} : $c->{itemtype},
181
        type_for_stat        => $type_for_stat ? $type_for_stat->translated_description : q{},
180
        itemtype_description => $itemtype ? $itemtype->translated_description : q{},
182
        itemtype_description => $itemtype ? $itemtype->translated_description : q{},
183
        recordtype_description => $recordtype ? $recordtype->translated_description : q{},
181
        collection           => $collection,
184
        collection           => $collection,
182
        location             => $location,
185
        location             => $location,
183
        homebranch           => $c->{homebranch},
186
        homebranch           => $c->{homebranch},
184
- 

Return to bug 20194