From dec84e08208b16ea0d6c1423b8d0b724a5c3a777 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 19 Oct 2018 12:49:05 +0100 Subject: [PATCH] Bug 21619: Expand tax abreviations in acquisitions form hints Signed-off-by: Caroline Cyr La Rose Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens --- .../prog/en/modules/acqui/neworderempty.tt | 14 +++++++------- .../prog/en/modules/acqui/orderreceive.tt | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 7cf4e2e6e1..3ae52a34d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -380,10 +380,10 @@
  • [% IF ( close ) %] Vendor price: - [% listprice | html %] [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] + [% listprice | html %] [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %] [% ELSE %] - [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] + [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %] [% END %]
  • [% UNLESS ( close ) %] @@ -436,10 +436,10 @@
  • [% IF ( close ) %] Retail price: - [% rrp | html %] (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %]) + [% rrp | html %] (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %]) [% ELSE %] - (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %]) + (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %]) [% END %]
  • @@ -448,7 +448,7 @@
  • - [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] + [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
  • @@ -457,10 +457,10 @@
  • [% IF ( close ) %] - [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] + [% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %] [% ELSE %] - [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] + [% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %] [% END %]
  • 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 64ed9916cd..9c7e702bc7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -239,15 +239,15 @@ [% END %] -
  • [% rrp | $Price %] (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])
  • +
  • [% rrp | $Price %] (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
  • -
  • [% ecost | $Price %] [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
  • +
  • [% ecost | $Price %] [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
  • - [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] + [% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
  • [% IF order_vendornote %] -- 2.39.5