Browse Source

Bug 16486: Display the timestamp when an accountline is updated

This patch updates the Date field to be 'Created' and adds a new column
'Updated' which shows the timestamp of the accountline.

To test:
1) Apply patch, restart services
2) Test the following staff client pages:
- Reports -> Cash register
- Patron Accounting tab -> Transactions
- Create a manual invoice. Click 'Print' on the transactions tab to
generate Invoice slip
- Make a payment. Click 'Print' on the transactions tab to generate
Receipt slip
3) Test the OPAC:
- your charges

Sponsored-by: Catalyst IT
Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
tags/v21.05.00
Aleisha Amohia 1 year ago
parent
commit
786c1c8ca0
13 changed files with 149 additions and 107 deletions
  1. +17
    -13
      installer/data/mysql/en/mandatory/sample_notices.yml
  2. +16
    -12
      installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
  3. +16
    -12
      installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
  4. +16
    -12
      installer/data/mysql/it-IT/necessari/notices.sql
  5. +16
    -12
      installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
  6. +16
    -12
      installer/data/mysql/pl-PL/mandatory/sample_notices.sql
  7. +15
    -11
      installer/data/mysql/ru-RU/mandatory/sample_notices.sql
  8. +16
    -12
      installer/data/mysql/uk-UA/mandatory/sample_notices.sql
  9. +1
    -1
      koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
  10. +5
    -3
      koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
  11. +3
    -1
      koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
  12. +10
    -5
      koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
  13. +2
    -1
      reports/cash_register_stats.pl

+ 17
- 13
installer/data/mysql/en/mandatory/sample_notices.yml View File

@@ -57,29 +57,30 @@ tables:
- "<table>"
- "[% IF ( LibraryName ) %]"
- " <tr>"
- " <th colspan=\"4\" class=\"centerednames\">"
- " <th colspan=\"5\" class=\"centerednames\">"
- " <h3>[% LibraryName | html %]</h3>"
- " </th>"
- " </tr>"
- "[% END %]"
- " <tr>"
- " <th colspan=\"4\" class=\"centerednames\">"
- " <th colspan=\"5\" class=\"centerednames\">"
- " <h2><u>Fee receipt</u></h2>"
- " </th>"
- " </tr>"
- " <tr>"
- " <th colspan=\"4\" class=\"centerednames\">"
- " <th colspan=\"5\" class=\"centerednames\">"
- " <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>"
- " </th>"
- " </tr>"
- " <tr>"
- " <th colspan=\"4\">"
- " <th colspan=\"5\">"
- " Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
- " Card number: [% credit.patron.cardnumber | html %]<br />"
- " </th>"
- " </tr>"
- " <tr>"
- " <th>Date</th>"
- " <th>Created</th>"
- " <th>Updated</th>"
- " <th>Description of charges</th>"
- " <th>Note</th>"
- " <th>Amount</th>"
@@ -87,6 +88,7 @@ tables:
- ""
- " <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 %]"
@@ -108,7 +110,7 @@ tables:
- ""
- "<tfoot>"
- " <tr>"
- " <td colspan=\"3\">Total outstanding dues as on date: </td>"
- " <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>"
@@ -128,30 +130,31 @@ tables:
- "<table>"
- " [% IF ( LibraryName ) %]"
- " <tr>"
- " <th colspan=\"5\" class=\"centerednames\">"
- " <th colspan=\"6\" class=\"centerednames\">"
- " <h3>[% LibraryName | html %]</h3>"
- " </th>"
- " </tr>"
- " [% END %]"
- ""
- " <tr>"
- " <th colspan=\"5\" class=\"centerednames\">"
- " <th colspan=\"6\" class=\"centerednames\">"
- " <h2><u>INVOICE</u></h2>"
- " </th>"
- " </tr>"
- " <tr>"
- " <th colspan=\"5\" class=\"centerednames\">"
- " <th colspan=\"6\" class=\"centerednames\">"
- " <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>"
- " </th>"
- " </tr>"
- " <tr>"
- " <th colspan=\"5\" >"
- " <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>Date</th>"
- " <th>Created</th>"
- " <th>Updated</th>"
- " <th>Description of charges</th>"
- " <th>Note</th>"
- " <th style=\"text-align:right;\">Amount</th>"
@@ -160,6 +163,7 @@ tables:
- ""
- " <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 %]"
@@ -171,8 +175,8 @@ tables:
- ""
- " <tfoot>"
- " <tr>"
- " <td colspan=\"4\">Total outstanding dues as on date: </td>"
- " [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>"
- " <td colspan=\"5\">Total outstanding dues as on date: </td>"
- " [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
- " </tr>"
- " </tfoot>"
- "</table>"


