Bugzilla – Attachment 83831 Details for
Bug 21427
Format prices on ordered/spent lists
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21427: Format prices on ordered/spent lists consistently
Bug-21427-Format-prices-on-orderedspent-lists-cons.patch (text/plain), 4.18 KB, created by
Katrin Fischer
on 2019-01-11 21:59:18 UTC
(
hide
)
Description:
Bug 21427: Format prices on ordered/spent lists consistently
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2019-01-11 21:59:18 UTC
Size:
4.18 KB
patch
obsolete
>From 6f9d534a4d414439006986d87f459c3ea7f4f2c6 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Fri, 11 Jan 2019 22:55:35 +0100 >Subject: [PATCH] Bug 21427: Format prices on ordered/spent lists consistently > >Some price information on the spent and ordered list already >used the $Price filter. With this patch all amounts should be >formatted according to the CurrencyFormat system preference. > >1) Switch CurrencyFormat to FR >2) Make sure you have > - Pending orders > - An open invoice with shipment cost and > adjustment with "encumber while open" checked > - A received order > - A closed invoice with shipment cost and > adjustment >3) View the "oder" and "spent" lists clicking on the > amounts in the budget and funds table on the acq > start page >4) Verify all price information is formatted wit > decimal comma >5) Switch CurrencyFormat to other settings and verify > display changes accordingly >--- > .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 6 +++--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 10 +++++----- > 2 files changed, 8 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index 5cc5ae7f6f..fc25300c11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -68,7 +68,7 @@ > <span title="[% order.entrydate | html %]">[% order.entrydate | $KohaDates %]</span> > </td> > <td class="data cell"> >- [% order.subtotal | html %] >+ [% order.subtotal | $Price %] > </td> > </tr> > [% END %] >@@ -79,7 +79,7 @@ > <tr> > <td></td> > <td colspan="6">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td> >- <td class="data total">[% adjustment.adjustment | html %]</td> >+ <td class="data total">[% adjustment.adjustment | $Price %]</td> > </tr> > [% END %] > >@@ -93,7 +93,7 @@ > <td> </td> > <td> </td> > <td class="data"> >- [% total | html %] >+ [% total | $Price %] > </td> > </tr> > </tfoot> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 5aeedabc3e..b57f2f5f5d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -72,7 +72,7 @@ > <span title="[% order.datereceived | html %]">[% order.datereceived | $KohaDates %]</span> > </td> > <td class="data cell"> >- [% order.rowtotal | html %] >+ [% order.rowtotal | $Price %] > </td> > </tr> > [% END %] >@@ -81,7 +81,7 @@ > [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %] > <tr> > <td colspan="9"> Sub total </td> >- <td class="data"> [% subtotal | html %] </td> >+ <td class="data"> [% subtotal | $Price %] </td> > </tr> > [% END %] > [% IF shipmentcosts.size %] >@@ -89,7 +89,7 @@ > <tr> > <td></td> > <td colspan="8">Shipping cost for invoice [% shipmentcost.invoicenumber | html %]</td> >- <td class="data total">[% shipmentcost.shipmentcost | html %]</td> >+ <td class="data total">[% shipmentcost.shipmentcost | $Price %]</td> > </tr> > [% END %] > [% END %] >@@ -98,13 +98,13 @@ > <tr> > <td></td> > <td colspan="8">Adjustment cost for invoice [% adjustment.invoiceid | html %]</td> >- <td class="data total">[% adjustment.adjustment | html %]</td> >+ <td class="data total">[% adjustment.adjustment | $Price %]</td> > </tr> > [% END %] > [% END %] > <tr> > <td colspan="9">TOTAL</td> >- <td class="data total">[% total | html %]</td> >+ <td class="data total">[% total | $Price %]</td> > </tr> > </tfoot> > </table> >-- >2.17.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 21427
:
79485
|
83831
|
84168
|
84886
|
84887