From 41c6940fcdb6522efef68430dcf88683e1831e63 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 13 Dec 2019 17:37:36 +0100 Subject: [PATCH] Bug 24157: Add new method Acq::Invoice::Adjustement->fund Moving to its own commit in case we want to cherry-pick or move it to its own bug report. Sponsored-by: Galway-Mayo Institute of Technology Signed-off-by: Owen Leonard Signed-off-by: Alex Arnaud Signed-off-by: Jonathan Druart --- Koha/Acquisition/Invoice/Adjustment.pm | 18 +++++++++++++++++- .../Koha/Acquisition/Invoice/Adjustments.t | 10 +++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Koha/Acquisition/Invoice/Adjustment.pm b/Koha/Acquisition/Invoice/Adjustment.pm index 4dbe90225d..0d0bac7353 100644 --- a/Koha/Acquisition/Invoice/Adjustment.pm +++ b/Koha/Acquisition/Invoice/Adjustment.pm @@ -20,7 +20,8 @@ use Modern::Perl; use Carp; use Koha::Database; -use Koha::Acquisition::Invoice; +use Koha::Acquisition::Invoices; +use Koha::Acquisition::Funds; use base qw(Koha::Object); @@ -48,6 +49,21 @@ sub invoice { return Koha::Acquisition::Invoice->_new_from_dbic( $invoice_rs ); } +=head3 fund + +my $fund = $adjustment->fund; + +Return the fund for this adjustment + +=cut + +sub fund { + my ( $self ) = @_; + my $fund_rs = $self->_result->budget; + return unless $fund_rs; + return Koha::Acquisition::Fund->_new_from_dbic( $fund_rs ); +} + =head3 type =cut diff --git a/t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t b/t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t index d5e2309eb0..3419672b79 100644 --- a/t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t +++ b/t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t @@ -19,7 +19,7 @@ use Modern::Perl; -use Test::More tests => 7; +use Test::More tests => 8; use Koha::Database; @@ -72,4 +72,12 @@ subtest 'invoice' => sub { is( $invoice->invoiceid, $retrieved_adj->invoiceid, 'Koha::Acquisition::Invoice::Adjustment->invoice should return the correct invoice' ); }; +subtest 'fund' => sub { + plan tests => 2; + + my $fund = $retrieved_adj->fund; + is( ref( $fund ), 'Koha::Acquisition::Fund', 'Koha::Acquisition::Invoice::Adjustment->fund should return a Koha::Acquisition::Fund' ); + is( $fund->budget_id, $retrieved_adj->budget_id, 'Koha::Acquisition::Invoice::Adjustment->fund should return the correct fund ' ); +}; + $schema->storage->txn_rollback; -- 2.39.5