@@ -, +, @@
accountlines
---
.../en/modules/members/accountline-details.tt | 16 +++-------------
.../prog/en/modules/members/mancredit.tt | 1 +
.../prog/en/modules/members/maninvoice.tt | 1 +
.../prog/en/modules/members/paycollect.tt | 1 +
members/accountline-details.pl | 3 +++
members/mancredit.pl | 8 ++++----
members/maninvoice.pl | 8 ++++----
members/paycollect.pl | 16 ++++++++--------
8 files changed, 25 insertions(+), 29 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
@@ -67,7 +67,6 @@
[% IF accountline %]
- [% af_values = accountline.additional_field_values %]
[% IF accountline.credit_type_code %]
Details of credit
[% ELSIF accountline.debit_type_code %]
@@ -83,8 +82,8 @@
Due date |
Return date |
Note |
- [% FOREACH value IN af_values %]
- [% value.field.name | html %] |
+ [% FOREACH field IN available_additional_fields %]
+ [% field.name | html %] |
[% END %]
Amount |
Outstanding |
@@ -134,16 +133,7 @@
[% accountline.note | html_line_break %]
|
-
- [% FOREACH value IN af_values %]
-
- [% IF value.field.authorised_value_category %]
- [% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %]
- [% ELSE %]
- [% value.value | html %]
- [% END %]
- |
- [% END %]
+ [% INCLUDE 'additional-fields-display.inc' available=available_additional_fields values=additional_field_values value_only=1 is_table_cell=1 %]
[% accountline.amount | $Price %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
@@ -134,6 +134,7 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'str/members-menu.inc' %]
[% Asset.js("js/members-menu.js") | $raw %]
+ [% Asset.js("js/additional-fields-entry.js") | $raw %]
|