@@ -, +, @@ --- .../prog/en/modules/tools/inventory.tt | 136 +++++++++++++++++++++ 1 file changed, 136 insertions(+) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -5,6 +5,137 @@ Koha › Tools › Inventory [% INCLUDE 'doc-head-close.inc' %] +<<<<<<< HEAD +======= +[% INCLUDE 'datatables.inc' %] +[% INCLUDE 'calendar.inc' %] + + +>>>>>>> Bug 19584: Check compare barcodes box when uploading barcodes @@ -347,11 +478,14 @@ if( $("#uploadbarcodes").val() ) { $("#setdate").prop('disabled',false); $("#compareinv2barcd").prop('disabled',false); + $("#compareinv2barcd").attr('checked',true); // default $("#dont_checkin").prop('disabled',false); if( $("#compareinv2barcd").attr('checked') ) { $("fieldset#optionalfilters").show(); + $("#ignoreissued").attr('checked',true); // default } else { $("fieldset#optionalfilters").hide(); + $("#ignoreissued").attr('checked',false); } } else { $("#setdate").prop('disabled',true); @@ -365,7 +499,9 @@ $("#compareinv2barcd").click(function() { if( $("#compareinv2barcd").attr('checked') ) { $("fieldset#optionalfilters").show(); + $("#ignoreissued").attr('checked',true); // default } else { + $("#ignoreissued").attr('checked',false); $("fieldset#optionalfilters").hide(); } }); --