Attachment 65821 Details for Bug 12598 – Fis conflict with bug 16911

[patch] Fis conflict with bug 16911

0003-Bug-12598-Fix-conflict-with-bug-16911.patch (text/plain), 1.11 KB, created by Colin Campbell on 2017-08-10 14:43:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Campbell

Created: 2017-08-10 14:43:39 UTC

Size: 1.11 KB

patch

obsolete

>From 42666f420e72d0c6565d52c8a52486e55e3beb5a Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 6 Jul 2017 12:49:01 -0300
>Subject: [PATCH 3/5] Bug 12598: Fix conflict with bug 16911
>
>Tests will have to be written for this change
>
>Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
>---
> 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.13.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 12598: 29807 | 29808 | 29809 | 29939 | 30755 | 30780 | 35557 | 35558 | 35559 | 35560 | 35848 | 35849 | 35850 | 35851 | 35964 | 36684 | 36685 | 36687 | 36688 | 36690 | 36692 | 36693 | 36694 | 36695 | 36696 | 39124 | 39125 | 39126 | 39127 | 39128 | 41790 | 41791 | 41792 | 41793 | 41794 | 44065 | 44066 | 44067 | 44068 | 44069 | 48753 | 48754 | 48755 | 48756 | 48757 | 50693 | 50694 | 50695 | 50696 | 50697 | 50698 | 50699 | 50700 | 50704 | 51122 | 51357 | 51358 | 51359 | 51360 | 51361 | 51362 | 51363 | 51364 | 51365 | 51366 | 51367 | 51368 | 51369 | 51370 | 51371 | 51372 | 52323 | 52324 | 52325 | 52326 | 52327 | 52328 | 52329 | 52330 | 52331 | 52332 | 52333 | 52540 | 64437 | 64438 | 64855 | 65214 | 65215 | 65216 | 65217 | 65218 | 65819 | 65820 | 65821 | 65822 | 65823 | 65824 | 66353 | 66354 | 66355 | 66356 | 66357 | 66358 | 66359 | 66575 | 66576 | 66577 | 66578 | 66579 | 66580 | 66581 | 66582 | 67276 | 67277 | 70265 | 70266 | 71755 | 71756 | 71757 | 71758 | 71759 | 71760 | 71761 | 71762 | 71763 | 71764 | 71765 | 71766