From 533837892078672f9ca7e1d85ce584efe8fac8cd Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Thu, 21 May 2020 23:54:43 +0000 Subject: [PATCH] Bug 25560: Template & syspref yaml changes Sponsored-By: Waikato Institute of Technology, NZ --- admin/columns_settings.yml | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 11 +++++++++++ .../prog/en/modules/admin/preferences/circulation.pref | 1 + 3 files changed, 14 insertions(+) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 96b3a31a681..5b1e6c0d53d 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -226,6 +226,8 @@ modules: - columnname: hide_in_opac - + columnname: updatenotforloanstatusoncheckin + - columnname: rental_charge - columnname: daily_rental_charge diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index 53ab7d2ea02..fe11ce239d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -254,6 +254,15 @@ Item types administration If checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item.
  • + + [% IF itemtype.updatenotforloanstatusoncheckin %] + + [% ELSE %] + + [% END %] + Dependent on the UpdateNotForLoanStatusOnCheckin system preference being configured. If checked, items of this type will be updated by UpdateNotForLoanStatusOnCheckin syspref upon checkin. If not checked, items of this type will be excluded from update on checkin. +
  • +
  • This fee is charged once per checkout/renewal per item @@ -397,6 +406,7 @@ Item types administration Search category Not for loan Hide in OPAC + Update not for loan status on checkin Rental charge Daily rental charge Hourly rental charge @@ -462,6 +472,7 @@ Item types administration [% itemtype.searchcategory | html %] [% IF ( itemtype.notforloan ) %]Yes[% ELSE %] [% END %] [% IF ( itemtype.hideinopac ) %]Yes[% ELSE %] [% END %] + [% IF ( itemtype.updatenotforloanstatusoncheckin ) %]Yes[% ELSE %]  [% END %] [% UNLESS ( itemtype.notforloan ) %] [% itemtype.rentalcharge | $Price %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 710b86cbe11..6a122157d9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -601,6 +601,7 @@ Circulation: - This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value - "it will be updated to the right-hand value. For example, '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan." - Each pair of values should be on a separate line. + - Enable itemtypes to be updated upon checkin on the item type page (Administration > Item types) - - pref: CumulativeRestrictionPeriods choices: -- 2.11.0