Attachment #32642 for bug #13134

View | Details | Raw Unified | Return to bug 13134
Collapse All | Expand All




            borcnum        => $borr->{'cardnumber'},
            borfirstname   => $borr->{'firstname'},
            borsurname     => $borr->{'surname'},
            borcategory    => $borr->{'description'},
            diffbranch     => 1,
        );
    }

            wname           => $name,
            wborfirstname   => $borr->{'firstname'},
            wborsurname     => $borr->{'surname'},
            wborcategory    => $borr->{'description'},
            wbortitle       => $borr->{'title'},
            wborphone       => $borr->{'phone'},
            wboremail       => $borr->{'email'},

            name           => $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'},
            borfirstname   => $borr->{'firstname'},
            borsurname     => $borr->{'surname'},
            borcategory    => $borr->{'description'},
            bortitle       => $borr->{'title'},
            borphone       => $borr->{'phone'},
            boremail       => $borr->{'email'},




[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% Branches.GetName( TransferWaitingAt ) %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></h3>
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
                <li>[% wborstnum %] [% wboraddress %][% IF ( wboraddress2 ) %]<br />
		[% wboraddress2 %]<br />[% END %]
        [% wborcity %]  [% wborzip %]</li>
        [% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]

        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
        <h4>Hold for:</h4>
			<ul>
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
            <li>[% borstnum %] [% boraddress %]<br />
			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
            [% borcity %] [% borzip %]</li>

		<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
                <h4>Hold for: </h4>
                    <ul>
                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
                        <li>[% borstnum %] [% boraddress %]<br />
						[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
						[% borcity %]  [% borzip %]</li>

		<ul>
            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
                [% borsurname %], [% borfirstname %]
            </a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span></li>
            <li>[% borstnum %] [% boraddress %]<br />
			[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
			[% borcity %] [% borzip %]</li>
- 

Return to bug 13134

Lines 158-163 if ( $query->param('resbarcode') ) { Link Here

(-)a/circ/returns.pl (+3 lines)
158	borcnum => $borr->{'cardnumber'},	158	borcnum => $borr->{'cardnumber'},
159	borfirstname => $borr->{'firstname'},	159	borfirstname => $borr->{'firstname'},
160	borsurname => $borr->{'surname'},	160	borsurname => $borr->{'surname'},
		161	borcategory => $borr->{'description'},
161	diffbranch => 1,	162	diffbranch => 1,
162	);	163	);
163	}	164	}
Lines 381-386 if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { Link Here
381	wname => $name,	382	wname => $name,
382	wborfirstname => $borr->{'firstname'},	383	wborfirstname => $borr->{'firstname'},
383	wborsurname => $borr->{'surname'},	384	wborsurname => $borr->{'surname'},
		385	wborcategory => $borr->{'description'},
384	wbortitle => $borr->{'title'},	386	wbortitle => $borr->{'title'},
385	wborphone => $borr->{'phone'},	387	wborphone => $borr->{'phone'},
386	wboremail => $borr->{'email'},	388	wboremail => $borr->{'email'},
Lines 425-430 if ( $messages->{'ResFound'}) { Link Here
425	name => $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'},	427	name => $borr->{'surname'} . ", " . $borr->{'title'} . " " . $borr->{'firstname'},
426	borfirstname => $borr->{'firstname'},	428	borfirstname => $borr->{'firstname'},
427	borsurname => $borr->{'surname'},	429	borsurname => $borr->{'surname'},
		430	borcategory => $borr->{'description'},
428	bortitle => $borr->{'title'},	431	bortitle => $borr->{'title'},
429	borphone => $borr->{'phone'},	432	borphone => $borr->{'phone'},
430	boremail => $borr->{'email'},	433	boremail => $borr->{'email'},

Lines 148-155 $(document).ready(function () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-6 / +5 lines)
148	[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title \|html %]</a> to [% Branches.GetName( TransferWaitingAt ) %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1">Cancel transfer</a></h3>	148	[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title \|html %]</a> to [% Branches.GetName( TransferWaitingAt ) %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&&branchcode=[% homebranch %]&op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&canceltransfer=1">Cancel transfer</a></h3>
149	[% IF ( wborcnum ) %]<h5>Hold for:</h5>	149	[% IF ( wborcnum ) %]<h5>Hold for:</h5>
150	<ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">	150	<ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
151	[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>	151	[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
152	<li>[% wborstnum %] [% wboraddress %][% IF ( wboraddress2 ) %]<br />	152	<li>[% wborstnum %] [% wboraddress %][% IF ( wboraddress2 ) %]<br />
153	[% wboraddress2 %]<br />[% END %]	153	[% wboraddress2 %]<br />[% END %]
154	[% wborcity %] [% wborzip %]</li>	154	[% wborcity %] [% wborzip %]</li>
155	[% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]	155	[% IF ( wborphone ) %]<li>[% wborphone %]</li>[% END %]
Lines 181-187 $(document).ready(function () { Link Here
181	[% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]	181	[% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
182	<h4>Hold for:</h4>	182	<h4>Hold for:</h4>
183	<ul>	183	<ul>
184	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>	184	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
185	<li>[% borstnum %] [% boraddress %]<br />	185	<li>[% borstnum %] [% boraddress %]<br />
186	[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]	186	[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
187	[% borcity %] [% borzip %]</li>	187	[% borcity %] [% borzip %]</li>
Lines 222-228 $(document).ready(function () { Link Here
222	<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title \|html %]</a></h3>	222	<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title \|html %]</a></h3>
223	<h4>Hold for: </h4>	223	<h4>Hold for: </h4>
224	<ul>	224	<ul>
225	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>	225	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span> </li>
226	<li>[% borstnum %] [% boraddress %]<br />	226	<li>[% borstnum %] [% boraddress %]<br />
227	[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]	227	[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
228	[% borcity %] [% borzip %]</li>	228	[% borcity %] [% borzip %]</li>
Lines 330-336 $(document).ready(function () { Link Here
330	<ul>	330	<ul>
331	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">	331	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
332	[% borsurname %], [% borfirstname %]	332	[% borsurname %], [% borfirstname %]
333	</a> ([% borcnum %])</li>	333	</a> ([% borcnum %]) <span class="patron-category"> - [% wborcategory %]</span></li>
334	<li>[% borstnum %] [% boraddress %]<br />	334	<li>[% borstnum %] [% boraddress %]<br />
335	[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]	335	[% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
336	[% borcity %] [% borzip %]</li>	336	[% borcity %] [% borzip %]</li>
337	-