Attachment #36701 for bug #13647

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

Lines 160-166 else { Link Here

(-)a/circ/circulation.pl (-1 / +1 lines)
160	my ($datedue,$invalidduedate);	160	my ($datedue,$invalidduedate);
161		161
162	my $duedatespec_allow = C4::Context->preference('SpecifyDueDate');	162	my $duedatespec_allow = C4::Context->preference('SpecifyDueDate');
163	if( $onsite_checkout ) {	163	if( $onsite_checkout && !$duedatespec_allow ) {
164	$datedue = output_pref({ dt => dt_from_string, dateonly => 1, dateformat => 'iso' });	164	$datedue = output_pref({ dt => dt_from_string, dateonly => 1, dateformat => 'iso' });
165	$datedue .= ' 23:59:00';	165	$datedue .= ' 23:59:00';
166	} elsif( $duedatespec_allow ) {	166	} elsif( $duedatespec_allow ) {

Lines 50-56 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +3 lines)
50	function toggle_onsite_checkout(){	50	function toggle_onsite_checkout(){
51	if ( $("#onsite_checkout").attr('checked') ) {	51	if ( $("#onsite_checkout").attr('checked') ) {
52	$("#duedatespec").val("[% todaysdate \| $KohaDates with_hours => 1%]")	52	$("#duedatespec").val("[% todaysdate \| $KohaDates with_hours => 1%]")
53	$("#duedatespec").datetimepicker('destroy');	53	[% IF !Koha.Preference('SpecifyDueDate') %]
		54	$("#duedatespec").datetimepicker('destroy');
		55	[% END %]
54	} else {	56	} else {
55	$("#duedatespec").datetimepicker({	57	$("#duedatespec").datetimepicker({
56	onClose: function(dateText, inst) { $("#barcode").focus(); },	58	onClose: function(dateText, inst) { $("#barcode").focus(); },
57	-

Return to bug 13647