gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 21387: Receive items from - form should include tax hints 

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2018-09-21 11:42:28 +01:00 committed by Nick Clemens
parent 5e3f428ade
commit 702ca8e9a3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
acqui/orderreceive.pl
View File

@ -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 } );
@ -203,6 +205,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'},

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
View File

@ -239,15 +239,15 @@
<input type="hidden" name="tax_rate" value="0" />
[% END %]
<li><label for="rrp">Retail price: </label>[% rrp | $Price %]</li>
<li><label for="rrp">Retail price: </label>[% rrp | $Price %] <span class="hint">(adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% 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 %]</li>
<li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %] <span class="hint">[% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% 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 | html %]" />
<input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 | html %]" /> <span lass="hint">[% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]</span>
</li>
<li><label for="order_internalnote">Internal note: </label><textarea name="order_internalnote" width="40" rows="8" >[% order_internalnote | html %]</textarea></li>
[% IF order_vendornote %]