Bugzilla – Attachment 27824 Details for
Bug 11573
Fine descriptions related to Rentals are untranslatable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11573: Follow-up: Include changes in OPAC templates
Bug-11573-Follow-up-Include-changes-in-OPAC-templa.patch (text/plain), 9.45 KB, created by
Katrin Fischer
on 2014-04-30 22:28:39 UTC
(
hide
)
Description:
Bug 11573: Follow-up: Include changes in OPAC templates
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-04-30 22:28:39 UTC
Size:
9.45 KB
patch
obsolete
>From f87b2011b724b3a314ed07c6bc250d6b00fc2e8d Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Wed, 30 Apr 2014 22:42:33 +0200 >Subject: [PATCH] Bug 11573: Follow-up: Include changes in OPAC templates > >Patch adds changes from earlier patches to OPAC prog and >bootstrap templates. > >Patch radds a description for FU - Accrued fine. > >Removes a stray space before the comma, using some TT magic. > >To test: >- Test like the other patch, display in OPAC prog, OPAC bootstrap, > Staff Pay fines tab and Staff Accounts tab should be the same. >- No ' , ' should be seen. >- FU fines should now display a description. >--- > .../prog/en/modules/members/boraccount.tt | 28 +++++++++++----------- > .../intranet-tmpl/prog/en/modules/members/pay.tt | 24 ++++++++++--------- > .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 24 ++++++++++--------- > .../opac-tmpl/prog/en/modules/opac-account.tt | 22 +++++++++-------- > 4 files changed, 52 insertions(+), 46 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index 2a50601..2fef4d4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -39,26 +39,26 @@ > <th>Print</th> > </tr> > >- <!-- FIXME: Shouldn't hardcode dollar signs, since Euro or Pound might be needed --> > [% FOREACH account IN accounts %] > > [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %] > <td>[% account.date %]</td> > <td> > [% SWITCH account.accounttype %] >- [% CASE 'Pay' %]Payment,thanks >- [% CASE 'Pay00' %]Payment,thanks (cash via SIP2) >- [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2) >- [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2) >- [% CASE 'N' %]New Card >- [% CASE 'F' %]Fine, [% account.title %] >- [% CASE 'A' %]Account management fee >- [% CASE 'M' %]Sundry >- [% CASE 'L' %]Lost >- [% CASE 'W' %]Writeoff >- [% CASE %][% account.accounttype %] >- [%- END -%] >- [%- IF account.description %], [% account.description %][% END %] >+ [%- CASE 'Pay' -%]Payment, thanks >+ [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2) >+ [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2) >+ [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2) >+ [%- CASE 'N' -%]New Card >+ [%- CASE 'F' -%]Fine >+ [%- CASE 'FU' -%]Accrued fine >+ [%- CASE 'A' -%]Account management fee >+ [%- CASE 'M' -%]Sundry >+ [%- CASE 'L' -%]Lost >+ [%- CASE 'W' -%]Writeoff >+ [%- CASE 'Rent' -%]Rental >+ [%- CASE -%][% account.accounttype %] >+ [%- END -%][% IF account.description %], [% account.description %][% END %] > [% IF ( account.itemnumber ) %]<a title="[% account.title %]" href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&itemnumber=[% account.itemnumber %]">View item</a> [% END %]</td> > <td>[% account.note | html_line_break %]</td> > [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index c35131d..955db25 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -115,17 +115,19 @@ function enableCheckboxActions(){ > </td> > <td> > [% SWITCH line.accounttype %] >- [% CASE 'Pay' %]Payment,thanks >- [% CASE 'Pay00' %]Payment,thanks (cash via SIP2) >- [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2) >- [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2) >- [% CASE 'N' %]New Card >- [% CASE 'F' %]Fine >- [% CASE 'A' %]Account management fee >- [% CASE 'M' %]Sundry >- [% CASE 'L' %]Lost Item >- [% CASE 'W' %]Writeoff >- [% CASE %][% line.accounttype %] >+ [%- CASE 'Pay' -%]Payment, thanks >+ [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2) >+ [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2) >+ [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2) >+ [%- CASE 'N' -%]New Card >+ [%- CASE 'F' -%]Fine >+ [%- CASE 'FU' -%]Accrued fine >+ [%- CASE 'A' -%]Account management fee >+ [%- CASE 'M' -%]Sundry >+ [%- CASE 'L' -%]Lost >+ [%- CASE 'W' -%]Writeoff >+ [%- CASE 'Rent' -%]Rental >+ [%- CASE -%][% line.accounttype %] > [%- END -%] > [%- IF line.description %], [% line.description %][% END %] > [% IF line.title %]([% line.title |html_entity %])[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >index 256a6d3..80ae355 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt >@@ -50,17 +50,19 @@ > <td>[% ACCOUNT_LINE.date | $KohaDates %]</td> > <td> > [% SWITCH ACCOUNT_LINE.accounttype %] >- [% CASE 'Pay' %]Payment,thanks >- [% CASE 'Pay00' %]Payment,thanks (cash via SIP2) >- [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2) >- [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2) >- [% CASE 'N' %]New Card >- [% CASE 'F' %]Fine >- [% CASE 'A' %]Account management fee >- [% CASE 'M' %]Sundry >- [% CASE 'L' %]Lost Item >- [% CASE 'W' %]Writeoff >- [% CASE %][% ACCOUNT_LINE.accounttype %] >+ [%- CASE 'Pay' -%]Payment, thanks >+ [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2) >+ [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2) >+ [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2) >+ [%- CASE 'N' -%]New Card >+ [%- CASE 'F' -%]Fine >+ [%- CASE 'FU' -%]Accrued fine >+ [%- CASE 'A' -%]Account management fee >+ [%- CASE 'M' -%]Sundry >+ [%- CASE 'L' -%]Lost >+ [%- CASE 'W' -%]Writeoff >+ [%- CASE 'Rent' -%]Rental >+ [%- CASE -%][% ACCOUNT_LINE.accounttype %] > [%- END -%] > [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %] > [% IF line.title %]([% line.title |html_entity %])[% END %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt >index c26668c..2cb5ce2 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt >@@ -41,16 +41,18 @@ > <td>[% ACCOUNT_LINE.date | $KohaDates %]</td> > <td> > [% SWITCH ACCOUNT_LINE.accounttype %] >- [% CASE 'Pay' %]Payment,thanks >- [% CASE 'Pay00' %]Payment,thanks (cash via SIP2) >- [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2) >- [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2) >- [% CASE 'N' %]New Card >- [% CASE 'F' %]Fine >- [% CASE 'A' %]Account management fee >- [% CASE 'M' %]Sundry >- [% CASE 'L' %]Lost Item >- [% CASE 'W' %]Writeoff >+ [%- CASE 'Pay' -%]Payment, thanks >+ [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2) >+ [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2) >+ [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2) >+ [%- CASE 'N' -%]New Card >+ [%- CASE 'F' -%]Fine >+ [%- CASE 'FU' -%]Accrued fine >+ [%- CASE 'A' -%]Account management fee >+ [%- CASE 'M' -%]Sundry >+ [%- CASE 'L' -%]Lost >+ [%- CASE 'W' -%]Writeoff >+ [%- CASE 'Rent' -%]Rental > [% CASE %][% ACCOUNT_LINE.accounttype %] > [%- END -%] > [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %] >-- >1.8.3.2
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 11573
:
24473
|
24485
|
24486
|
25715
|
27822
|
27823
|
27824
|
47236
|
47237
|
47238
|
47239
|
47240
|
47241
|
47242
|
47288
|
47289
|
47290
|
47291
|
88549
|
88600
|
88601
|
88602
|
88603
|
88604
|
88605
|
88606
|
88726
|
88727
|
88728
|
88729
|
90231
|
90232
|
90233
|
90234
|
90246
|
90256
|
90313
|
90314
|
90315
|
90316
|
91529
|
91530
|
91531
|
91532
|
91800
|
91801
|
91802
|
91803
|
91804
|
91805
|
91806