Attachment #38237 for bug #7981

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




    ");

    print "Upgrade to $DBversion done (Bug 10500 - Improve isbn matching when importing records)\n";

$DBversion = "3.15.00.XXX";
if ( CheckVersion($DBversion) ) {
    $dbh->do(q{
        DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
    });
    print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
    SetVersion($DBversion);
}


    SetVersion($DBversion);
}

$DBversion = "3.19.00.XXX";
if ( CheckVersion($DBversion) ) {
    $dbh->do(q{
        DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
    });
    print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
    SetVersion($DBversion);
}

# DEVELOPER PROCESS, search for anything to execute in the db_update directory
# SEE bug 13068
# if there is anything in the atomicupdate, read and execute it.

Lines 276-282 $(document).ready(function () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-3 / +2 lines)
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

Lines 8502-8514 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (-7 / +9 lines)
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 10149-10154 if(CheckVersion($DBversion)) { Link Here
10149	SetVersion($DBversion);	10142	SetVersion($DBversion);
10150	}	10143	}
10151		10144
		10145	$DBversion = "3.19.00.XXX";
		10146	if ( CheckVersion($DBversion) ) {
		10147	$dbh->do(q{
		10148	DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
		10149	});
		10150	print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
		10151	SetVersion($DBversion);
		10152	}
		10153
10152	# DEVELOPER PROCESS, search for anything to execute in the db_update directory	10154	# DEVELOPER PROCESS, search for anything to execute in the db_update directory
10153	# SEE bug 13068	10155	# SEE bug 13068
10154	# if there is anything in the atomicupdate, read and execute it.	10156	# if there is anything in the atomicupdate, read and execute it.