+ 16
- 12
installer/data/mysql/fr-CA/obligatoire/sample_notices.sql View File

@@ -115,29 +115,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2><u>Fee receipt</u></h2>
</th>
</tr>
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"4\">
<th colspan=\"5\">
Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
<tr>
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
@@ -145,6 +146,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<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 %]
@@ -166,7 +168,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<tfoot>
<tr>
<td colspan=\"3\">Total outstanding dues as on date: </td>
<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>
@@ -178,30 +180,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]

<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2><u>INVOICE</u></h2>
</th>
</tr>
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"5\" >
<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>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th style=\"text-align:right;\">Amount</th>
@@ -210,6 +213,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<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 %]
@@ -221,7 +225,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<tfoot>
<tr>
<td colspan=\"4\">Total outstanding dues as on date: </td>
<td colspan=\"5\">Total outstanding dues as on date: </td>
[% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
</tr>
</tfoot>


+ 16
- 12
installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql View File

@@ -228,29 +228,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2><u>Fee receipt</u></h2>
</th>
</tr>
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"4\">
<th colspan=\"5\">
Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
<tr>
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
@@ -258,6 +259,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<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 %]
@@ -279,7 +281,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<tfoot>
<tr>
<td colspan=\"3\">Total outstanding dues as on date: </td>
<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>
@@ -291,30 +293,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]

<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2><u>INVOICE</u></h2>
</th>
</tr>
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"5\" >
<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>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th style=\"text-align:right;\">Amount</th>
@@ -323,6 +326,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<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 %]
@@ -334,7 +338,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<tfoot>
<tr>
<td colspan=\"4\">Total outstanding dues as on date: </td>
<td colspan=\"5\">Total outstanding dues as on date: </td>
[% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
</tr>
</tfoot>


+ 16
- 12
installer/data/mysql/it-IT/necessari/notices.sql View File

@@ -230,29 +230,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2><u>Fee receipt</u></h2>
</th>
</tr>
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"4\">
<th colspan=\"5\">
Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
<tr>
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
@@ -260,6 +261,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<tr class=\"highlight\">
<td>[% credit.date | $KohaDates %]</td>
<td>[% credit.timestamp | $KohaDates %]</td>
<td>
[% PROCESS account_type_description account=credit %]
[%- IF credit.description %], [% credit.description | html %][% END %]
@@ -281,7 +283,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<tfoot>
<tr>
<td colspan=\"3\">Total outstanding dues as on date: </td>
<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>
@@ -293,30 +295,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]

<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2><u>INVOICE</u></h2>
</th>
</tr>
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"5\" >
<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>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th style=\"text-align:right;\">Amount</th>
@@ -325,6 +328,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<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 %]
@@ -336,7 +340,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<tfoot>
<tr>
<td colspan=\"4\">Total outstanding dues as on date: </td>
<td colspan=\"5\">Total outstanding dues as on date: </td>
[% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
</tr>
</tfoot>


+ 16
- 12
installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql View File

@@ -246,29 +246,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2><u>Fee receipt</u></h2>
</th>
</tr>
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"4\">
<th colspan=\"5\">
Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
<tr>
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
@@ -276,6 +277,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<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 %]
@@ -297,7 +299,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<tfoot>
<tr>
<td colspan=\"3\">Total outstanding dues as on date: </td>
<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>
@@ -309,30 +311,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]

<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2><u>INVOICE</u></h2>
</th>
</tr>
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"5\" >
<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>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th style=\"text-align:right;\">Amount</th>
@@ -341,6 +344,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<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 %]
@@ -352,7 +356,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<tfoot>
<tr>
<td colspan=\"4\">Total outstanding dues as on date: </td>
<td colspan=\"5\">Total outstanding dues as on date: </td>
[% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
</tr>
</tfoot>


+ 16
- 12
installer/data/mysql/pl-PL/mandatory/sample_notices.sql View File

@@ -225,29 +225,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2><u>Fee receipt</u></h2>
</th>
</tr>
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"4\">
<th colspan=\"5\">
Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
<tr>
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
@@ -255,6 +256,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<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 %]
@@ -276,7 +278,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<tfoot>
<tr>
<td colspan=\"3\">Total outstanding dues as on date: </td>
<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>
@@ -288,30 +290,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]

