Bugzilla – Attachment 108722 Details for
Bug 23091
Add options to charge new or restore forgiven overdues when a lost item is returned
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23091: Make relations more explicit
Bug-23091-Make-relations-more-explicit.patch (text/plain), 1.84 KB, created by
Martin Renvoize (ashimema)
on 2020-08-20 09:56:56 UTC
(
hide
)
Description:
Bug 23091: Make relations more explicit
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-08-20 09:56:56 UTC
Size:
1.84 KB
patch
obsolete
>From 35835bab12506d5efa89d7e5515988be19577c32 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 14 Jul 2020 13:59:06 +0100 >Subject: [PATCH] Bug 23091: Make relations more explicit > >This patch simply makes the queries built for the ->debits and ->credits >relations in Koha::Account::Line more explicit. > >Test plan >1/ Ensure tests continue to pass >2/ Run tests with DBIC_TRACE=1 DBIC_TRACE_PROFILE=console and note that >the related queries not include 'credit.' and 'debit.' as appropriate. > >Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> >--- > Koha/Account/Line.pm | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > >diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm >index 7ed59a9ed0..68a8f6a98e 100644 >--- a/Koha/Account/Line.pm >+++ b/Koha/Account/Line.pm >@@ -166,14 +166,15 @@ sub credits { > my ( $self, $cond, $attr ) = @_; > > unless ( $self->is_debit ) { >- Koha::Exceptions::Account::IsNotCredit->throw( >+ Koha::Exceptions::Account::IsNotDebit->throw( > error => 'Account line ' . $self->id . ' is not a debit' > ); > } > >+ my $cond_m = { map { "credit.".$_ => $cond->{$_} } keys %{$cond}}; > my $rs = > $self->_result->search_related('account_offsets_debits') >- ->search_related( 'credit', $cond, $attr ); >+ ->search_related( 'credit', $cond_m, $attr ); > return unless $rs; > return Koha::Account::Lines->_new_from_dbic($rs); > } >@@ -198,9 +199,10 @@ sub debits { > ); > } > >+ my $cond_m = { map { "debit.".$_ => $cond->{$_} } keys %{$cond}}; > my $rs = > $self->_result->search_related('account_offsets_credits') >- ->search_related( 'debit', $cond, $attr ); >+ ->search_related( 'debit', $cond_m, $attr ); > return unless $rs; > return Koha::Account::Lines->_new_from_dbic($rs); > } >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23091
:
96217
|
105529
|
105530
|
105531
|
105544
|
105545
|
105546
|
105547
|
105567
|
105649
|
106871
|
106872
|
106873
|
106874
|
106875
|
106876
|
106906
|
106907
|
106908
|
106909
|
106910
|
106911
|
106912
|
106961
|
107026
|
107027
|
107028
|
107029
|
107030
|
107031
|
107032
|
107033
|
107034
|
107100
|
107101
|
107102
|
107103
|
107104
|
107105
|
107106
|
107107
|
107108
|
107335
|
107336
|
107337
|
107338
|
107339
|
107340
|
107341
|
107342
|
107343
|
108718
|
108719
|
108720
|
108721
|
108722
|
108723
|
108724
|
109571
|
109572
|
109573
|
109574
|
109575
|
109576
|
109577
|
110660
|
110661
|
110662
|
110663
|
110664
|
110665
|
110666
|
110667
|
110720
|
110721
|
110722
|
110723
|
110724
|
110725
|
110726
|
110727
|
111501
|
111502
|
111503
|
111504
|
111505
|
111506
|
111507
|
111508
|
111935
|
111936
|
111965
|
111979
|
111980
|
111981
|
111982
|
111983
|
111984
|
111985
|
111986
|
111987
|
111988
|
111989
|
113081
|
113082
|
113083
|
113084
|
113085
|
113086
|
113087
|
113088
|
113089
|
113090
|
113091