Bugzilla – Attachment 156993 Details for
Bug 34752
Use AV descriptions in display for sort1/sort2 in basket display
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34752: Add AV handling to sort1/sort2 on baskets
Bug-34752-Add-AV-handling-to-sort1sort2-on-baskets.patch (text/plain), 3.40 KB, created by
Emily Lamancusa (emlam)
on 2023-10-12 20:17:05 UTC
(
hide
)
Description:
Bug 34752: Add AV handling to sort1/sort2 on baskets
Filename:
MIME Type:
Creator:
Emily Lamancusa (emlam)
Created:
2023-10-12 20:17:05 UTC
Size:
3.40 KB
patch
obsolete
>From 9f422bea7a715d63d830afe2b098e2c3e2785b44 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 11 Sep 2023 11:32:25 +0100 >Subject: [PATCH] Bug 34752: Add AV handling to sort1/sort2 on baskets > >This patch adds Authorized Value handling for the display of sort1 and >sort2 fields in the acquisitions basket display page. > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: emlam <emily.lamancusa@montgomerycountymd.gov> >--- > acqui/basket.pl | 6 ++++-- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 5 +++-- > 2 files changed, 7 insertions(+), 4 deletions(-) > >diff --git a/acqui/basket.pl b/acqui/basket.pl >index d7f2d76a99..a96544b0c5 100755 >--- a/acqui/basket.pl >+++ b/acqui/basket.pl >@@ -448,8 +448,10 @@ sub get_order_infos { > my %line = %{ $order }; > # Don't show unreceived standing orders as received > $line{order_received} = ( $qty == $order->{'quantityreceived'} && ( $basket->{is_standing} ? $qty : 1 ) ); >- $line{basketno} = $basketno; >- $line{budget_name} = $budget->{budget_name}; >+ $line{basketno} = $basketno; >+ $line{budget_name} = $budget->{budget_name}; >+ $line{sort1_authcat} = $budget->{sort1_authcat}; >+ $line{sort2_authcat} = $budget->{sort2_authcat}; > > # If we have an actual cost that should be the total, otherwise use the ecost > $line{unitprice_tax_included} += 0; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index fd208325cf..ceceeeb5fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -664,8 +664,8 @@ > <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a> > [% END %] > </td> >- <td>[% books_loo.sort1 | html %]</td> >- <td>[% books_loo.sort2 | html %]</td> >+ <td>[% AuthorisedValues.GetByCode( books_loo.sort1_authcat, books_loo.sort1 ) | html %]</td> >+ <td>[% AuthorisedValues.GetByCode( books_loo.sort2_authcat, books_loo.sort2 ) | html %]</td> > <td> > [% IF CAN_user_acquisition_edit_invoices %] > <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% books_loo.invoice_object.invoiceid | url %]" class="invoice">[% books_loo.invoice_object.invoicenumber | html %]</a> >@@ -673,6 +673,7 @@ > [% books_loo.invoice_object.invoicenumber | html %] > [% END %] > </td> >+ > [% IF Koha.Preference('EDIFACT') && ediaccount %] > <td>[% books_loo.suppliers_report | html %]</td> > [% END %] >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34752
:
155474
|
155526
|
155718
| 156993 |
156994