From 0dab236adbda5138a6184be4b58b0758ee05a8ef Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Mon, 21 Sep 2020 12:21:23 +0000
Subject: [PATCH] Bug 21882: Show price information in acqusitions tab on staff
 detail page

This adds a new 'Price' column to the acqusition details tab.

To test:
- Apply patch
- Add one or more orders for a record.
- Before closing the basket: go to the detail page in the catalog
- Verify that the price estimated/budgetet price now shows in a new column
- Add actual cost to the basket or close the basket and receive the item
- Verify the column now shows the updated actual cost
- Verfy the tooltip on the table heading works
- Verify the column configuration for the new column works as well

Signed-off-by: David Nind <david@davidnind.com>
---
 admin/columns_settings.yml                                  | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 96b3a31a68..6d0e458c46 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -395,6 +395,8 @@ modules:
             -
               columnname: quantity
             -
+              columnname: price
+            -
               columnname: order_internalnote
             -
               columnname: subscription
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 239f4f5b07..f82cd26092 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -5,6 +5,7 @@
 [% USE AuthorisedValues %]
 [% USE Branches %]
 [% USE Biblio %]
+[% USE Price %]
 [% USE TablesSettings %]
 [% PROCESS 'i18n.inc' %]
 [% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %]
@@ -690,6 +691,7 @@ Note that permanent location is a code, and location may be an authval.
           <th class="title-string">Receive date</th>
           <th>Status</th>
           <th>Quantity</th>
+          <th title="Estimated cost tax incl. while pending, actual cost tax incl. once received">Price</th>
           <th>Internal note</th>
           <th>Subscription</th>
           <th>Subscription callnumber</th>
@@ -742,6 +744,7 @@ Note that permanent location is a code, and location may be an authval.
               [% END %]
             </td>
             <td>[% order.quantity | html %]</td>
+            <td>[% IF ( order.unitprice_tax_included > 0 ) %][% order.unitprice_tax_included | $Price %][% ELSE %][% order.ecost_tax_included | $Price %][% END %]
             <td>[% order.order_internalnote | html %]</td>
             <td>
                 [% IF order.subscriptionid %]
-- 
2.11.0