Attachment 81999 Details for Bug 21387 – Bug 21387: Receive items from - form should include tax hints

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

Bug-21387-Receive-items-from---form-should-include.patch (text/plain), 3.64 KB, created by Jonathan Druart on 2018-11-06 17:43:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-11-06 17:43:46 UTC

Size: 3.64 KB

patch

obsolete

>From ca7daa05d842dd02668ac7f4b042bb6a1e36ce88 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <caroline.cyr-la-rose@inlibro.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> acqui/orderreceive.pl                                         | 6 ++++++
> koha-tmpl/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 91c6e35d67..4ce2dd0952 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 } );
>@@ -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'},
>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 fc2ff7efe2..64ed9916cd 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 @@
>             <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 %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21387: 79212 | 79751 | 79753 | 80930 | 81639 | 81917 | 81999