@@ -, +, @@
pulldown
---
.../prog/en/modules/tools/import_borrowers.tt | 16 ++++++++--------
tools/import_borrowers.pl | 7 +++----
2 files changed, 11 insertions(+), 12 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -321,16 +321,16 @@
--- a/tools/import_borrowers.pl
+++ a/tools/import_borrowers.pl
@@ -114,8 +114,7 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
my $handle = $input->upload('uploadborrowers');
my %defaults = $input->Vars;
my $overwrite_passwords = defined $input->param('overwrite_passwords') ? 1 : 0;
- my $update_dateexpiry = defined $input->param('update_dateexpiry') ? 1 : 0;
- my $update_dateexpiry_from_today = defined $input->param('update_dateexpiry_from_today') ? 1 : 0;
+ my $update_dateexpiry = $input->param('update_dateexpiry');
my $return = $Import->import_patrons(
{
file => $handle,
@@ -125,8 +124,8 @@ if ( $uploadborrowers && length($uploadborrowers) > 0 ) {
overwrite_passwords => $overwrite_passwords,
preserve_extended_attributes => scalar $input->param( 'ext_preserve' ) || 0,
preserve_fields => \@preserve_fields,
- update_dateexpiry => $update_dateexpiry,
- update_dateexpiry_from_today => $update_dateexpiry_from_today,
+ update_dateexpiry => $update_dateexpiry ? 1 : 0,
+ update_dateexpiry_from_today => $update_dateexpiry eq "now" ? 1 : 0,
send_welcome => $welcome_new,
}
);
--