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

(-)a/installer/data/mysql/updatedatabase.pl (-7 / +9 lines)
Lines 8507-8519 if ( CheckVersion($DBversion) ) { Link Here
8507
    ");
8507
    ");
8508
8508
8509
    print "Upgrade to $DBversion done (Bug 10500 - Improve isbn matching when importing records)\n";
8509
    print "Upgrade to $DBversion done (Bug 10500 - Improve isbn matching when importing records)\n";
8510
8511
$DBversion = "3.15.00.XXX";
8512
if ( CheckVersion($DBversion) ) {
8513
    $dbh->do(q{
8514
        DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
8515
    });
8516
    print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
8517
    SetVersion($DBversion);
8510
    SetVersion($DBversion);
8518
}
8511
}
8519
8512
Lines 10511-10516 if ( CheckVersion($DBversion) ) { Link Here
10511
    SetVersion ($DBversion);
10504
    SetVersion ($DBversion);
10512
}
10505
}
10513
10506
10507
$DBversion = "3.21.00.XXX";
10508
if ( CheckVersion($DBversion) ) {
10509
    $dbh->do(q{
10510
        DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
10511
    });
10512
    print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
10513
    SetVersion($DBversion);
10514
}
10515
10514
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10516
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10515
# SEE bug 13068
10517
# SEE bug 13068
10516
# if there is anything in the atomicupdate, read and execute it.
10518
# if there is anything in the atomicupdate, read and execute it.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-3 / +2 lines)
Lines 289-295 $(document).ready(function () { Link Here
289
        [% IF ( soundon ) %]
289
        [% IF ( soundon ) %]
290
        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
290
        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
291
        [% END %]
291
        [% END %]
292
	<div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]</h3>
292
    <div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]</h3>
293
    Transfer now?<br />
293
    Transfer now?<br />
294
    <form method="post" action="returns.pl" name="mainform" id="mainform">
294
    <form method="post" action="returns.pl" name="mainform" id="mainform">
295
    [% IF itemnumber %]
295
    [% IF itemnumber %]
Lines 297-303 $(document).ready(function () { Link Here
297
    [% END %]
297
    [% END %]
298
	<input type="submit" name="dotransfer" value="Yes" class="submit" />
298
	<input type="submit" name="dotransfer" value="Yes" class="submit" />
299
	<input type="submit" name="notransfer" value="No" class="submit" />
299
	<input type="submit" name="notransfer" value="No" class="submit" />
300
	<input type="hidden" name="tobranch" value="[% returnbranch %]" />
300
    <input type="hidden" name="tobranch" value="[% returnbranch %]" />
301
	<input type="hidden" name="transferitem" value="[% itemnumber %]" />
301
	<input type="hidden" name="transferitem" value="[% itemnumber %]" />
302
        <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
302
        <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
303
        <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
303
        <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
304
- 

Return to bug 7981