Attachment 94131 Details for Bug 23049 – Bug 23049: (follow-up) Correction to includes

[patch] Bug 23049: (follow-up) Correction to includes

Bug-23049-follow-up-Correction-to-includes.patch (text/plain), 2.40 KB, created by Martin Renvoize (ashimema) on 2019-10-15 07:24:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-10-15 07:24:06 UTC

Size: 2.40 KB

patch

obsolete

>From 085fba023de4e087fc27244fbca20dae32e80a90 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 14 Oct 2019 11:30:48 +0100
>Subject: [PATCH] Bug 23049: (follow-up) Correction to includes
>
>---
> Koha/Account/DebitType.pm                                   | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc       | 4 ++--
> koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/Koha/Account/DebitType.pm b/Koha/Account/DebitType.pm
>index 123dce1926..6324ec57cb 100644
>--- a/Koha/Account/DebitType.pm
>+++ b/Koha/Account/DebitType.pm
>@@ -68,7 +68,7 @@ sub _library_limits {
> =cut
> 
> sub _type {
>-    return 'AccountDebitTypesBranch';
>+    return 'AccountDebitType';
> }
> 
> 1;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>index b7f67b05da..528ab7882b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>@@ -11,8 +11,8 @@
>             [%- CASE 'LOST_RETURN'      -%]Lost item fee refund
>             [%- CASE                    -%][% account.accounttype | html %]
>         [%- END -%]
>-    [%- ELSIF account.debit_type -%]
>-       [%- SWITCH account.debit_type -%]
>+    [%- 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
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
>index b3496ed141..b45a169fe6 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
>@@ -182,8 +182,8 @@
>             [%- CASE 'LOST_RETURN'      -%]Lost item fee refund
>             [%- CASE                    -%][% account.accounttype | html %]
>         [%- END -%]
>-    [%- ELSIF account.debit_type -%]
>-       [%- SWITCH account.debit_type -%]
>+    [%- 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
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23049: 93513 | 93514 | 93515 | 93516 | 93518 | 93519 | 93520 | 93521 | 93522 | 93523 | 93529 | 93557 | 93564 | 93565 | 93567 | 93568 | 93569 | 93570 | 93571 | 93572 | 93573 | 93574 | 93575 | 93576 | 93577 | 93578 | 93579 | 93960 | 93961 | 93962 | 93963 | 93964 | 93965 | 93966 | 93967 | 93968 | 93969 | 93970 | 93972 | 93973 | 93974 | 93975 | 93976 | 93977 | 93978 | 93979 | 93989 | 93990 | 93991 | 93992 | 93993 | 93994 | 93995 | 93996 | 93997 | 93998 | 93999 | 94000 | 94001 | 94002 | 94003 | 94004 | 94005 | 94006 | 94007 | 94008 | 94073 | 94074 | 94075 | 94076 | 94077 | 94078 | 94079 | 94080 | 94081 | 94082 | 94083 | 94084 | 94085 | 94086 | 94087 | 94088 | 94089 | 94090 | 94091 | 94092 | 94093 | 94111 | 94112 | 94113 | 94114 | 94115 | 94116 | 94117 | 94118 | 94119 | 94120 | 94121 | 94122 | 94123 | 94124 | 94125 | 94126 | 94127 | 94128 | 94129 | 94130 | 94131 | 94132 | 94133 | 94134 | 94135 | 94136 | 94137 | 94138 | 94139 | 94140 | 94141 | 94142 | 94143 | 94144 | 94145 | 94146 | 94147 | 94148 | 94149 | 94150 | 94151 | 94152 | 94165 | 94307 | 94308 | 94309 | 94310 | 94311 | 94312 | 94313 | 94314 | 94315 | 94316 | 94317 | 94318 | 94319 | 94320 | 94321 | 94323 | 94324 | 94325 | 94326 | 94327 | 94328 | 94329 | 94331 | 94332 | 94333 | 94334 | 94335 | 94336 | 94337 | 94338 | 94339 | 94340 | 94341 | 94342 | 94343 | 94344 | 94345 | 94346 | 94347 | 94348 | 94349 | 94350 | 94351 | 94352 | 94648