From 3a2048eeff57548a7d9b557b0e94d36d1c58e6ef Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Sat, 3 Sep 2016 00:17:20 +0000 Subject: [PATCH] Bug 11360 - Fix merge conflict Signed-off-by: Kyle M Hall --- .../prog/en/modules/circ/returns.tt | 58 ++----------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 6086d10cf2..6754a45087 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -481,59 +481,6 @@ $(document).ready(function () { [% borcity %] [% borzip %] -<<<<<<< HEAD -
-

Hold found

-

[% itembarcode |html %]: [% title |html %]

- [% IF ( reservenotes ) %]

Notes: [% reservenotes %]

[% END %] -
Hold for:
-
    -
  • - [% borsurname %], [% borfirstname %] - ([% borcnum %])
  • -
  • [% borstnum %] [% boraddress %]
    - [% IF ( boraddress2 ) %][% boraddress2 %]
    [% END %] - [% borcity %] [% borzip %]
  • - [% IF ( borphone ) %]
  • [% borphone %]
  • [% END %] - [% IF ( boremail ) %]
  • [% IF ( transfertodo ) %][% boremail %][% ELSE %][% boremail %][% END %]
  • [% END %] - [% UNLESS ( transfertodo) %] - [% INCLUDE display_bormessagepref %] - [% END %] -[% IF ( debarred ) %]
  • Patron is RESTRICTED
  • [% END %] -[% IF ( gonenoaddress ) %]
  • Patron's address is in doubt
  • [% END %] -
- [% IF ( transfertodo ) %] -

Transfer to: [% destbranchname %]

- [% ELSE %] -

Hold at [% destbranchname %]

- [% END %] -
- - [% IF ( transfertodo ) %] - - - [% ELSE %] - - - [% END %] - - [% FOREACH inputloo IN inputloop %] - - - [% END %] - - - - - - - - - - -
-
-======= [% IF ( borphone ) %]
  • [% borphone %]
  • [% END %] @@ -548,6 +495,10 @@ $(document).ready(function () { [% END %] + [% UNLESS ( transfertodo) %] + [% INCLUDE display_bormessagepref %] + [% END %] + [% IF ( debarred ) %]
  • Patron is RESTRICTED
  • [% END %] @@ -606,7 +557,6 @@ $(document).ready(function () { ->>>>>>> Bug 11360 - Disable barcode field and submit button when a hold is found [% END %] [% END %] -- 2.39.5