[% IF ( stickyduedate ) %]
@@ -647,7 +651,7 @@ No patron matched
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
index b50f038d7a..2bf0868c21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
@@ -553,7 +553,11 @@ $(document).ready(function () {
minute: 59
});
$("#duedatespec").datetimepicker({
- onClose: function(dateText, inst) { setTimeout(function() { $('#checkout-barcode').trigger('focus'), 1 }); },
+ onClose: function(dateText, inst) {
+ if (validate_date(dateText, inst) ) {
+ setTimeout(function() { $('#checkout-barcode').trigger('focus'), 1 });
+ }
+ },
hour: 23,
minute: 59
});
@@ -690,7 +694,7 @@ $(document).ready(function () {
Specify due date [% INCLUDE 'date-format.inc' %]:
-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index bca3da012c..c59f067ad9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -58,7 +58,11 @@ $(document).ready(function () {
}, columns_settings);
$("#return_date_override").datetimepicker({
- onClose: function(dateText, inst) { $("#barcode").focus(); },
+ onClose: function(dateText, inst) {
+ if (validate_date(dateText, inst) ) {
+ $("#barcode").focus();
+ }
+ },
defaultDate: -1,
hour: 23,
minute: 59,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 54695170da..66d2835289 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1003,7 +1003,7 @@ $(document).ready(function() {
- -
+
-
Clear date
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 65bdb7a764..72c1548ee6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -84,11 +84,6 @@ $(document).ready(function() {
});[% END %]
$("#suspend_until").datepicker({ minDate: 1 }); // require that hold suspended until date is after today
- $("#newduedate").datetimepicker({
- minDate: 1, // require that renewal date is after today
- hour: 23,
- minute: 59
- });
$("#view_restrictions").on("click",function(){
$('#debarments-tab-link').click();
});
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 38f9db7087..061bbb26af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -401,14 +401,14 @@ function checkMultiHold() {
[% IF ( reserve_in_future ) %]
-
+
Clear date
[% END %]
-
+
Clear date
@@ -881,7 +881,7 @@ function checkMultiHold() {
[% IF AutoResumeSuspendedHolds %]
-
+
Clear date
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 54227e66e2..1b7f9fac05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc'%]
Koha › Tools › Batch patron modification
@@ -335,7 +336,7 @@
[% END %]
[% IF field.mandatory %]
-
+
[% ELSE %]
[% END %]
@@ -354,7 +355,7 @@
[% END %]
[% END %]
[% IF ( field.type == 'date' ) %]
-
+
Clear
[% END %]
[% IF field.mandatory %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
index d1481ee42a..cb0cddd5e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js
@@ -29,12 +29,19 @@ $(document).ready(function() {
});
$("#newduedate").datetimepicker({
+ onClose: function(dateText, inst) {
+ validate_date(dateText, inst);
+ },
minDate: 1, // require that renewal date is after today
hour: 23,
minute: 59
});
$("#duedatespec").datetimepicker({
- onClose: function(dateText, inst) { $("#barcode").focus(); },
+ onClose: function(dateText, inst) {
+ if ( validate_date(dateText, inst) ) {
+ $("#barcode").focus();
+ }
+ },
hour: 23,
minute: 59
});