Bugzilla – Attachment 150932 Details for
Bug 26403
Move debit and credit types to YAML files and fix other related translation issues
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26403: Use accounts include in account management pages
Bug-26403-Use-accounts-include-in-account-manageme.patch (text/plain), 5.45 KB, created by
Martin Renvoize (ashimema)
on 2023-05-10 06:46:30 UTC
(
hide
)
Description:
Bug 26403: Use accounts include in account management pages
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2023-05-10 06:46:30 UTC
Size:
5.45 KB
patch
obsolete
>From 83e9f9f1c3c203bb30521d2f9cc9a956d90d008a Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 10 May 2023 07:37:55 +0100 >Subject: [PATCH] Bug 26403: Use accounts include in account management pages > >This patch updates the credit and debit types management pages to use >the proper includes for handling system type translations. This is how >it should have been done in the first place on the original bugs that >introduced the management of these types but for some reason I think it >got dropped during the QA process leading to confusion around these >system types with their fixed descriptions. > >To test: >1. Apply patch >2. Apply the translations > ./misc/translator/translate install xx-XX >3. In the staff interface, go to Administration > Credit types > --> They should be translated >4. Go to Administration > Debit types > --> They should be translated >--- > .../intranet-tmpl/prog/en/modules/admin/credit_types.tt | 5 +++-- > .../intranet-tmpl/prog/en/modules/admin/debit_types.tt | 9 +++++++-- > 2 files changed, 10 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >index c232a4a17b..2eb8f443b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt >@@ -2,6 +2,7 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op =='add_form' %] >@@ -94,7 +95,7 @@ > <li> > <label for="description" class="required">Description: </label> > [% IF credit_type && credit_type.is_system %] >- <span>[% credit_type.description | html %]</span> >+ <span>[%- PROCESS credit_type_description credit_type = credit_type -%]</span> > [% ELSE %] > <input type="text" name="description" id="description" required="required" class="required" size="80" maxlength="100" value="[% credit_type.description | html %]" /> <span class="required">Required</span> > [% END %] >@@ -171,7 +172,7 @@ > <td>[% credit_type.archived | html %]</td> > <td>[% credit_type.is_system | html %]</td> > <td>[% credit_type.code | html %]</td> >- <td>[% credit_type.description | html %]</td> >+ <td>[%- PROCESS credit_type_description credit_type = credit_type -%]</td> > <td>[% IF credit_type.can_be_added_manually %]Manual credit[% END %]</td> > <td>[% IF credit_type.credit_number_enabled %]Yes[% ELSE %]No[% END %]</td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >index a91c46a7ba..e2a3f9ba24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt >@@ -3,6 +3,7 @@ > [% USE Branches %] > [% USE Price %] > [% SET footerjs = 1 %] >+[% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] > <title> > [% IF op =='add_form' %] >@@ -95,7 +96,11 @@ > </li> > <li> > <label for="description" class="required">Description: </label> >- <input type="text" name="description" id="description" required="required" class="required" size="80" maxlength="100" value="[% debit_type.description | html %]" /> <span class="required">Required</span> >+ [% IF debit_type && debit_type.is_system %] >+ <span>[%- PROCESS debit_type_description debit_type = debit_type -%]</span> >+ [% ELSE %] >+ <input type="text" name="description" id="description" required="required" class="required" size="80" maxlength="100" value="[% debit_type.description | html %]" /> <span class="required">Required</span> >+ [% END %] > </li> > <li> > <label for="can_be_invoiced">Can be manually invoiced? </label> >@@ -162,7 +167,7 @@ > <td>[% debit_type.archived | html %]</td> > <td>[% debit_type.is_system | html %]</td> > <td>[% debit_type.code | html %]</td> >- <td>[% debit_type.description | html %]</td> >+ <td>[%- PROCESS debit_type_description debit_type = debit_type -%]</td> > <td>[% debit_type.default_amount | $Price %]</td> > <td>[% IF debit_type.can_be_invoiced && debit_type.can_be_sold %] > <i class="fa fa-id-card-o"></i> Invoicing, <i class="fa fa-shopping-cart"></i> Sale >-- >2.40.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26403
:
109816
|
148940
|
149104
|
149105
|
150744
|
150745
|
150912
|
150913
|
150925
|
150932
|
150941
|
150942
|
150943
|
150944
|
150946