From fb6da950a73a1cb03f1df4f10843b0d708d60391 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 2 Mar 2018 15:04:10 +0000
Subject: [PATCH] Bug 19191: Remove need for bug 19966

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 Koha/Account.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Koha/Account.pm b/Koha/Account.pm
index a19faf2d48..33ef868716 100644
--- a/Koha/Account.pm
+++ b/Koha/Account.pm
@@ -270,11 +270,13 @@ sub pay {
             letter_code            => uc("ACCOUNT_$type"),
             message_transport_type => 'email',
             lang    => Koha::Patrons->find( $self->{patron_id} )->lang,
-            objects => {
-                patron  => scalar Koha::Patrons->find( $self->{patron_id} ),
-                library => scalar Koha::Libraries->find( $self->{library_id} ),
-                offsets => \@account_offsets,
-                credit  => $payment,
+            tables => {
+                borrowers       => $self->{patron_id},
+                branches        => $self->{library_id},
+            },
+            substitute => {
+                credit => $payment,
+                offsets => scalar Koha::Account::Offsets->search( { id => { -in => [ map { $_->id } @account_offsets ] } } ),
             },
           )
       )
-- 
2.39.2