From 341e54ec4523d61f8a3bb7df130a45cdf8ff5c3f Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 3 Nov 2020 09:57:32 +0000 Subject: [PATCH] Bug 26939: Use AV description in sales table display Content should use the description rather than the code Test plan 1/ Enable 'UseCashRegisters' 2/ Make some payments against a cash register 3/ Navigate to the cash register summary page via tools > cashup registers > register name 4/ Note that the payment type you selected at payment time appears as the code of the authorized value as aposed to the description. 5/ Apply patch 6/ Refresh page 7/ The payment type should now contain the description Signed-off-by: David Nind Signed-off-by: Josef Moravec --- koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt index aad75188c3..b12ef010e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt @@ -90,7 +90,7 @@ [% IF credit.debit %] [% accountline.accountlines_id | html %] - { "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" } + { "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) %])", "amount": "[% accountline.amount * -1 | $Price %]" } [%- PROCESS account_type_description account=credit.debit -%] @@ -114,7 +114,7 @@ [% IF debit.credit %] [% accountline.accountlines_id | html %] - { "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" } + { "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) %])", "amount": "[% accountline.amount * -1 | $Price %]" } [%- PROCESS account_type_description account=debit.credit -%] -- 2.11.0