From efb01b66a8ee817124dcdccd5f669923c2e0e3e2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 29 Feb 2016 16:23:14 +0000 Subject: [PATCH] Bug 15675: Fix conflict with bug 15446 (type vs _type) Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- C4/Circulation.pm | 1 + Koha/Account/Line.pm | 2 +- Koha/Account/Lines.pm | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index c5adcbd360..2d2720a0ce 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -674,6 +674,7 @@ C<$issuingimpossible> and C<$needsconfirmation> are some hashref. =item C<$duedates> is a DateTime object. =item C<$inprocess> boolean switch + =item C<$ignore_reserves> boolean switch =back diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm index 773ad2071c..f7578e74f9 100644 --- a/Koha/Account/Line.pm +++ b/Koha/Account/Line.pm @@ -37,7 +37,7 @@ Koha::Account::Lines - Koha accountline Object class =cut -sub type { +sub _type { return 'Accountline'; } diff --git a/Koha/Account/Lines.pm b/Koha/Account/Lines.pm index ae327741db..0e0677ca85 100644 --- a/Koha/Account/Lines.pm +++ b/Koha/Account/Lines.pm @@ -40,7 +40,7 @@ Koha::Account::Lines - Koha Account Line Object set class =cut -sub type { +sub _type { return 'Accountline'; } -- 2.39.5