Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 26418: Fix translatability of REFUND credit type

Browse source 
The description of REFUND type accountline credits introduced with the "issue refund" feature is not translatable.

To test:
- Make sure a language with a complete translation is installed
- Switch to the language
- Go to any user account
- Add a manual invoice
- Pay it off fully or partially
- Click on "issue refund"
- Confirm the refund
- Check the description of the line in the patron account is not translated.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Martin Renvoize 2020-09-09 15:34:13 +01:00 committed by Jonathan Druart
parent 340c8019d2
commit 34b9c061f3
3 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
View file

@ -7,7 +7,7 @@
[%- CASE 'FORGIVEN' -%]Forgiven
[%- CASE 'CREDIT' -%]Credit
[%- CASE 'LOST_FOUND' -%]Lost item fee refund
[%- CASE 'Refund' -%]Refund
[%- CASE 'REFUND' -%]Refund
[%- CASE -%][% account.credit_type.description | html %]
[%- END -%]
[%- ELSIF account.debit_type_code -%]

43
koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
View file

@ -179,27 +179,33 @@
[%- CASE 'FORGIVEN' -%]Forgiven
[%- CASE 'CREDIT' -%]Credit
[%- CASE 'LOST_FOUND' -%]Lost item fee refund
[%- CASE 'REFUND' -%]Refund
[%- CASE -%][% account.credit_type.description | html %]
[%- END -%]
[%- ELSIF account.debit_type_code -%]
[%- SWITCH account.debit_type_code -%]
[%- CASE 'ACCOUNT' -%]Account creation fee
[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
[%- CASE 'LOST' -%]Lost item
[%- CASE 'MANUAL' -%]Manual fee
[%- CASE 'NEW_CARD' -%]New card
[%- CASE 'OVERDUE' -%]Fine
[%- CASE 'PROCESSING' -%]Lost item processing fee
[%- CASE 'RENT' -%]Rental fee
[%- CASE 'RENT_DAILY' -%]Daily rental fee
[%- CASE 'RENT_RENEW' -%]Renewal of rental item
[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
[%- CASE 'RESERVE' -%]Hold fee
[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long
[%- CASE -%][% account.debit_type.description | html %]
[%- SWITCH account.debit_type_code -%]
[%- CASE 'ACCOUNT' -%]Account creation fee
[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
[%- CASE 'LOST' -%]Lost item
[%- CASE 'MANUAL' -%]Manual fee
[%- CASE 'NEW_CARD' -%]New card
[%- CASE 'OVERDUE' -%]Fine
[%- CASE 'PROCESSING' -%]Lost item processing fee
[%- CASE 'RENT' -%]Rental fee
[%- CASE 'RENT_DAILY' -%]Daily rental fee
[%- CASE 'RENT_RENEW' -%]Renewal of rental item
[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
[%- CASE 'RESERVE' -%]Hold fee
[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long
[%- CASE -%][% account.debit_type.description | html %]
[%- END -%]
[%- END -%]
[%- END -%]
[%- SWITCH account.status -%]
[%- PROCESS account_status_description account=account -%]
</span>
[%- END # /BLOCK account_type_description -%]
[%- BLOCK account_status_description -%]
[%- SWITCH account.status -%]
[%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
[%- CASE 'RETURNED' -%]<span> (Returned)</span>
[%- CASE 'REPLACED' -%]<span> (Replaced)</span>
@ -208,5 +214,4 @@
[%- CASE 'LOST' -%]<span> (Lost)</span>
[%- CASE -%]
[%- END -%]
</span>
[%- END # /BLOCK account_type_description -%]
[%- END -%]

2
pos/register.pl
View file

@ -127,7 +127,7 @@ else {
my $refund = $accountline->reduce(
{
reduction_type => 'Refund',
reduction_type => 'REFUND',
branch => $library_id,
staff_id => $logged_in_user->id,
interface => 'intranet',