Bugzilla – Attachment 74765 Details for
Bug 2696
Fine payments should show what was paid for
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 2696 [QA Followup]: Fix POD, results sorting, permissions
-Bug-2696-QA-Followup-Fix-POD-results-sorting-perm.patch (text/plain), 3.17 KB, created by
Kyle M Hall (khall)
on 2018-04-23 18:24:33 UTC
(
hide
)
Description:
Bug 2696 [QA Followup]: Fix POD, results sorting, permissions
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2018-04-23 18:24:33 UTC
Size:
3.17 KB
patch
obsolete
>From 243309198f4332bf906119c25daa4922879a5b81 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatetsolutions.com> >Date: Mon, 23 Apr 2018 14:23:00 -0400 >Subject: [PATCH] Bug 2696 [QA Followup]: Fix POD, results sorting, > permissions > >--- > Koha/Account/Offset.pm | 10 +++++++++- > .../prog/en/modules/members/accountline-details.tt | 2 +- > members/accountline-details.pl | 9 ++++++--- > 3 files changed, 16 insertions(+), 5 deletions(-) > >diff --git a/Koha/Account/Offset.pm b/Koha/Account/Offset.pm >index 3110d6a52b..f456d16545 100644 >--- a/Koha/Account/Offset.pm >+++ b/Koha/Account/Offset.pm >@@ -20,7 +20,7 @@ use Modern::Perl; > use Carp; > > use Koha::Database; >-use Koha::Account::Line; >+use Koha::Account::Lines; > > use base qw(Koha::Object); > >@@ -38,6 +38,10 @@ Account offsets are used to track the changes in account lines > > =head3 debit > >+my $debit = $account_offset->debit; >+ >+Returns the related accountline that increased the amount owed by the patron. >+ > =cut > > sub debit { >@@ -49,6 +53,10 @@ sub debit { > > =head3 credit > >+my $credit = $account_offset->credit; >+ >+Returns the related accountline that decreased the amount owed by the patron. >+ > =cut > > sub credit { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >index aaaa78c871..a1085edb5d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >@@ -94,7 +94,7 @@ > </thead> > > <tbody> >- [% FOREACH ao IN account_offsets.sort('created_on') %] >+ [% FOREACH ao IN account_offsets %] > [% IF type == 'credit' %] > [% SET offset_accountline = ao.debit %] > [% ELSIF type == 'debit' %] >diff --git a/members/accountline-details.pl b/members/accountline-details.pl >index 856516c48e..1ac40a0210 100644 >--- a/members/accountline-details.pl >+++ b/members/accountline-details.pl >@@ -35,7 +35,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > type => "intranet", > authnotrequired => 0, > flagsrequired => { >- borrowers => 1, >+ borrowers => 'edit_borrowers', > updatecharges => 'remaining_permissions' > }, > } >@@ -49,12 +49,15 @@ if ($accountline) { > my $type = $accountline->amount < 0 ? 'credit' : 'debit'; > my $column = $type eq 'credit' ? 'credit_id' : 'debit_id'; > >- my @account_offsets = Koha::Account::Offsets->search( { $column => $accountlines_id } ); >+ my $account_offsets = Koha::Account::Offsets->search( >+ { $column => $accountlines_id }, >+ { order_by => 'created_on' }, >+ ); > > $template->param( > type => $type, > accountline => $accountline, >- account_offsets => \@account_offsets, >+ account_offsets => $account_offsets, > > finesview => 1, > ); >-- >2.15.1 (Apple Git-101)
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 2696
:
800
|
3069
|
9583
|
64287
|
64293
|
64342
|
64345
|
64346
|
64350
|
67479
|
70031
|
72024
|
72088
|
72263
|
74672
|
74673
|
74674
| 74765 |
74817