Bugzilla – Attachment 184122 Details for
Bug 31606
Enhance acquisitions to allow ordering on next year's budget when still in current year.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31606: Ignore incoming fund button when adding orders from staged file
Bug-31606-Ignore-incoming-fund-button-when-adding-.patch (text/plain), 7.34 KB, created by
Aleisha Amohia
on 2025-07-15 22:55:44 UTC
(
hide
)
Description:
Bug 31606: Ignore incoming fund button when adding orders from staged file
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2025-07-15 22:55:44 UTC
Size:
7.34 KB
patch
obsolete
>From a69c63fad8f17d7647eed5b708d495ed1617e701 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Wed, 24 Jul 2024 21:22:07 +0000 >Subject: [PATCH] Bug 31606: Ignore incoming fund button when adding orders > from staged file > >This patch adds the 'Add orders and ignore incoming fund' button when using an already staged file to add orders to a basket. > >Signed-off-by: Rhonda Kuiper <rkuiper@roundrocktexas.gov> >--- > .../prog/en/modules/acqui/addorderiso2709.tt | 41 +++---------------- > 1 file changed, 5 insertions(+), 36 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index b69c35283f0..b378d3fa25f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -179,7 +179,6 @@ > [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] > <span>Match found</span> > [% ELSE %] >-<<<<<<< HEAD > [% biblio_lis.overlay_status | html %] > [% END %] > [% IF ( biblio.match_biblionumber ) %] >@@ -269,41 +268,6 @@ > <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> > [% ELSE %] > <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> >-======= >- <label for="fund_record_[% biblio.import_record_id | html %]">Fund: </label> >- <select id="fund_record_[% biblio.import_record_id | html %]" name="budget_id_[% biblio.import_record_id | html %]"> >- <option value="">Select a fund (will use default if set)</option> >- [% INCLUDE 'budgets_loop.inc' inactive_class = "b_inactive" budget_loop = biblio.budget_loop %] >- </select> >- <span class="required" style="display:none">Required</span> >- [% END %] >- </li> >- <li class="sort1"> >- <label for="sort1_record_[% biblio.import_record_id | html %]">Statistic 1: </label> >- <input id="sort1_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort1_[% biblio.import_record_id | html %]" value="[% biblio.sort1 | html %]" /> >- </li> >- <li class="sort2"> >- <label for="sort2_record_[% biblio.import_record_id | html %]">Statistic 2: </label> >- <input id="sort2_record_[% biblio.import_record_id | html %]" type="text" size="20" name="sort2_[% biblio.import_record_id | html %]" value="[% biblio.sort2 | html %]" /> >- </li> >- </ol> >- [% IF ( biblio.iteminfos.size ) %] >- <div class="item_edit_form"> >- [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %] >- [% FOREACH item IN biblio.iteminfos %] >- <fieldset class="rows"> >- <legend>Item record [% item.item_id | html %]</legend> >- <ol> >- <li> >- <label for="homebranch_item_[% item.item_id | html %]">homebranch</label> >- <select id="homebranch_item_[% item.item_id | html %]" name="homebranch_[% biblio.import_record_id | html %]"> >- [% FOREACH l IN libraries %] >- [% IF l.branchcode == item.homebranch %] >- <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option> >- [% ELSE %] >- <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option> >- [% END %] >->>>>>>> Bug 31606: Make acquisitions fund dropdown consistently show budget name > [% END %] > [% END %] > </select> >@@ -669,6 +633,11 @@ > class="btn btn-default btn-xs" > ><i class="fa fa-plus"></i> Add orders</a > > >+ <a >+ href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]&clear_found=1" >+ class="btn btn-default btn-xs" >+ ><i class="fa fa-plus"></i> Add orders and ignore incoming fund</a >+ > > </td> > </tr> > [% END # /FOREACH batch_lis %] >-- >2.39.5
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 31606
:
140860
|
140958
|
141004
|
148574
|
167427
|
167505
|
167522
|
167908
|
168043
|
168044
|
169264
|
169265
|
169442
|
169521
|
169767
|
169768
|
169769
|
184120
|
184121
| 184122