From 42c634745cac4fc33a53bc1312a3e143a2e0ffbc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 23 Oct 2017 16:59:11 -0300 Subject: [PATCH] Bug 12768: Fix bad merge resolution conflict RM note: I have applied https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=68427 on top of other patches that were already pushed. But it was supposed to replace them, this change revert what was in https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=68417 Signed-off-by: Jonathan Druart --- C4/Accounts.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/C4/Accounts.pm b/C4/Accounts.pm index b99d936eca..0717215f8b 100644 --- a/C4/Accounts.pm +++ b/C4/Accounts.pm @@ -301,15 +301,10 @@ sub manualinvoice { } )->store(); - my $offset_type = - $type eq 'L' ? 'Lost Item' - : $type eq 'PF' ? 'Processing Fee' - : 'Manual Debit'; - my $account_offset = Koha::Account::Offset->new( { debit_id => $accountline->id, - type => $offset_type, + type => 'Manual Debit', amount => $amount, } )->store(); -- 2.20.1