Attachment 78632 Details for Bug 12310 – Bug 12310: (follow-up) Keep the example text in fines

[patch] Bug 12310: (follow-up) Keep the example text in fines

Bug-12310-follow-up-Keep-the-example-text-in-fines.patch (text/plain), 3.43 KB, created by Martin Renvoize (ashimema) on 2018-09-14 08:19:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-09-14 08:19:06 UTC

Size: 3.43 KB

patch

obsolete

>From ca5cd1c0d5980c230e7860119a099eeed8ed8a56 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Fri, 6 Apr 2018 14:15:59 +0000
>Subject: [PATCH] Bug 12310: (follow-up) Keep the example text in fines
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This puts the example text back in with the correct decimal
>separator. The example uses the first char of the syspref.
>
>TEST PLAN
>---------
>1) set the I18N/L10N DecimalSeparators syspref to ","
>2) go to a patron's fines tab.
>3) open Create manual invoice and Create manual credit tabs
>4) check both tabs
>   -- Example: 5.00 appears
>5) apply this patch
>6) reload the page and check both create tabs.
>   -- Example: 5,12 appears
>7) set the I18N/L10N DecimalSeparators syspref to ".,"
>8) go back and check both tabs.
>   -- Example: 5.12 appears (only the first separator is picked)
>9) optionnal: run koha qa test tools
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>
>Signed-off-by: Sonia Bouis <sonia.bouis@univ-lyon3.fr>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt  | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>index d6cee64377..1eca188990 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>@@ -45,7 +45,7 @@
> 	<li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
> 	<li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
>     <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
>-    <li><label for="amount">Amount: </label><input name="amount" id="amount" class="decimal-unformating" required="required" value="" step="any" min="0" /></li>
>+    <li><label for="amount">Amount: </label><input name="amount" id="amount" class="decimal-unformating" required="required" /> <span>Example:</span> 5[% Koha.Preference('DecimalSeparators') | truncate(1, '') %]12</li>
> 
> </ol></fieldset>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>index 3a94d9e4a0..a119579116 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>@@ -57,7 +57,7 @@
> 	<li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
> 	<li><label for="desc">Description: </label><input type="text" name="desc" id="desc" size="50" /></li>
>     <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
>-    <li><label for="amount">Amount: </label><input type="text" name="amount" id="amount" class="decimal-unformating" required="required"/></li>
>+    <li><label for="amount">Amount: </label><input name="amount" id="amount" class="decimal-unformating" required="required" /> <span>Example:</span> 5[% Koha.Preference('DecimalSeparators') | truncate(1, '') %]12</li>
> 	</ol></fieldset>
> <fieldset class="action"><input type="submit" name="add" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset>
> </form>
>-- 
>2.18.0

Actions: View | Diff | Splinter Review

Attachments on bug 12310: 28455 | 60530 | 60563 | 61357 | 61603 | 61604 | 62655 | 64671 | 64672 | 64673 | 64674 | 64675 | 64678 | 64679 | 64696 | 72104 | 72213 | 72983 | 73055 | 73215 | 73546 | 73657 | 73784 | 73785 | 73873 | 73874 | 73880 | 74524 | 74525 | 74526 | 74527 | 74528 | 74529 | 75123 | 75127 | 75128 | 75129 | 75130 | 75947 | 75948 | 75949 | 75950 | 75951 | 75952 | 75954 | 75955 | 75956 | 75957 | 75958 | 75959 | 76896 | 76933 | 77971 | 77972 | 77973 | 77995 | 78017 | 78631 | 78632 | 78633 | 78634 | 78635 | 78636 | 78637 | 78638