Bugzilla – Attachment 141619 Details for
Bug 24381
ACCOUNT_CREDIT and ACCOUNT_DEBIT slip not printing information about paid fines/fees
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24381: Update sample notices
Bug-24381-Update-sample-notices.patch (text/plain), 16.36 KB, created by
Lucas Gass (lukeg)
on 2022-10-11 21:56:42 UTC
(
hide
)
Description:
Bug 24381: Update sample notices
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2022-10-11 21:56:42 UTC
Size:
16.36 KB
patch
obsolete
>From c6d788b660b63a07e5049665083f22a7ce63ca2b Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 16 Jul 2020 12:01:30 +0100 >Subject: [PATCH] Bug 24381: Update sample notices > >This patch update the sample notices for new installs > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> > >Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> >--- > .../mysql/en/mandatory/sample_notices.yml | 342 ++++++++++-------- > 1 file changed, 185 insertions(+), 157 deletions(-) > >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index a98e6a1dd7..f4a9d9abcd 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -52,68 +52,77 @@ tables: > message_transport_type: print > lang: default > content: >- - "[% USE Price %]" >- - "[% PROCESS 'accounts.inc' %]" >+ - "[% PROCESS \"accounts.inc\" %]" > - "<table>" >- - "[% IF ( LibraryName ) %]" >- - " <tr>" >- - " <th colspan=\"5\" class=\"centerednames\">" >+ - " [% IF ( LibraryName ) %]" >+ - " <tr>" >+ - " <th colspan=\"2\" class=\"centerednames\">" > - " <h3>[% LibraryName | html %]</h3>" >- - " </th>" >- - " </tr>" >- - "[% END %]" >- - " <tr>" >- - " <th colspan=\"5\" class=\"centerednames\">" >- - " <h2><u>Fee receipt</u></h2>" >- - " </th>" >- - " </tr>" >- - " <tr>" >- - " <th colspan=\"5\" class=\"centerednames\">" >- - " <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>" >- - " </th>" >- - " </tr>" >- - " <tr>" >- - " <th colspan=\"5\">" >+ - " </th>" >+ - " </tr>" >+ - " [% END %]" >+ - " [% IF credit.library %]" >+ - " <tr>" >+ - " <th colspan=\"2\" class=\"centerednames\">" >+ - " <h2>[% credit.library.branchname | html %]</h2>" >+ - " </th>" >+ - " </tr>" >+ - " [% END %]" >+ - " <tr>" >+ - " <th colspan=\"2\" class=\"centerednames\">" >+ - " <h3>[% credit.date | $KohaDates %]</h3>" >+ - " </th>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Transaction ID: </td>" >+ - " <td>[% credit.accountlines_id %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Operator ID: </td>" >+ - " <td>[% credit.manager_id %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Payment type: </td>" >+ - " <td>[% credit.payment_type %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <th colspan=\"2\" class=\"centerednames\">" >+ - " <h2><u>Payment receipt</u></h2>" >+ - " </th>" >+ - " </tr>" >+ - " <tr>" >+ - " <th colspan=\"2\">" > - " Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />" > - " Card number: [% credit.patron.cardnumber | html %]<br />" >- - " </th>" >- - " </tr>" >- - " <tr>" >- - " <th>Created</th>" >- - " <th>Updated</th>" >- - " <th>Description of charges</th>" >- - " <th>Note</th>" >- - " <th>Amount</th>" >- - " </tr>" >- - "" >- - " <tr class=\"highlight\">" >- - " <td>[% credit.date | $KohaDates %]</td>" >- - " <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>" >- - " <td>" >- - " [% PROCESS account_type_description account=credit %]" >- - " [%- IF credit.description %], [% credit.description | html %][% END %]" >- - " </td>" >- - " <td>[% credit.note | html %]</td>" >- - " <td class=\"credit\">[% credit.amount | $Price %]</td>" >- - " </tr>" >- - "" >- - "[% IF ( tendered ) %]" >- - " <tr>" >- - " <td colspan=\"3\">Amount tendered: </td>" >- - " <td>[% tendered | $Price %]</td>" >- - " </tr>" >- - " <tr>" >- - " <td colspan=\"3\">Change given: </td>" >- - " <td>[% change | $Price %]</td>" >- - " </tr>" >- - "[% END %]" >- - "" >- - "<tfoot>" >- - " <tr>" >- - " <td colspan=\"4\">Total outstanding dues as on date: </td>" >- - " [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>" >- - " </tr>" >- - "</tfoot>" >+ - " </th>" >+ - " </tr>" >+ - " <tr>" >+ - " <th>Description of charges</th>" >+ - " <th>Amount</th>" >+ - " </tr>" >+ - " [% FOREACH offset IN credit.credit_offsets %]" >+ - " <tr>" >+ - " <td>[% PROCESS account_type_description account=offset.debit %]</td>" >+ - " <td>[% offset.amount * -1 | $Price %]</td>" >+ - " </tr>" >+ - " [% END %]" >+ - " <tfoot>" >+ - " <tr class=\"highlight\">" >+ - " <td>Total:</td>" >+ - " <td>[% credit.amount * -1 | $Price %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Change given: </td>" >+ - " <td>[% change | $Price %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td colspan=\"2\"></td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Account balance as on date:</td>" >+ - " <td>[% credit.patron.account.balance * -1 | $Price %]</td>" >+ - " </tr>" >+ - " </tfoot>" > - "</table>" > > - module: circulation >@@ -126,57 +135,77 @@ tables: > lang: default > content: > - "[% USE Price %]" >- - "[% PROCESS 'accounts.inc' %]" >+ - "[% PROCESS \"accounts.inc\" %]" > - "<table>" >- - " [% IF ( LibraryName ) %]" >+ - " [% IF ( LibraryName ) %]" > - " <tr>" >- - " <th colspan=\"6\" class=\"centerednames\">" >+ - " <th colspan=\"3\" class=\"centerednames\">" > - " <h3>[% LibraryName | html %]</h3>" > - " </th>" > - " </tr>" >- - " [% END %]" >- - "" >- - " <tr>" >- - " <th colspan=\"6\" class=\"centerednames\">" >- - " <h2><u>INVOICE</u></h2>" >- - " </th>" >- - " </tr>" >- - " <tr>" >- - " <th colspan=\"6\" class=\"centerednames\">" >- - " <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>" >- - " </th>" >- - " </tr>" >- - " <tr>" >- - " <th colspan=\"6\" >" >- - " Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />" >- - " Card number: [% debit.patron.cardnumber | html %]<br />" >- - " </th>" >- - " </tr>" >- - " <tr>" >- - " <th>Created</th>" >- - " <th>Updated</th>" >- - " <th>Description of charges</th>" >- - " <th>Note</th>" >- - " <th style=\"text-align:right;\">Amount</th>" >- - " <th style=\"text-align:right;\">Amount outstanding</th>" >- - " </tr>" >- - "" >- - " <tr class=\"highlight\">" >- - " <td>[% debit.date | $KohaDates%]</td>" >- - " <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>" >- - " <td>" >- - " [% PROCESS account_type_description account=debit %]" >- - " [%- IF debit.description %], [% debit.description | html %][% END %]" >- - " </td>" >- - " <td>[% debit.note | html %]</td>" >- - " <td class=\"debit\">[% debit.amount | $Price %]</td>" >- - " <td class=\"debit\">[% debit.amountoutstanding | $Price %]</td>" >- - " </tr>" >- - "" >+ - " [% END %]" >+ - " [% IF debit.library %]" >+ - " <tr>" >+ - " <th colspan=\"3\" class=\"centerednames\">" >+ - " <h2>[% debit.library.branchname | html %]</h2>" >+ - " </th>" >+ - " </tr>" >+ - " [% END %]" >+ - " <tr>" >+ - " <th colspan=\"3\" class=\"centerednames\">" >+ - " <h3>[% debit.date | $KohaDates %]</h3>" >+ - " </th>" >+ - " </tr>" >+ - " <tr>" >+ - " <td colspan=\"2\" style=\"text-align:right;\">Fee ID: </td>" >+ - " <td>[% debit.accountlines_id %]</td>" >+ - " </tr>" >+ - " [% IF credit.manager_id %]" >+ - " <tr>" >+ - " <td colspan=\"2\" style=\"text-align:right;\">Operator ID: </td>" >+ - " <td>[% credit.manager_id %]</td>" >+ - " </tr>" >+ - " [% END %]" >+ - " <tr>" >+ - " <th colspan=\"3\" class=\"centerednames\">" >+ - " <h2><u>Invoice</u></h2>" >+ - " </th>" >+ - " </tr>" >+ - " <tr>" >+ - " <th colspan=\"3\" >" >+ - " Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />" >+ - " Card number: [% debit.patron.cardnumber | html %]<br />" >+ - " </th>" >+ - " </tr>" >+ - " [% IF debit.amount != debit.amountoutstanding %]" >+ - " <tr>" >+ - " <th>Date</th>" >+ - " <th>Description of payments</th>" >+ - " <th>Amount</th>" >+ - " </tr>" >+ - " [% FOREACH offset IN debit.debit_offsets %]" >+ - " <tr>" >+ - " <td>[% offset.credit.date | $KohaDates %]</td>" >+ - " <td>[% PROCESS account_type_description account=offset.credit %]</td>" >+ - " <td>[% offset.amount * -1 | $Price %]</td>" >+ - " </tr>" >+ - " [% END %]" >+ - " <tr class=\"highlight\">" >+ - " <td colspan=\"2\" style=\"text-align:right;\">Total paid:</td>" >+ - " <td>[% debit.amount - debit.amountoutstanding | $Price %]</td>" >+ - " </tr>" >+ - " [% END %]" >+ - " </tr>" >+ - " <td colspan=\"3\"></td>" >+ - " <tr>" > - " <tfoot>" > - " <tr>" >- - " <td colspan=\"5\">Total outstanding dues as on date: </td>" >- - " [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>" >+ - " <td colspan=\"2\" style=\"text-align:right;\">Total owed:</td>" >+ - " <td>[% debit.amount | $Price %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td colspan=\"2\" style=\"text-align:right;\">Total outstanding:</td>" >+ - " <td>[% debit.amountoutstanding | $Price %]</td>" > - " </tr>" > - " </tfoot>" > - "</table>" >@@ -1322,67 +1351,66 @@ tables: > - "[% USE Price %]" > - "[% PROCESS \"accounts.inc\" %]" > - "<table>" >- - "[% IF ( LibraryName ) %]" >- - " <tr>" >- - " <th colspan=\"2\" class=\"centerednames\">" >+ - " [% IF ( LibraryName ) %]" >+ - " <tr>" >+ - " <th colspan=\"2\" class=\"centerednames\">" > - " <h3>[% LibraryName | html %]</h3>" >- - " </th>" >- - " </tr>" >- - "[% END %]" >- - " <tr>" >- - " <th colspan=\"2\" class=\"centerednames\">" >- - " <h2>[% Branches.GetName( credit.branchcode ) | html %]</h2>" >- - " </th>" >- - " </tr>" >- - "<tr>" >- - " <th colspan=\"2\" class=\"centerednames\">" >- - " <h3>[% credit.date | $KohaDates %]</h3>" >- - "</tr>" >- - "<tr>" >- - " <td>Transaction ID: </td>" >- - " <td>[% credit.accountlines_id %]</td>" >- - "</tr>" >- - "<tr>" >- - " <td>Operator ID: </td>" >- - " <td>[% credit.manager_id %]</td>" >- - "</tr>" >- - "<tr>" >- - " <td>Payment type: </td>" >- - " <td>[% credit.payment_type %]</td>" >- - "</tr>" >- - " <tr></tr>" >- - " <tr>" >- - " <th colspan=\"2\" class=\"centerednames\">" >- - " <h2><u>Fee receipt</u></h2>" >- - " </th>" >- - " </tr>" >- - " <tr></tr>" >- - " <tr>" >- - " <th>Description of charges</th>" >- - " <th>Amount</th>" >- - " </tr>" >- - "" >- - " [% FOREACH debit IN credit.debits %]" >+ - " </th>" >+ - " </tr>" >+ - " [% END %]" >+ - " [% IF credit.library %]" >+ - " <tr>" >+ - " <th colspan=\"2\" class=\"centerednames\">" >+ - " <h2>[% payment.library.branchname ) | html %]</h2>" >+ - " </th>" >+ - " </tr>" >+ - " [% END %]" >+ - " <tr>" >+ - " <th colspan=\"2\" class=\"centerednames\">" >+ - " <h3>[% payment.date | $KohaDates %]</h3>" >+ - " </th>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Transaction ID: </td>" >+ - " <td>[% payment.accountlines_id %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Operator ID: </td>" >+ - " <td>[% payment.manager_id %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Payment type: </td>" >+ - " <td>[% payment.payment_type %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <th colspan=\"2\" class=\"centerednames\">" >+ - " <h2><u>Payment receipt</u></h2>" >+ - " </th>" >+ - " </tr>" >+ - " <tr>" >+ - " <th>Description of charges</th>" >+ - " <th>Amount</th>" >+ - " </tr>" >+ - " [% FOREACH offset IN payment.credit_offsets %]" > - " <tr>" > - " <td>[% PROCESS account_type_description account=debit %]</td>" > - " <td>[% debit.amount * -1 | $Price %]</td>" > - " </tr>" >- - " [% END %]" >- - "" >- - "<tfoot>" >- - " <tr class=\"highlight\">" >- - " <td>Total: </td>" >- - " <td>[% credit.amount * -1| $Price %]</td>" >- - " </tr>" >- - " <tr>" >- - " <td>Tendered: </td>" >- - " <td>[% collected | $Price %]</td>" >- - " </tr>" >- - " <tr>" >- - " <td>Change: </td>" >- - " <td>[% change | $Price %]</td>" >+ - " [% END %]" >+ - " <tfoot>" >+ - " <tr class=\"highlight\">" >+ - " <td>Total:</td>" >+ - " <td>[% payment.amount * -1 | $Price %]</td>" > - " </tr>" >- - "</tfoot>" >+ - " <tr>" >+ - " <td>Tendered: </td>" >+ - " <td>[% tendered | $Price %]</td>" >+ - " </tr>" >+ - " <tr>" >+ - " <td>Change given:</td>" >+ - " <td>[% change | $Price %]</td>" >+ - " </tr>" >+ - " </tfoot>" > - "</table>" > > - module: reserves >-- >2.30.2
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 24381
:
106946
|
106947
|
106950
|
106951
|
106952
|
106953
|
106956
|
106957
|
106958
|
106959
|
106960
|
106974
|
106975
|
106976
|
106977
|
110210
|
110211
|
110212
|
110213
|
110461
|
110462
|
110463
|
110464
|
111530
|
111531
|
111532
|
111533
|
111534
|
111590
|
111591
|
111592
|
111593
|
111594
|
111595
|
116394
|
140868
|
140869
|
140870
|
140871
|
140872
|
140873
|
141619
|
141620
|
141621
|
141622
|
141623
|
142386
|
142387
|
142388
|
142389
|
142390