Bug 12768: Fix bad merge resolution conflict
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 23 Oct 2017 19:59:11 +0000 (16:59 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 23 Oct 2017 19:59:13 +0000 (16:59 -0300)
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 <jonathan.druart@bugs.koha-community.org>
C4/Accounts.pm

index b99d936..0717215 100644 (file)
@@ -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();