Bugzilla – Attachment 101912 Details for
Bug 24995
Add issuedate to table_account_fines and finest in Accounting tab
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24995: Add issuedate to table_account_fines and finest
Bug-24995-Add-issuedate-to-tableaccountfines-and-f.patch (text/plain), 5.86 KB, created by
Lucas Gass (lukeg)
on 2020-03-26 21:26:53 UTC
(
hide
)
Description:
Bug 24995: Add issuedate to table_account_fines and finest
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2020-03-26 21:26:53 UTC
Size:
5.86 KB
patch
obsolete
>From b16a5a6e1b7d182beb0924bf7e4a1ba859c3d33a Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Thu, 26 Mar 2020 21:17:42 +0000 >Subject: [PATCH] Bug 24995: Add issuedate to table_account_fines and finest > >TO TEST: >1. Have a patron with some fines on an item. Try accruing fines. >2. Go to the accounting tab and look at both the Tranaction tab and Make a payment Tab >3. No Issue Date >4. Apply patch >5. Check those tabs again and see the issue date displays. >6. Go to column configuration and try to hide the issuedate, make sure it hides properly. Try this for both tables. Also make sure other columns hide properly. >7. Sign off! >--- > admin/columns_settings.yml | 4 ++++ > .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 6 ++++-- > koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 12 +++++++++--- > 3 files changed, 17 insertions(+), 5 deletions(-) > >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index 08ea52b925..4339a10a93 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -531,6 +531,8 @@ modules: > - > columnname: returndate > - >+ columnname: issuedate >+ - > columnname: note > - > columnname: amount >@@ -568,6 +570,8 @@ modules: > - > columnname: returndate > - >+ columnname: issuedate >+ - > columnname: note > - > columnname: amount >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index b16da005f9..6ab3c057b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -50,6 +50,7 @@ > <th>Barcode</th> > <th>Due date</th> > <th>Return date</th> >+ <th>Issue date</th> > <th>Home library</th> > <th>Note</th> > <th>Amount</th> >@@ -71,6 +72,7 @@ > <td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td> > <td>[% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td> > <td>[% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td> >+ <td>[% IF ( account.issue_id ) %][% account.checkout.issuedate | $KohaDates %][% END %]</td> > <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td> > <td>[% account.note | html_line_break %]</td> > [% IF account.amount <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td> >@@ -100,7 +102,7 @@ > [% END %] > <tfoot> > <tr> >- <td colspan="9">Total due</td> >+ <td colspan="10">Total due</td> > [% IF ( totalcredit ) %] > <td class="credit" style="text-align: right;">[% total | $Price %]</td> > [% ELSE %] >@@ -328,7 +330,7 @@ > var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408 > $(this).html('<i class="fa fa-filter"></i> '+txtInactivefilter); > } >- table_account_fines.fnFilter(filteredValue, 9, true, false); >+ table_account_fines.fnFilter(filteredValue, 10, true, false); > $(this).toggleClass('filtered'); > }); > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 406b3b0766..d79c845651 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -52,6 +52,7 @@ > <th>Barcode</th> > <th>Due date</th> > <th>Return date</th> >+ <th>Issue date</th> > <th class="NoSort">Payment note</th> > <th>Amount</th> > <th>Amount outstanding</th> >@@ -106,6 +107,11 @@ > [% line.checkout.returndate | $KohaDates with_hours => 1 %] > [% END %] > </td> >+ <td> >+ [% IF line.issue_id %] >+ [% line.checkout.issuedate | $KohaDates %] >+ [% END %] >+ </td> > <td class="actions"> > <a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id | html %]"><i class="fa fa-plus"></i> Add note</a> > <span class="payment_note" id="payment_note_[% line.accountlines_id | html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id | html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span> >@@ -118,16 +124,16 @@ > > <tfoot> > <tr> >- <td class="total" colspan="10">Total due:</td> >+ <td class="total" colspan="11">Total due:</td> > <td style="text-align: right;">[% total | $Price %]</td> > </tr> > [% IF outstanding_credits.total_outstanding < 0 %] > <tr> >- <td class="total" colspan="10">Outstanding credits could be applied: </td> >+ <td class="total" colspan="11">Outstanding credits could be applied: </td> > <td class="credit" style="text-align: right;"><button type="submit" id="apply_credits" name="apply_credits" value="apply_credits" class="btn btn-default btn-sm">Apply <strong class="credit">[% outstanding_credits.total_outstanding | $Price %]</strong></button></td> > </tr> > <tr> >- <td class="total" colspan="10">Total due if credit applied:</td> >+ <td class="total" colspan="11">Total due if credit applied:</td> > <td style="text-align: right;">[% total + outstanding_credits.total_outstanding | $Price %]</td> > </tr> > [% END %] >-- >2.11.0
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 24995
:
101911
|
101912
|
102389
|
104169
|
104171