Bug 20194: Display both biblioitems.itemtype and items.itype in circulation screens

Test plan:
1. Verify that biblioitems.itemtype, items.itype are
   mapped to a MARC field. Otherwise create those mappings.
2. Create a biblio with an itemtype
3. Create an item with a different itemtype for this biblio
4. Check out this item to a patron (P1)
5. Verify that both itemtypes are displayed in the
checkouts table (moremember.pl, circulation.pl, returns.pl)
6. Create a patron whose guarantor is P1 and verify that both itemtypes
and the ccode are displayed in the 'relatives checkouts' table

Followed test plan, patch worked as described, also passes QA test tool
Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 4b86003..c1fdf39 100644 (file)
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -583,6 +583,8 @@ modules:
         -
           columnname: title
         -
+          columnname: record_type
+        -
           columnname: item_type
         -
           columnname: collection
@@ -796,6 +798,8 @@ modules:
         -
           columnname: title
         -
+          columnname: record_type
+        -
           columnname: item_type
         -
           columnname: collection
@@ -870,6 +874,8 @@ modules:
           columnname: dateaccessioned
           is_hidden: 1
         -
+          columnname: record_type
+        -
           columnname: itype
         -
           columnname: borrower

diff --git a/circ/returns.pl b/circ/returns.pl
index ddce95a..5e7d8e2 100755 (executable)
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -589,6 +589,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
         my $item = Koha::Items->find({ barcode => $bar_code });
         next unless $item; # FIXME The item has been deleted in the meantime,
                            # we could handle that better displaying a message in the template
+
         my $biblio = $item->biblio;
         # FIXME pass $item to the template and we are done here...
         $ri{itembiblionumber}    = $biblio->biblionumber;
@@ -599,7 +600,8 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
         $ri{itemauthor}          = $biblio->author;
         $ri{itemcallnumber}      = $item->itemcallnumber;
         $ri{dateaccessioned}     = $item->dateaccessioned;
-        $ri{itemtype}            = $item->effective_itemtype;
+        $ri{recordtype}          = $biblio->itemtype;
+        $ri{itemtype}            = $item->itype;
         $ri{itemnote}            = $item->itemnotes;
         $ri{itemnotes_nonpublic} = $item->itemnotes_nonpublic;
         $ri{ccode}               = $item->ccode;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
index 931d92f..9b62491 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
@@ -1,6 +1,6 @@
 <tfoot>
        <tr>
-        <td colspan="13" style="text-align: right; font-weight:bold;">Totals:</td>
+        <td colspan="14" style="text-align: right; font-weight:bold;">Totals:</td>
         <td id="totaldue" style="text-align: right;"></td>
         <td id="totalfine" style="text-align: right;"></td>
         <td id="totalprice" style="text-align: right;"></td>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
index f1bc60f..7b967be 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -15,6 +15,7 @@
                         <th scope="col">Due date</th>
                         <th scope="col">Due date</th>
                         <th scope="col">Title</th>
+                        <th scope="col">Record-level item type</th>
                         <th scope="col">Item type</th>
                         <th scope="col">Collection</th>
                         <th scope="col">Location</th>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc
index 28addf4..97e9ba6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc
@@ -7,6 +7,7 @@
                     <th scope="col">Due date (unformatted, hidden)</th>
                     <th scope="col">Due date</th>
                     <th scope="col">Title</th>
+                    <th scope="col">Record-level item type</th>
                     <th scope="col">Item type</th>
                     <th scope="col">Collection code</th>
                     <th scope="col">Location</th>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index bafaf0e..a65294b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -794,7 +794,8 @@
                                         <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-recordlevelitemtype">Record-level itemtype</th>
+                                        <th class="ci-itemtype">Item type</th>
                                         <th class="ci-patron">Patron</th>
                                         <th class="ci-note">Note</th>
                                     </tr>
@@ -844,7 +845,10 @@
                                         <td class="ci-dateaccessioned">
                                             [% riloo.dateaccessioned | $KohaDates %]
                                         </td>
-                                        <td class="ci-type">
+                                        <td class="ci-recordlevelitemtype">
+                                            [% ItemTypes.GetDescription( riloo.recordtype ) | html %]
+                                        </td>
+                                        <td class="ci-itemtype">
                                             [% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]
                                         </td>
                                         <td class="ci-patron">

diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
index 2bfd18e..d07f820 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
@@ -348,6 +348,11 @@ $(document).ready(function() {
                 },
                 {
                     "mDataProp": function ( oObj ) {
+                        return oObj.recordtype_description.escapeHtml();
+                    }
+                },
+                {
+                    "mDataProp": function ( oObj ) {
                         return oObj.itemtype_description.escapeHtml();
                     }
                 },
@@ -607,7 +612,7 @@ $(document).ready(function() {
 
                 // Build a summary of checkouts grouped by itemtype
                 var checkoutsByItype = json.aaData.reduce(function (obj, row) {
-                    obj[row.itemtype_description] = (obj[row.itemtype_description] || 0) + 1;
+                    obj[row.type_for_stat] = (obj[row.type_for_stat] || 0) + 1;
                     return obj;
                 }, {});
                 var ul = $('<ul>');
@@ -726,6 +731,11 @@ $(document).ready(function() {
                     },
                     {
                         "mDataProp": function ( oObj ) {
+                            return oObj.recordtype_description.escapeHtml();
+                        }
+                    },
+                    {
+                        "mDataProp": function ( oObj ) {
                             return oObj.itemtype_description.escapeHtml();
                         }
                     },

diff --git a/svc/checkouts b/svc/checkouts
index 053b589..2da2b01 100755 (executable)
--- a/svc/checkouts
+++ b/svc/checkouts
@@ -161,7 +161,9 @@ while ( my $c = $sth->fetchrow_hashref() ) {
     my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
       GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
 
-    my $itemtype = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );
+    my $type_for_stat = Koha::ItemTypes->find( $item_level_itypes ? $c->{itype} : $c->{itemtype} );
+    my $itemtype = Koha::ItemTypes->find( $c->{itype} );
+    my $recordtype = Koha::ItemTypes->find( $c->{itemtype} );
     my $location;
     if ( $c->{location} ) {
         my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
@@ -194,8 +196,9 @@ while ( my $c = $sth->fetchrow_hashref() ) {
         part_name            => $c->{part_name} // '',
         author               => $c->{author},
         barcode              => $c->{barcode},
-        itemtype             => $item_level_itypes ? $c->{itype} : $c->{itemtype},
+        type_for_stat        => $type_for_stat ? $type_for_stat->translated_description : q{},
         itemtype_description => $itemtype ? $itemtype->translated_description : q{},
+        recordtype_description => $recordtype ? $recordtype->translated_description : q{},
         collection           => $collection,
         location             => $location,
         homebranch           => $c->{homebranch},