From 70c45c37813860652914a381195f976c554b71d9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 6 Jul 2017 12:49:01 -0300 Subject: [PATCH] Bug 12598: Fix conflict with bug 16911 Tests will have to be written for this change Signed-off-by: Colin Campbell Signed-off-by: Jonathan Druart --- Koha/Patrons/Import.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm index 9155c36b3c..10173bb755 100644 --- a/Koha/Patrons/Import.pm +++ b/Koha/Patrons/Import.pm @@ -158,7 +158,7 @@ sub import_patrons { # Default date enrolled and date expiry if not already set. $borrower{dateenrolled} = $self->today_iso() unless $borrower{dateenrolled}; - $borrower{dateexpiry} = GetExpiryDate( $borrower{categorycode}, $borrower{dateenrolled} ) unless $borrower{dateexpiry}; + $borrower{dateexpiry} = Koha::Patron::Categories->find( $borrower{categorycode} )->get_expiry_date( $borrower{dateenrolled} ) unless $borrower{dateexpiry}; my $borrowernumber; my $member; -- 2.39.5