From 88b83ab1ca7fdd6407205b72727caaf81d91e163 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 18 Jul 2023 07:30:23 +0000 Subject: [PATCH] Bug 34169: (follow-up) Fix ordering from staged files by removing superfluous form Removes the unneded new form element as we have one big form for the whole page. This should fix the situation where only the prices and information of the first selected record carreid over into the order. Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 71377c5e7bd1ecf7731f3891455a5b8fdb461736) Signed-off-by: Fridolin Somers --- .../prog/en/modules/acqui/addorderiso2709.tt | 380 +++++++++--------- 1 file changed, 189 insertions(+), 191 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 2da5302b56..4440130df6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -87,7 +87,7 @@ Add orders from [% comments | html %] ([% file_name | html %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %]) -
+ [% WRAPPER tabs id= "tabs" %] [% WRAPPER tabs_nav %] [% WRAPPER tab_item tabname= "records_to_import" bt_active= 1 %] Select to import [% END %] @@ -161,211 +161,209 @@ Card Add order -
-
    -
  1. - Match: - - [% IF ( biblio_lis.overlay_status == 'no_match' ) %] - No match - [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %] - Match applied - [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] - Match found - [% ELSE %] - [% biblio_lis.overlay_status | html %] - [% END %] - [% IF ( biblio.match_biblionumber ) %] - Matches biblio [% biblio.match_biblionumber | uri %] (score = [% biblio.match_score | html %]): [% biblio.match_citation | html %] - [% END %] - -
  2. -
  3. - - - Required -
  4. -
  5. - - -
  6. -
  7. - - -
  8. -
  9. - - % -
    If empty, discount rate from vendor will be used
    -
  10. -
  11. - [% IF ( close ) %] - - [% Budget_name | html %] +
      +
    1. + Match: + + [% IF ( biblio_lis.overlay_status == 'no_match' ) %] + No match + [% ELSIF ( biblio_lis.overlay_status == 'match_applied' ) %] + Match applied + [% ELSIF ( biblio_lis.overlay_status == 'auto_match' ) %] + Match found [% ELSE %] - - + Required +
    2. +
    3. + + +
    4. +
    5. + + +
    6. +
    7. + + % +
      If empty, discount rate from vendor will be used
      +
    8. +
    9. + [% IF ( close ) %] + + [% Budget_name | html %] + [% ELSE %] + + - - [% END %] -
    10. -
    11. - - -
    12. -
    13. - - -
    14. -
    - [% 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. - - + + [% END %] +
    2. +
    3. + + +
    4. +
    5. + + +
    6. +
    + [% 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. + + -
    2. + [% END %] + + -
    3. - - + [% FOREACH l IN libraries %] + [% IF l.branchcode == item.holdingbranch %] + + [% ELSE %] + [% END %] - -
    4. -
    5. - - +
    6. +
    7. + + -
    8. + [% END %] + + -
    9. - - -
    10. -
    11. - - -
    12. -
    13. - - +
    14. +
    15. + + +
    16. +
    17. + + -
    18. + [% END %] + + -
    19. - - + + [% FOREACH ccodeloo IN ccodeloop %] + [% IF ( ccodeloo.code ) == (item.ccode) %] + + [% ELSE %] + [% END %] - -
    20. + [% END %] + + -
    21. - - + + [% FOREACH n IN notforloanloop %] + [% IF n.code == item.notforloan %] + + [% ELSE %] + [% END %] - -
    22. -
    23. - - -
    24. -
    25. - - -
    26. -
    27. - - +
    28. +
    29. + + +
    30. +
    31. + + +
    32. +
    33. + + - Required -
    34. -
    35. - - -
    36. -
    37. - - -
    38. -
    39. - - -
    40. -
    -
    - [% END # /FOREACH item %] -
    - [% END %] -
    - + [% END %] + + Required +
  12. +
  13. + + +
  14. +
  15. + + +
  16. +
  17. + + +
  18. +
+
+ [% END # /FOREACH item %] + + [% END %] + [% END # /FOREACH biblio %] -- 2.39.5