From 65c4694b7a4d0aba5fac055a12d171280a8b80ea Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 3 Mar 2016 08:41:38 +0000
Subject: [PATCH]  Bug 15084: Fix conflict with bug 15446 (type vs _type)

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
---
 Koha/Acquisition/Currencies.pm | 4 ++--
 Koha/Acquisition/Currency.pm   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Koha/Acquisition/Currencies.pm b/Koha/Acquisition/Currencies.pm
index cdbbfed98f..f733980644 100644
--- a/Koha/Acquisition/Currencies.pm
+++ b/Koha/Acquisition/Currencies.pm
@@ -44,11 +44,11 @@ sub get_active {
     return $self->SUPER::search( { active => 1 } )->next;
 }
 
-=head3 type
+=head3 _type
 
 =cut
 
-sub type {
+sub _type {
     return 'Currency';
 }
 
diff --git a/Koha/Acquisition/Currency.pm b/Koha/Acquisition/Currency.pm
index da0bcd2386..63c8693339 100644
--- a/Koha/Acquisition/Currency.pm
+++ b/Koha/Acquisition/Currency.pm
@@ -53,11 +53,11 @@ sub store {
     return $result;
 }
 
-=head3 type
+=head3 _type
 
 =cut
 
-sub type {
+sub _type {
     return 'Currency';
 }
 
-- 
2.39.5