Bugzilla – Attachment 194488 Details for
Bug 39724
Remove GetSuggestionInfo from C4/Suggestions.pm
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39724: (follow-up) use the suggestion object in neworderempty.tt
e7812fd.patch (text/plain), 7.47 KB, created by
Jonathan Druart
on 2026-03-05 09:11:21 UTC
(
hide
)
Description:
Bug 39724: (follow-up) use the suggestion object in neworderempty.tt
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2026-03-05 09:11:21 UTC
Size:
7.47 KB
patch
obsolete
>From e7812fd1c58c630367d9c525ae9a9506639dfbd4 Mon Sep 17 00:00:00 2001 >From: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com> >Date: Wed, 4 Mar 2026 15:46:22 +0000 >Subject: [PATCH] Bug 39724: (follow-up) use the suggestion object in > neworderempty.tt > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > acqui/neworderempty.pl | 68 +++++++++---------- > .../prog/en/modules/acqui/neworderempty.tt | 13 ++-- > 2 files changed, 40 insertions(+), 41 deletions(-) > >diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl >index 1f0c87c5b25..1a8155904c2 100755 >--- a/acqui/neworderempty.pl >+++ b/acqui/neworderempty.pl >@@ -460,41 +460,39 @@ $template->param( > closedate => $basket->{'closedate'}, > > # order details >- suggestionid => $suggestion->suggestionid, >- surnamesuggestedby => $suggestion->surname, >- firstnamesuggestedby => $suggestion->firstname, >- biblionumber => $biblionumber, >- uncertainprice => $data->{'uncertainprice'}, >- discount_2dp => sprintf( "%.2f", $bookseller->discount ), # for display >- discount => $bookseller->discount, >- orderdiscount_2dp => sprintf( "%.2f", $data->{'discount'} || 0 ), >- orderdiscount => $data->{'discount'}, >- order_internalnote => $data->{'order_internalnote'}, >- order_vendornote => $data->{'order_vendornote'}, >- listincgst => $bookseller->listincgst, >- invoiceincgst => $bookseller->invoiceincgst, >- cur_active_sym => $active_currency->symbol, >- cur_active => $active_currency->currency, >- currencies => Koha::Acquisition::Currencies->search, >- currency => $data->{currency}, >- vendor_currency => $bookseller->listprice, >- orderexists => ( $new eq 'yes' ) ? 0 : 1, >- title => $data->{'title'}, >- author => $data->{'author'}, >- publicationyear => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'}, >- editionstatement => $data->{'editionstatement'}, >- budget_loop => $budget_loop, >- isbn => $data->{'isbn'}, >- ean => $data->{'ean'}, >- seriestitle => $data->{'seriestitle'}, >- itemtypeloop => \@itemtypes, >- quantity => $quantity, >- quantityrec => $quantity, >- quantitysugg => $data->{quantitysugg}, >- rrp => $data->{'rrp'}, >- replacementprice => $data->{'replacementprice'}, >- gst_values => \@gst_values, >- tax_rate => $data->{tax_rate_on_ordering} ? $data->{tax_rate_on_ordering} + 0.0 >+ suggestion => $suggestion, >+ biblionumber => $biblionumber, >+ uncertainprice => $data->{'uncertainprice'}, >+ discount_2dp => sprintf( "%.2f", $bookseller->discount ), # for display >+ discount => $bookseller->discount, >+ orderdiscount_2dp => sprintf( "%.2f", $data->{'discount'} || 0 ), >+ orderdiscount => $data->{'discount'}, >+ order_internalnote => $data->{'order_internalnote'}, >+ order_vendornote => $data->{'order_vendornote'}, >+ listincgst => $bookseller->listincgst, >+ invoiceincgst => $bookseller->invoiceincgst, >+ cur_active_sym => $active_currency->symbol, >+ cur_active => $active_currency->currency, >+ currencies => Koha::Acquisition::Currencies->search, >+ currency => $data->{currency}, >+ vendor_currency => $bookseller->listprice, >+ orderexists => ( $new eq 'yes' ) ? 0 : 1, >+ title => $data->{'title'}, >+ author => $data->{'author'}, >+ publicationyear => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'}, >+ editionstatement => $data->{'editionstatement'}, >+ budget_loop => $budget_loop, >+ isbn => $data->{'isbn'}, >+ ean => $data->{'ean'}, >+ seriestitle => $data->{'seriestitle'}, >+ itemtypeloop => \@itemtypes, >+ quantity => $quantity, >+ quantityrec => $quantity, >+ quantitysugg => $data->{quantitysugg}, >+ rrp => $data->{'rrp'}, >+ replacementprice => $data->{'replacementprice'}, >+ gst_values => \@gst_values, >+ tax_rate => $data->{tax_rate_on_ordering} ? $data->{tax_rate_on_ordering} + 0.0 > : $bookseller->tax_rate ? $bookseller->tax_rate + 0.0 > : 0, > listprice => sprintf( "%.2f", $data->{listprice} || $data->{price} || $listprice ), >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 782f0dc2d94..52e98784ae9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -143,7 +143,7 @@ > cloneItemBlock(0, '[% UniqueItemFields | html %]'); > [% END %] > >- [% IF ( suggestionid ) %]updateCosts();[% END %] >+ [% IF ( suggestion ) %]updateCosts();[% END %] > $("#quantity").change(function() { > updateCosts(); > }); >@@ -348,7 +348,7 @@ > <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> > <input type="hidden" name="listinc" id="listinc" value="[% listincgst | html %]" /> > <input type="hidden" name="invoiceincgst" id="invoiceincgst" value="[% invoiceincgst | html %]" /> >- <input type="hidden" name="suggestionid" value="[% suggestionid | html %]" /> >+ <input type="hidden" name="suggestionid" value="[% suggestion.suggestionid | html %]" /> > <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" /> > > [% FOREACH c IN currencies %] >@@ -466,14 +466,15 @@ > [% END %] > </fieldset> > >- [% IF ( suggestionid ) %] >+ [% IF ( suggestion ) %] > <fieldset class="rows"> > <legend>Suggestion</legend> > <ol> > <li> > <span class="label">Suggested by: </span> >- [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | uri %]&op=show" >- >suggestion #[% suggestionid | html %]</a >+ [% suggestion.suggester.surname | html %][% IF ( suggestion.suggester.firstname ) %], [% suggestion.suggester.firstname | html %][% END %] (<a >+ href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestion.suggestionid | uri %]&op=show" >+ >suggestion #[% suggestion.suggestionid | html %]</a > >) > </li> > </ol> >@@ -743,7 +744,7 @@ > <input type="hidden" id="op" name="op" value="cud-order" /> > <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]" /> > <input type="submit" class="btn btn-primary" value="Save" /> >- [% IF (suggestionid) %] >+ [% IF (suggestion) %] > <a class="cancel" href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]">Cancel</a> > [% ELSE %] > [% IF subscriptionid %] >-- >2.43.0 >
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 39724
:
181405
|
193480
|
193483
|
193484
|
193493
|
194454
|
194487
| 194488