Bugzilla – Attachment 34033 Details for
Bug 13320
Some prices calculation are done in template side
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13320: Fix "Tax inc." vs "Tax exc."
Bug-13320-Fix-Tax-inc-vs-Tax-exc.patch (text/plain), 1.99 KB, created by
Jonathan Druart
on 2014-12-01 13:19:28 UTC
(
hide
)
Description:
Bug 13320: Fix "Tax inc." vs "Tax exc."
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-12-01 13:19:28 UTC
Size:
1.99 KB
patch
obsolete
>From 92ed278e2139dbb7233a5bcd8fc05dbd1d5e72ad Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 1 Dec 2014 14:17:36 +0100 >Subject: [PATCH] Bug 13320: Fix "Tax inc." vs "Tax exc." > >The parcel page always displayes "Tax exc." even when values don't >include taxes. > >Test plan: >On the parcel page, verify that the string "Tax *" is correct. >This appears in the already received order table. >--- > acqui/parcel.pl | 1 + > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 6 +++++- > 2 files changed, 6 insertions(+), 1 deletion(-) > >diff --git a/acqui/parcel.pl b/acqui/parcel.pl >index 5edd171..579d8ec 100755 >--- a/acqui/parcel.pl >+++ b/acqui/parcel.pl >@@ -287,6 +287,7 @@ $template->param( > formatteddatereceived => $datereceived->output(), > name => $bookseller->{'name'}, > booksellerid => $bookseller->{id}, >+ invoiceincgst => $bookseller->{invoiceincgst}, > loop_received => \@loop_received, > loop_orders => \@loop_orders, > book_foot_loop => \@book_foot_loop, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 2032dd7..9e309a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -347,7 +347,11 @@ > <tfoot> > [% FOREACH key IN subtotal_for_funds.keys.sort %] > <tr> >- <td colspan="6" class="total">(Tax exc.)</td> >+ [% IF invoiceincgst %] >+ <td colspan="6" class="total">(Tax inc.)</td> >+ [% ELSE %] >+ <td colspan="6" class="total">(Tax exc.)</td> >+ [% END %] > <td colspan="2"><i>Subtotal for</i> [% key %]</td> > <td>[% subtotal_for_funds.$key.ecost | $Price %]</td> > <td>[% subtotal_for_funds.$key.unitprice | $Price %]</td> >-- >2.1.0
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 13320
:
33776
|
34033
|
34755
|
34756
|
34759
|
34760
|
34812
|
35429
|
35430
|
35563
|
35564
|
35565