From 775897f020b3c53f99792a812abf3c408cfc257f Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 21 Sep 2018 11:42:28 +0100 Subject: [PATCH] Bug 21387: Receive items from - form should include tax hints Signed-off-by: Caroline Cyr La Rose Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 702ca8e9a341ea8350bb69596be5ce8c29596b45) Signed-off-by: Martin Renvoize --- acqui/orderreceive.pl | 6 ++++++ .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl index c88a533efe..1394d55324 100755 --- a/acqui/orderreceive.pl +++ b/acqui/orderreceive.pl @@ -73,6 +73,7 @@ use C4::Suggestions; use C4::Koha; use Koha::Acquisition::Booksellers; +use Koha::Acquisition::Currencies; use Koha::Acquisition::Orders; use Koha::DateUtils qw( dt_from_string ); use Koha::ItemTypes; @@ -112,6 +113,7 @@ unless ( $results and @$results) { # prepare the form for receiving my $order = $results->[0]; my $basket = Koha::Acquisition::Orders->find( $ordernumber )->basket; +my $active_currency = Koha::Acquisition::Currencies->get_active; # Check if ACQ framework exists my $acq_fw = GetMarcStructure( 1, 'ACQ', { unsafe => 1 } ); @@ -210,6 +212,10 @@ $template->param( booksellerid => $order->{'booksellerid'}, freight => $freight, 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'}, copyrightdate => $order->{'copyrightdate'}, 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 562d8cda3e..e6636a1c53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -234,11 +234,11 @@ [% END %] -
  • [% rrp | $Price %]
  • -
  • [% ecost | $Price %]
  • +
  • [% rrp | $Price %] (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])
  • +
  • [% ecost | $Price %] [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
  • - + [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
  • [% IF order_vendornote %] -- 2.39.5