From a9c7cbe9d439bdefe1c2e005c0c0c406e7e5baa1 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 Signed-off-by: David Nind Signed-off-by: Nick Clemens --- admin/columns_settings.yml | 2 ++ .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 11 +++++++++++ .../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 a838a19f9b..b4dc72ed41 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -294,6 +294,8 @@ modules: columnname: not_for_loan - columnname: hide_in_opac + - + columnname: updatenotforloan - columnname: 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 79763e85e3..ce4cb88088 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -339,6 +339,15 @@ Item types › Administration › Koha [% END %] If checked, items will be automatically checked in once they've reached their due date. This feature requires the misc/cronjobs/automatic_checkin.pl cronjob. Ask your system administrator to schedule it. +
  • + + [% IF itemtype.updatenotforloan %] + + [% 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. +
  • @@ -477,6 +486,7 @@ Item types › Administration › Koha Search category Not for loan Hide in OPAC + Update not for loan status on checkin Rental charge Daily rental charge Hourly rental charge @@ -543,6 +553,7 @@ Item types › Administration › Koha [% AuthorisedValues.GetByCode( 'ITEMTYPECAT', itemtype.searchcategory ) | html %] [% IF ( itemtype.notforloan ) %]Yes[% ELSE %] [% END %] [% IF ( itemtype.hideinopac ) %]Yes[% ELSE %] [% END %] + [% IF ( itemtype.updatenotforloan ) %]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 bc3520c731..ac20ced2de 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 @@ -639,6 +639,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.30.2