From a69c63fad8f17d7647eed5b708d495ed1617e701 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia 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 --- .../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' ) %] Match found [% ELSE %] -<<<<<<< HEAD [% biblio_lis.overlay_status | html %] [% END %] [% IF ( biblio.match_biblionumber ) %] @@ -269,41 +268,6 @@ [% ELSE %] -======= - - - - [% END %] - -
  • - - -
  • -
  • - - -
  • - - [% IF ( biblio.iteminfos.size ) %] -
    - [% IF biblio.item_error %]Item records could not be processed because the number of item fields was uneven.[% END %] - [% FOREACH item IN biblio.iteminfos %] -
    - Item record [% item.item_id | html %] -
      -
    1. - - @@ -669,6 +633,11 @@ class="btn btn-default btn-xs" > Add orders + Add orders and ignore incoming fund [% END # /FOREACH batch_lis %] -- 2.39.5