Attachment 84971 Details for Bug 22225 – Bug 22225: Correctly use invoiceincgst over listincgst

[patch] Bug 22225: Correctly use invoiceincgst over listincgst

Bug-22225-Correctly-use-invoiceincgst-over-listinc.patch (text/plain), 2.87 KB, created by Martin Renvoize (ashimema) on 2019-02-11 14:05:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-02-11 14:05:36 UTC

Size: 2.87 KB

patch

obsolete

>From 0f0d65c8a24da15e7c1d13f675af53540e2b0a4c Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 11 Feb 2019 14:04:01 +0000
>Subject: [PATCH] Bug 22225: Correctly use invoiceincgst over listincgst
>
>Mistakenly, we were looking at listincgst in the templates but using
>invoiceincgst in the scripts. This patch rectifies that by switching to
>use invoiceincgst in the templates too.
>---
> acqui/orderreceive.pl                                         | 1 -
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 4 ++--
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
>index e57e2a6966..3f0e10ba60 100755
>--- a/acqui/orderreceive.pl
>+++ b/acqui/orderreceive.pl
>@@ -229,7 +229,6 @@ $template->param(
>     name                  => $bookseller->name,
>     cur_active_sym        => $active_currency->symbol,
>     cur_active            => $active_currency->currency,
>-    listincgst            => $bookseller->listincgst,
>     invoiceincgst         => $bookseller->invoiceincgst,
>     title                 => $order->{'title'},
>     author                => $order->{'author'},
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>index fca13a6d6e..d292cc6bff 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
>@@ -288,12 +288,12 @@
>             <input type="hidden" name="tax_rate" value="0" />
>         [% END %]
> 
>-        <li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])</span></li>
>+        <li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (invoiceincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])</span></li>
>         <li>
>             <label for="replacementprice">Replacement price:</label>
>             <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price %]" />
>         </li>
>-        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span></li>
>+        <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span></li>
>         <li>
>             <label for="unitprice">Actual cost:</label>
>             <input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 %]" /> <span class="hint">[% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]</span>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22225: 84971 | 88550 | 89614