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

(-)a/installer/data/mysql/updatedatabase.pl (-7 / +10 lines)
Lines 8502-8514 if ( CheckVersion($DBversion) ) { Link Here
8502
    ");
8502
    ");
8503
8503
8504
    print "Upgrade to $DBversion done (Bug 10500 - Improve isbn matching when importing records)\n";
8504
    print "Upgrade to $DBversion done (Bug 10500 - Improve isbn matching when importing records)\n";
8505
8506
$DBversion = "3.15.00.XXX";
8507
if ( CheckVersion($DBversion) ) {
8508
    $dbh->do(q{
8509
        DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
8510
    });
8511
    print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
8512
    SetVersion($DBversion);
8505
    SetVersion($DBversion);
8513
}
8506
}
8514
8507
Lines 10042-10047 if ( CheckVersion($DBversion) ) { Link Here
10042
    SetVersion ($DBversion);
10035
    SetVersion ($DBversion);
10043
}
10036
}
10044
10037
10038
10039
$DBversion = "3.19.00.XXX";
10040
if ( CheckVersion($DBversion) ) {
10041
    $dbh->do(q{
10042
        DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
10043
    });
10044
    print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
10045
    SetVersion($DBversion);
10046
}
10047
10045
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10048
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10046
# SEE bug 13068
10049
# SEE bug 13068
10047
# if there is anything in the atomicupdate, read and execute it.
10050
# 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 276-282 $(document).ready(function () { Link Here
276
        [% IF ( soundon ) %]
276
        [% IF ( soundon ) %]
277
        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
277
        <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
278
        [% END %]
278
        [% END %]
279
	<div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]</h3>
279
    <div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]</h3>
280
    Transfer now?<br />
280
    Transfer now?<br />
281
    <form method="post" action="returns.pl" name="mainform" id="mainform">
281
    <form method="post" action="returns.pl" name="mainform" id="mainform">
282
    [% IF itemnumber %]
282
    [% IF itemnumber %]
Lines 284-290 $(document).ready(function () { Link Here
284
    [% END %]
284
    [% END %]
285
	<input type="submit" name="dotransfer" value="Yes" class="submit" />
285
	<input type="submit" name="dotransfer" value="Yes" class="submit" />
286
	<input type="submit" name="notransfer" value="No" class="submit" />
286
	<input type="submit" name="notransfer" value="No" class="submit" />
287
	<input type="hidden" name="tobranch" value="[% returnbranch %]" />
287
    <input type="hidden" name="tobranch" value="[% returnbranch %]" />
288
	<input type="hidden" name="transferitem" value="[% itemnumber %]" />
288
	<input type="hidden" name="transferitem" value="[% itemnumber %]" />
289
        <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
289
        <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
290
        <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
290
        <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
291
- 

Return to bug 7981