@@ -, +, @@
additional fields
---
.../prog/en/modules/serials/subscription-detail.tt | 13 ++-----------
serials/subscription-detail.pl | 11 +++++++++--
2 files changed, 11 insertions(+), 13 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -124,23 +124,14 @@
- [% IF additional_fields_for_subscription %]
+ [% IF available_additional_fields %]
Additional fields:
- [% FOR field IN additional_fields_for_subscription %]
- -
- [% field.name | html %]:
- [% IF field.authorised_value_category %]
- [% AuthorisedValues.GetByCode( field.authorised_value_category, additional_fields.${field.name} ) | html %]
- [% ELSE %]
- [% additional_fields.${field.name} | html %]
- [% END %]
-
- [% END %]
+ [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values %]
--- a/serials/subscription-detail.pl
+++ a/serials/subscription-detail.pl
@@ -30,6 +30,7 @@ use Koha::AdditionalFields;
use Koha::AuthorisedValues;
use Koha::DateUtils;
use Koha::Acquisition::Bookseller;
+use Koha::Subscriptions;
use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
use Carp;
@@ -121,8 +122,14 @@ my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($su
my $default_bib_view = get_default_view();
-my $additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription' } );
-$template->param( additional_fields_for_subscription => $additional_fields );
+my $subscription_object = Koha::Subscriptions->find( $subscriptionid );
+$template->param(
+ available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'subscription' } ) ],
+ additional_field_values => {
+ map { $_->field->name => $_->value }
+ $subscription_object->additional_field_values->as_list
+ },
+);
# FIXME Do we want to hide canceled orders?
my $orders = Koha::Acquisition::Orders->search( { subscriptionid => $subscriptionid } );
--