Attachment 27658 Details for Bug 9593 – [PASSED QA] Bug 9593 [QA Followup]

[patch] [PASSED QA] Bug 9593 [QA Followup]

PASSED-QA-Bug-9593-QA-Followup.patch (text/plain), 2.91 KB, created by Katrin Fischer on 2014-04-26 15:37:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-04-26 15:37:02 UTC

Size: 2.91 KB

patch

obsolete

>From e76067b56e0fbc06ddfa1e8a2bdb3771f1b11e90 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 22 Apr 2014 07:13:19 -0400
>Subject: [PATCH] [PASSED QA] Bug 9593 [QA Followup]
>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>---
> .../intranet-tmpl/prog/en/modules/admin/currency.tt      | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>index fd40142..7de59e4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>@@ -46,8 +46,6 @@
> <div id="bd">
>     <div id="yui-main">
>     <div class="yui-b">
>-<div class="message dialog"><p style="text-align:justify" >The active currency priority will be picked during the importation process from a staged file whenever the price data is provided under different currencies.<br/>
>-The symbol may be the pure currency sign or a string in which it's included ( like '$US' ).</p></div>
> [% IF ( else ) %]
> <div id="toolbar" class="btn-toolbar">
>     <a class="btn btn-small" id="newcurrency" href="[% script_name %]?op=add_form"><i class="icon-plus"></i> New currency</a>
>@@ -83,7 +81,7 @@ The symbol may be the pure currency sign or a string in which it's included ( li
>             <input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="[% symbol %]" required="required" class="required" /> <span class="required">Required</span>
>         </li>
>         <li>
>-            <label for="isocode" class="required">Iso code: </label>
>+            <label for="isocode" class="required">ISO code: </label>
>             <input type="text" name="isocode" id="isocode" size="5" maxlength="5" value="[% isocode %]" required="required"  class="required" /> <span class="required">Required</span>
>         </li>
>         <li>
>@@ -165,7 +163,7 @@ The symbol may be the pure currency sign or a string in which it's included ( li
>             <th>Currency</th>
>             <th>Rate</th>
>             <th>Symbol</th>
>-            <th>Iso code</th>
>+            <th>ISO code</th>
>             <th>Last updated</th>
>             <th>Active</th>
>             <th colspan="2">Actions&nbsp;</th>
>@@ -197,6 +195,16 @@ The symbol may be the pure currency sign or a string in which it's included ( li
>         <a href="[% script_name %]?offset=[% nextpage %]">Next &gt;&gt;</a>
>     [% END %]
> 
>+    <div class="hint">
>+        <p>
>+            When importing MARC files via the staging tools, the tool will attempt to find and use the price of the currently active currency.
>+        </p>
>+        <p>
>+            Some examples of compatible price fields include "$9.99", "9.99 USD", "$9.99 USD", "9.99 USD (10.00 CAN)", "$9.99 USD (paperback)".
>+            These examples assume USD is the active currency.
>+        </p>
>+    </div>
>+
> [% END %]
> 
> </div>
>-- 
>1.8.3.2

Actions: View | Diff | Splinter Review

Attachments on bug 9593: 15269 | 15270 | 15569 | 15587 | 15615 | 17923 | 17948 | 17949 | 18070 | 18075 | 18265 | 18405 | 18640 | 21274 | 21477 | 22151 | 22541 | 22820 | 23580 | 24086 | 25984 | 26125 | 26127 | 27006 | 27009 | 27123 | 27124 | 27391 | 27392 | 27657 | 27658