<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2><u>INVOICE</u></h2>
</th>
</tr>
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"5\" >
<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>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th style=\"text-align:right;\">Amount</th>
@@ -320,6 +323,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<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 %]
@@ -331,7 +335,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<tfoot>
<tr>
<td colspan=\"4\">Total outstanding dues as on date: </td>
<td colspan=\"5\">Total outstanding dues as on date: </td>
[% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
</tr>
</tfoot>


+ 15
- 11
installer/data/mysql/ru-RU/mandatory/sample_notices.sql View File

@@ -227,29 +227,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2><u>Fee receipt</u></h2>
</th>
</tr>
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"4\">
<th colspan=\"5\">
Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
<tr>
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
@@ -257,6 +258,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<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 %]
@@ -278,7 +280,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<tfoot>
<tr>
<td colspan=\"3\">Total outstanding dues as on date: </td>
<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>
@@ -290,30 +292,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]

<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2><u>INVOICE</u></h2>
</th>
</tr>
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"5\" >
<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>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th style=\"text-align:right;\">Amount</th>
@@ -322,6 +325,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<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 %]


+ 16
- 12
installer/data/mysql/uk-UA/mandatory/sample_notices.sql View File

@@ -321,29 +321,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2><u>Fee receipt</u></h2>
</th>
</tr>
<tr>
<th colspan=\"4\" class=\"centerednames\">
<th colspan=\"5\" class=\"centerednames\">
<h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"4\">
<th colspan=\"5\">
Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
<tr>
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th>Amount</th>
@@ -351,6 +352,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<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 %]
@@ -372,7 +374,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`

<tfoot>
<tr>
<td colspan=\"3\">Total outstanding dues as on date: </td>
<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>
@@ -384,30 +386,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
<table>
[% IF ( LibraryName ) %]
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h3>[% LibraryName | html %]</h3>
</th>
</tr>
[% END %]

<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2><u>INVOICE</u></h2>
</th>
</tr>
<tr>
<th colspan=\"5\" class=\"centerednames\">
<th colspan=\"6\" class=\"centerednames\">
<h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>
</th>
</tr>
<tr>
<th colspan=\"5\" >
<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>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description of charges</th>
<th>Note</th>
<th style=\"text-align:right;\">Amount</th>
@@ -416,6 +419,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<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 %]
@@ -427,7 +431,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,

<tfoot>
<tr>
<td colspan=\"4\">Total outstanding dues as on date: </td>
<td colspan=\"5\">Total outstanding dues as on date: </td>
[% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>
</tr>
</tfoot>


+ 1
- 1
koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt View File

@@ -1 +1 @@
[%- BLOCK -%]Manager name[% sep | html %]Patron cardnumber[% sep | html %]Patron name[% sep | html %]Transaction library[% sep | html %]Transaction date[% sep | html %]Transaction type[% sep |html %]Notes[% sep | html %]Amount[% sep | html %]Title[% sep | html %]Barcode[% sep | html %]Item type[%- END -%]
[%- BLOCK -%]Manager name[% sep | html %]Patron cardnumber[% sep | html %]Patron name[% sep | html %]Transaction library[% sep | html %]Transaction date[% sep | html %]Updated[% sep | html %]Transaction type[% sep |html %]Notes[% sep | html %]Amount[% sep | html %]Title[% sep | html %]Barcode[% sep | html %]Item type[%- END -%]

+ 5
- 3
koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt View File

@@ -60,7 +60,8 @@
<table id="table_account_fines">
<thead>
<tr>
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Credit number</th>
<th>Account type</th>
<th>Description of charges</th>
@@ -81,7 +82,8 @@
[% FOREACH account IN accounts %]

<tr>
<td data-order="[% account.date | html %]">[% account.date |$KohaDates %]</td>
<td data-order="[% account.date | html %]">[% account.date | $KohaDates %]</td>
<td data-order="[% account.timestamp | html %]">[% account.timestamp | $KohaDates with_hours = 1 %]</td>
<td>[% account.credit_number | html %]</td>
<td>[% PROCESS account_type_description account=account %]</td>
<td>
@@ -140,7 +142,7 @@
[% END %]
<tfoot>
<tr>
<td colspan="12">Total due</td>
<td colspan="13">Total due</td>
[% IF ( totalcredit ) %]
<td class="credit" style="text-align: right;">[% total | $Price %]</td>
<td>


+ 3
- 1
koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt View File

@@ -161,6 +161,7 @@
<th>Patron name</th>
<th>Transaction library</th>
<th>Transaction date</th>
<th>Updated</th>
<th>Transaction type</th>
<th>Notes</th>
<th>Amount</th>
@@ -176,6 +177,7 @@
<td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td>
<td>[% loopresul.branchname | html %]</td>
<td>[% loopresul.date | $KohaDates %]</td>
<td>[% loopresul.timestamp | $KohaDates with_hours = 1 %]</td>
<td>
[% IF loopresul.credit_type == "ACT" %]
<span>All payments to the library</span>
@@ -193,7 +195,7 @@
<tfoot>
<tr>
[% IF transaction_type == "ACT" %]
<th colspan="7" style="text-align:right;">TOTAL</th>
<th colspan="8" style="text-align:right;">TOTAL</th>
<th style="text-align:right;">[% total | $Price %]</th>
<th colspan="3">&nbsp;</th>
[% END %]


+ 10
- 5
koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc View File

@@ -6,7 +6,8 @@
<thead>
<tr>
[% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Type</th>
<th>Description</th>
<th>Amount</th>
@@ -27,6 +28,7 @@
</td>
[% END %]
<td data-order="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</td>
<td data-order="[% ACCOUNT_LINE.timestamp | html %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours = 1 %]</td>
<td>
[% PROCESS account_type_description account=ACCOUNT_LINE %]
</td>
@@ -44,9 +46,9 @@
<tfoot>
<tr>
[%- IF ENABLE_OPAC_PAYMENTS -%]
[%- SET COLSPAN = 5 -%]
[%- SET COLSPAN = 6 -%]
[%- ELSE -%]
[%- SET COLSPAN = 4 -%]
[%- SET COLSPAN = 5 -%]
[%- END -%]
<th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
<td class="sum">[% total | $Price %]</td>
@@ -56,6 +58,7 @@
[% IF outstanding_credit.amountoutstanding < 0 %]<tr class="outstanding">[% ELSE %]<tr>[% END%]
[% IF ENABLE_OPAC_PAYMENTS %]<td></td>[% END %]
<td><span title="[% outstanding_credit.date | html %]">[% outstanding_credit.date | $KohaDates %]</span></td>
<td><span title="[% outstanding_credit.timestamp | html %]">[% outstanding_credit.date | $KohaDates with_hours = 1 %]</span></td>
<td>
[% PROCESS account_type_description account=outstanding_credit %]
</td>
@@ -89,7 +92,8 @@
<thead>
<tr>
[% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
<th>Date</th>
<th>Created</th>
<th>Updated</th>
<th>Description</th>
<th>Fine amount</th>
<th>Amount outstanding</th>
@@ -111,6 +115,7 @@
</td>
[% END %]
<td data-order="[% a.date | html %]">[% a.date | $KohaDates %]</td>
<td data-order="[% a.timestamp | html %]">[% a.timestamp | $KohaDates with_hours = 1 %]</td>
<td>
[% PROCESS account_type_description account=a %]
[%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) | html %][% END %]
@@ -125,7 +130,7 @@

<tfoot>
<tr>
<th class="sum" colspan="3">Total due</th>
<th class="sum" colspan="4">Total due</th>
<td class="sum">[% account_sum | $Price %]</td>
</tr>
</tfoot>


+ 2
- 1
reports/cash_register_stats.pl View File

@@ -106,7 +106,7 @@ if ($do_it) {
SELECT round(amount,2) AS amount, description,
bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
bo.cardnumber, br.branchname, bo.borrowernumber,
al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note,
al.borrowernumber, DATE(al.date) as date, al.credit_type_code, al.debit_type_code, al.amountoutstanding, al.note, al.timestamp,
bi.title, bi.biblionumber, i.barcode, i.itype
FROM accountlines al
LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
@@ -166,6 +166,7 @@ if ($do_it) {
$row->{bfirstname} . ' ' . $row->{bsurname},
$row->{branchname},
$row->{date},
$row->{timestamp},
$row->{credit_type},
$row->{debit_type},
$row->{note},


Loading…
Cancel
Save