@@ -, +, @@ reserves and show permanent location instead of cart location, and Holding library. field instead of permanent location. instead of current location. Also, if a change is assigned to the item, the change AND the regular state always show. The active state will be in bold. --- .../en/modules/course_reserves/course-details.tt | 41 +++++++++++++++++----- 1 file changed, 33 insertions(+), 8 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -104,9 +104,15 @@ [% IF cr.course_item.itype.defined %] [% IF cr.course_item.enabled == 'yes' %] - [% ItemTypes.GetDescription( cr.item.itype ) | html %] + [% ItemTypes.GetDescription( cr.item.itype) | html %] + [% IF cr.item.itype %] + ([% ItemTypes.GetDescription( cr.course_item.itype ) | html %]) + [% END %] [% ELSE %] [% ItemTypes.GetDescription( cr.course_item.itype ) | html %] + [% IF cr.item.itype %] + ([% ItemTypes.GetDescription( cr.item.itype) | html %] + [% END %] [% END %] [% ELSE %] Unchanged @@ -119,9 +125,15 @@ [% IF cr.course_item.ccode.defined %] [% IF cr.course_item.enabled == 'yes' %] - [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %] + [% IF cr.item.ccode %] + ([% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %]) + [% END %] [% ELSE %] - [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %] + [% IF cr.item.ccode %] + ([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %]) + [% END %] [% END %] [% ELSE %] Unchanged @@ -132,24 +144,36 @@ [% IF cr.course_item.location.defined %] - [% IF cr.course_item.enabled == 'yes' %] - [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %] + [% IF cr.course_item.enabled == 'yes' %] + [% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %] + [% IF cr.item.permanent_location %] + ([% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) | html %]) + [% END %] [% ELSE %] [% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) | html %] + [% IF cr.item.permanent_location %] + ([% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %]) + [% END %] [% END %] [% ELSE %] Unchanged - [% IF cr.item.location %] - ([% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %]) + [% IF cr.item.permanent_location %] + ([% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %]) [% END %] [% END %] [% IF cr.course_item.holdingbranch.defined %] [% IF cr.course_item.enabled == 'yes' %] - [% Branches.GetName( cr.item.holdingbranch ) | html %] + [% Branches.GetName( cr.item.holdingbranch ) | html %] + [% IF cr.item.holdingbranch %] + ([% Branches.GetName( cr.course_item.holdingbranch ) | html %]) + [% END %] [% ELSE %] [% Branches.GetName( cr.course_item.holdingbranch ) | html %] + [% IF cr.item.holdingbranch %] + ([% Branches.GetName( cr.item.holdingbranch ) | html %]) + [% END %] [% END %] [% ELSE %] Unchanged @@ -158,6 +182,7 @@ [% END %] [% END %] + [% IF (cr.staff_note) %] [% cr.staff_note | html %] [% ELSIF (cr.item.itemnotes_nonpublic) %] --