From 0f0d65c8a24da15e7c1d13f675af53540e2b0a4c Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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 @@ [% END %] -
  • [% rrp | $Price %] (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
  • +
  • [% rrp | $Price %] (adjusted for [% cur_active | html %], [% IF (invoiceincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
  • -
  • [% ecost | $Price %] [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
  • +
  • [% ecost | $Price %] [% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
  • [% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %] -- 2.20.1