From 71ae225f6cfd75d7cd355bec94f935727cc6420a 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> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.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 3d7a426059..ee33027710 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -400,6 +400,8 @@ modules: columnname: status - columnname: quantity + - + columnname: price - columnname: order_internalnote - 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 296b2eed4b..1f9d0241dc 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') %] @@ -717,6 +718,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> @@ -769,6 +771,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.24.1 (Apple Git-126)