From f97c2951abb8561a9922790a2c7eb1b8b587fc90 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 15 Jul 2019 18:29:45 +0000 Subject: [PATCH] Bug 23294: Show actual price when ordering To test: 1 - Have a basket 2 - Add an order 3 - Modify the order, note you cannot see the unitprice/Actual cost 4 - Apply patch 5 - Note it is there 6 - Add to IntranetUserCSS: .ordering_unitprice{ display:none; } 7 - Reload 8 - Note it is hidden Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit d2e85ac9949ba6ccbe7470ae2caf446c05e0b941) Signed-off-by: Fridolin Somers (cherry picked from commit c71d2439359746380c9b81be3916ddc2afd8c083) Signed-off-by: Lucas Gass --- acqui/neworderempty.pl | 2 ++ .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl index bfcb66b2f9..98b7b855f2 100755 --- a/acqui/neworderempty.pl +++ b/acqui/neworderempty.pl @@ -372,6 +372,7 @@ if ( defined $from_subscriptionid ) { $data->{replacementprice} = $lastOrderReceived->{replacementprice}; $data->{ecost} = $lastOrderReceived->{ecost}; $data->{quantity} = $lastOrderReceived->{quantity}; + $data->{unitprice} = $lastOrderReceived->{unitprice}; $data->{order_internalnote} = $lastOrderReceived->{order_internalnote}; $data->{order_vendornote} = $lastOrderReceived->{order_vendornote}; $data->{sort1} = $lastOrderReceived->{sort1}; @@ -462,6 +463,7 @@ $template->param( listprice => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice), total => sprintf( "%.2f", ($data->{ecost} || 0) * ($data->{'quantity'} || 0) ), ecost => sprintf( "%.2f", $data->{ecost} || 0), + unitprice => sprintf( "%.2f", $data->{unitprice} || 0), publishercode => $data->{'publishercode'}, barcode_subfield => $barcode_subfield, import_batch_id => $import_batch_id, 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 33bc36a74e..c9c6098f4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -466,6 +466,11 @@ (budgeted cost * quantity) +
  • + + + [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] +
  • -- 2.39.5