Bugzilla – Attachment 83276 Details for
Bug 19489
Detailed description of charges on Accounting tab
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19489: (Improvements in KohaDate) Development for fines and Fees Module
Bug-19489-Improvements-in-KohaDate-Development-for.patch (text/plain), 6.08 KB, created by
Devinim
on 2018-12-17 12:49:25 UTC
(
hide
)
Description:
Bug 19489: (Improvements in KohaDate) Development for fines and Fees Module
Filename:
MIME Type:
Creator:
Devinim
Created:
2018-12-17 12:49:25 UTC
Size:
6.08 KB
patch
obsolete
>From 053e1a4eddf39cbf938cca09a99b0a0952fc2f96 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Nazl=C4=B1=20=C3=87etin?= <nazli@devinim.com.tr> >Date: Mon, 17 Dec 2018 12:44:52 +0000 >Subject: [PATCH] Bug 19489: (Improvements in KohaDate) Development for fines > and Fees Module > >--- > .../intranet-tmpl/prog/en/modules/members/accountline-details.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt | 4 ++-- > members/printinvoice.pl | 2 -- > 5 files changed, 8 insertions(+), 10 deletions(-) > >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 acee3ed6016..687326b29eb 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 >@@ -69,13 +69,13 @@ > > <td> > [% IF ( accountline.issue_id ) %] >- [% accountline.issue.date_due | $KohaDates with_hours => 1 | html %] >+ [% accountline.issue.date_due | $KohaDates as_due_date => 1 %] > [% END %] > </td> > > <td> > [% IF ( accountline.issue_id ) %] >- [% accountline.issue.returndate | $KohaDates with_hours => 1 | html %] >+ [% accountline.issue.returndate | $KohaDates with_hours => 1 %] > [% END %] > </td> > >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 c1ac655667f..87cf71c6d64 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -68,8 +68,8 @@ > [%- IF account.description %], [% account.description | html %][% END %] > [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td> > <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.issue.date_due | $KohaDates with_hours => 1 | html %][% END %]</td> >- <td>[% IF ( account.issue_id ) %][% account.issue.returndate | $KohaDates with_hours => 1 | html %][% END %]</td> >+ <td>[% IF ( account.issue_id ) %][% account.issue.date_due | $KohaDates as_due_date => 1 %][% END %]</td> >+ <td>[% IF ( account.issue_id ) %][% account.issue.returndate | $KohaDates with_hours => 1 %][% 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> >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 c9d96ced26e..1c4f274ffc2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -119,12 +119,12 @@ > </td> > <td> > [% IF line.issue_id %] >- [% line.issue.date_due | $KohaDates with_hours => 1 | html %] >+ [% line.issue.date_due | $KohaDates as_due_date => 1 %] > [% END %] > </td> > <td> > [% IF line.issue_id %] >- [% line.issue.returndate | $KohaDates with_hours => 1 | html %] >+ [% line.issue.returndate | $KohaDates with_hours => 1 %] > [% END %] > </td> > <td><input type="text" name="payment_note_[% line.accountlines_id | html %]" /></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >index 1e28356c488..eaba0dd6c7d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt >@@ -61,8 +61,8 @@ > [%- IF account.description %], [% account.description | html %][% END %] > </td> > <td>[% account.item.barcode | html %]</td> >- <td>[% account.issue.date_due | $KohaDates with_hours => 1 | html %]</td> >- <td>[% account.issue.returndate | $KohaDates with_hours => 1 | html %]</td> >+ <td>[% account.issue.date_due | $KohaDates as_due_date => 1 %]</td> >+ <td>[% account.issue.returndate | $KohaDates with_hours => 1 %]</td> > <td>[% account.note | html %]</td> > [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td> > [% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding | $Price %]</td> >diff --git a/members/printinvoice.pl b/members/printinvoice.pl >index 5f8e22a7cc9..49e777ef77a 100755 >--- a/members/printinvoice.pl >+++ b/members/printinvoice.pl >@@ -59,8 +59,6 @@ my $accountline_object = Koha::Account::Lines->find($accountlines_id); > my $accountline = $accountline_object->unblessed; > $accountline->{item} = $accountline_object->item || "" ; > $accountline->{issue} = $accountline_object->issue || ""; >-#$accountline->{'item'} = $accountline->{itemnumber} ? $accountline_object->item : "" ; >-#$accountline->{'issue'} = $accountline->{issue_id} ? $accountline_object->issue : "" ; > > my $totalcredit; > if ( $total <= 0 ) { >-- >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 19489
:
81956
|
81989
|
81991
|
82519
|
82520
|
82614
|
82615
|
82846
|
83109
|
83110
|
83242
|
83276
|
83277
|
83299
|
83300
|
83301
|
83618
|
83619
|
83620
|
85236
|
85237
|
85275
|
85315
|
85668
|
85669
|
85670
|
85671
|
85672
|
85673
|
85674
|
85675
|
85731
|
85732
|
85733
|
85734
|
85735
|
85736
|
85737
|
85738