diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 4b8600367c..c1fdf398ca 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -582,6 +582,8 @@ modules: columnname: due_date - columnname: title + - + columnname: record_type - columnname: item_type - @@ -795,6 +797,8 @@ modules: columnname: due_date - columnname: title + - + columnname: record_type - columnname: item_type - @@ -869,6 +873,8 @@ modules: - columnname: dateaccessioned is_hidden: 1 + - + columnname: record_type - columnname: itype - diff --git a/circ/returns.pl b/circ/returns.pl index ddce95ab75..5e7d8e24bc 100755 --- 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 931d92f36c..9b62491d4a 100644 --- 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 @@ - Totals: + Totals: 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 f1bc60ff4b..7b967bec89 100644 --- 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 @@ Due date Due date Title + Record-level item type Item type Collection Location 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 28addf4815..97e9ba6bd1 100644 --- 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 @@ Due date (unformatted, hidden) Due date Title + Record-level item type Item type Collection code Location 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 bafaf0e955..a65294b985 100644 --- 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 @@ Shelving location Call number Date acquired - Type + Record-level itemtype + Item type Patron Note @@ -844,7 +845,10 @@ [% riloo.dateaccessioned | $KohaDates %] - + + [% ItemTypes.GetDescription( riloo.recordtype ) | html %] + + [% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 2bfd18e6cf..d07f8200cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -346,6 +346,11 @@ $(document).ready(function() { }, "sType": "anti-the" }, + { + "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 = $('