Bugzilla – Attachment 103938 Details for
Bug 16486
Display the TIME a fine was collected/written off
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16486: Display the timestamp when an accountline is updated
Bug-16486-Display-the-timestamp-when-an-accountlin.patch (text/plain), 55.05 KB, created by
PTFS Europe Sandboxes
on 2020-04-29 13:23:10 UTC
(
hide
)
Description:
Bug 16486: Display the timestamp when an accountline is updated
Filename:
MIME Type:
Creator:
PTFS Europe Sandboxes
Created:
2020-04-29 13:23:10 UTC
Size:
55.05 KB
patch
obsolete
>From a9ba929ef6868414554711a3b5a1fa06cce8798b Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Tue, 21 Apr 2020 05:15:25 +0000 >Subject: [PATCH] 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) Update database, 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> >--- > .../bug_16486-ACCOUNT_CREDIT_notice.perl | 60 +++++++++++++++++++++ > .../bug_16486-ACCOUNT_DEBIT_notice.perl | 63 ++++++++++++++++++++++ > .../data/mysql/de-DE/mandatory/sample_notices.sql | 28 +++++----- > .../data/mysql/en/mandatory/sample_notices.yml | 28 +++++----- > .../data/mysql/es-ES/mandatory/sample_notices.sql | 28 +++++----- > .../mysql/fr-CA/obligatoire/sample_notices.sql | 28 +++++----- > .../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 28 +++++----- > installer/data/mysql/it-IT/necessari/notices.sql | 28 +++++----- > .../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 28 +++++----- > .../data/mysql/pl-PL/mandatory/sample_notices.sql | 28 +++++----- > .../data/mysql/ru-RU/mandatory/sample_notices.sql | 26 +++++---- > .../data/mysql/uk-UA/mandatory/sample_notices.sql | 28 +++++----- > .../prog/en/modules/members/boraccount.tt | 8 +-- > .../prog/en/modules/reports/cash_register_stats.tt | 4 +- > .../bootstrap/en/includes/account-table.inc | 15 ++++-- > reports/cash_register_stats.pl | 2 +- > 16 files changed, 301 insertions(+), 129 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_CREDIT_notice.perl > create mode 100644 installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_DEBIT_notice.perl > >diff --git a/installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_CREDIT_notice.perl b/installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_CREDIT_notice.perl >new file mode 100644 >index 0000000000..8e2bf2b983 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_CREDIT_notice.perl >@@ -0,0 +1,60 @@ >+$DBversion = 'XXX'; >+if( CheckVersion( $DBversion ) ) { >+ $dbh->do(q{DELETE FROM letter WHERE code = 'ACCOUNT_CREDIT'}); >+ $dbh->do(q{ >+INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >+('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<table> >+[% IF ( LibraryName ) %] >+ <tr> >+ <th colspan="5" 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( patron.branchcode ) | html %]</h2> >+ </th> >+ </tr> >+ <tr> >+ <th colspan="5"> >+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> >+ Card number: [% 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> >+ >+ [% FOREACH account IN accounts %] >+ <tr class="highlight"> >+ <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> >+ <td> >+ [% PROCESS account_type_description account=account %] >+ [%- IF account.description %], [% account.description | html %][% END %] >+ </td> >+ <td>[% account.note | html %]</td> >+ [% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount | $Price %]</td> >+ </tr> >+ >+ [% END %] >+<tfoot> >+ <tr> >+ <td colspan="4">Total outstanding dues as on date: </td> >+ [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> >+ </tr> >+</tfoot> >+</table>', 'print', 'default') }); >+ >+ NewVersion( $DBversion, 16486, "Adding timestamp to ACCOUNT_CREDIT notice" ); >+} >diff --git a/installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_DEBIT_notice.perl b/installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_DEBIT_notice.perl >new file mode 100644 >index 0000000000..1df88d1c38 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_16486-ACCOUNT_DEBIT_notice.perl >@@ -0,0 +1,63 @@ >+$DBversion = 'XXX'; >+if( CheckVersion( $DBversion ) ) { >+ $dbh->do(q{DELETE FROM letter WHERE code = 'ACCOUNT_DEBIT'}); >+ $dbh->do(q{ >+INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES >+('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<table> >+ [% IF ( LibraryName ) %] >+ <tr> >+ <th colspan="6" 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( patron.branchcode ) | html %]</h2> >+ </th> >+ </tr> >+ <tr> >+ <th colspan="6" > >+ Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> >+ Card number: [% 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> >+ >+ [% FOREACH account IN accounts %] >+ <tr class="highlight"> >+ <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> >+ <td> >+ [% PROCESS account_type_description account=account %] >+ [%- IF account.description %], [% account.description | html %][% END %] >+ </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> >+ </tr> >+ [% END %] >+ >+ <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> >+ </tr> >+ </tfoot> >+</table>', 'print', 'default') }); >+ >+ NewVersion( $DBversion, 16486, "Adding timestamp to ACCOUNT_DEBIT notice" ); >+} >diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql >index 0fbf5f73d2..cd5f0d7fe1 100644 >--- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql >+++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql >@@ -215,29 +215,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -246,6 +247,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -257,7 +259,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -267,30 +269,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -300,6 +303,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -312,7 +316,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 ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 7f814c377b..379e5d6aef 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -55,29 +55,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( patron.branchcode ) | html %]</h2>" > - " </th>" > - " </tr>" > - " <tr>" >- - " <th colspan=\"4\">" >+ - " <th colspan=\"5\">" > - " Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br />" > - " Card number: [% 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>" >@@ -86,6 +87,7 @@ tables: > - " [% FOREACH account IN accounts %]" > - " <tr class=\"highlight\">" > - " <td>[% account.date | $KohaDates %]</td>" >+ - " <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>" > - " <td>" > - " [% PROCESS account_type_description account=account %]" > - " [%- IF account.description %], [% account.description | html %][% END %]" >@@ -97,7 +99,7 @@ tables: > - " [% END %]" > - "<tfoot>" > - " <tr>" >- - " <td colspan=\"3\">Total outstanding dues as on date: </td>" >+ - " <td colspan=\"4\">Total outstanding dues as on date: </td>" > - " [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>" > - " </tr>" > - "</tfoot>" >@@ -115,30 +117,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( patron.branchcode ) | html %]</h2>" > - " </th>" > - " </tr>" > - " <tr>" >- - " <th colspan=\"5\" >" >+ - " <th colspan=\"6\" >" > - " Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br />" > - " Card number: [% 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>" >@@ -148,6 +151,7 @@ tables: > - " [% FOREACH account IN accounts %]" > - " <tr class=\"highlight\">" > - " <td>[% account.date | $KohaDates%]</td>" >+ - " <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td>" > - " <td>" > - " [% PROCESS account_type_description account=account %]" > - " [%- IF account.description %], [% account.description | html %][% END %]" >@@ -160,7 +164,7 @@ tables: > - "" > - " <tfoot>" > - " <tr>" >- - " <td colspan=\"4\">Total outstanding dues as on date: </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>" >diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql >index 4ee0a6c800..8557d26386 100644 >--- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql >+++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql >@@ -208,29 +208,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -239,6 +240,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -250,7 +252,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -260,30 +262,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -293,6 +296,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -305,7 +309,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 ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql >index ba88804699..19444ef691 100644 >--- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql >+++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql >@@ -98,29 +98,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Confirmation de paiement', 0, 'Confirmation de paiement', '<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>REÃU</u></h2> > </th> > </tr> > <tr> >- <th colspan="4" class="centerednames"> >+ <th colspan="5" class="centerednames"> > <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Reçu de [% patron.firstname | html %] [% patron.surname | html %] <br /> > Numéro de carte : [% patron.cardnumber | html %]<br /> > </th> > </tr> > <tr> >- <th>Date</th> >+ <th>Created</th> >+ <th>Updated</th> > <th>Description des frais</th> > <th>Note</th> > <th>Montant</th> >@@ -129,6 +130,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -140,7 +142,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Solde non-réglé : </td> >+ <td colspan="4">Solde non-réglé : </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -150,30 +152,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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>FACTURE</u></h2> > </th> > </tr> > <tr> >- <th colspan="5" class="centerednames"> >+ <th colspan="6" class="centerednames"> > <h2>[% Branches.GetName( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Facturé à : [% patron.firstname | html %] [% patron.surname | html %] <br /> > Numéro de carte : [% patron.cardnumber | html %]<br /> > </th> > </tr> > <tr> >- <th>Date</th> >+ <th>Created</th> >+ <th>Updated</th> > <th>Description des frais</th> > <th>Note</th> > <th style="text-align:right;">Montant</th> >@@ -183,6 +186,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -195,7 +199,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > > <tfoot> > <tr> >- <td colspan="4">Solde non-réglé : </td> >+ <td colspan="5">Solde non-réglé : </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >index 6106d737f3..4d897ba8ca 100644 >--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >@@ -209,29 +209,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -240,6 +241,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -251,7 +253,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -261,30 +263,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -294,6 +297,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -306,7 +310,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 ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql >index e462da9d00..2351950a20 100644 >--- a/installer/data/mysql/it-IT/necessari/notices.sql >+++ b/installer/data/mysql/it-IT/necessari/notices.sql >@@ -211,29 +211,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -242,6 +243,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -253,7 +255,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -263,30 +265,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -296,6 +299,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -308,7 +312,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 ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql >index 8439fd96d8..486f72edef 100644 >--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql >+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql >@@ -228,29 +228,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -259,6 +260,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -270,7 +272,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -280,30 +282,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -313,6 +316,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -325,7 +329,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 ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql >index 6373e2e975..7e71acceed 100644 >--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql >+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql >@@ -206,29 +206,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -237,6 +238,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -248,7 +250,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -258,30 +260,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -291,6 +294,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -303,7 +307,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 ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql >index f9c4fc55d5..7da951b2a9 100644 >--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql >+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql >@@ -208,29 +208,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -239,6 +240,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -250,7 +252,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -260,30 +262,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -293,6 +296,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql >index 5356ad74f4..bcf1c1eb17 100644 >--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql >+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql >@@ -299,29 +299,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'ACCOUNT_CREDIT', '', 'Account payment', 0, 'Account payment', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="4"> >+ <th colspan="5"> > Received with thanks from [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -330,6 +331,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates %]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -341,7 +343,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > [% END %] > <tfoot> > <tr> >- <td colspan="3">Total outstanding dues as on date: </td> >+ <td colspan="4">Total outstanding dues as on date: </td> > [% IF ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >@@ -351,30 +353,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '<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( patron.branchcode ) | html %]</h2> > </th> > </tr> > <tr> >- <th colspan="5" > >+ <th colspan="6" > > Bill to: [% patron.firstname | html %] [% patron.surname | html %] <br /> > Card number: [% 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> >@@ -384,6 +387,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, > [% FOREACH account IN accounts %] > <tr class="highlight"> > <td>[% account.date | $KohaDates%]</td> >+ <td>[% account.timestamp | $KohaDates with_hours = 1 %]</td> > <td> > [% PROCESS account_type_description account=account %] > [%- IF account.description %], [% account.description | html %][% END %] >@@ -396,7 +400,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 ( totalcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% total | $Price %]</td> > </tr> > </tfoot> >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 8cabd86259..0d3a60e1dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -44,7 +44,8 @@ > <table id="table_account_fines"> > <thead> > <tr> >- <th class="title-string">Date</th> >+ <th class="title-string">Created</th> >+ <th class="title-string">Updated</th> > <th>Account type</th> > <th>Description of charges</th> > <th>Barcode</th> >@@ -62,7 +63,8 @@ > [% FOREACH account IN accounts %] > > <tr> >- <td><span title="[% account.date | html %]">[% account.date |$KohaDates %]</span></td> >+ <td><span title="[% account.date | html %]">[% account.date | $KohaDates %]</span></td> >+ <td><span title="[% account.timestamp | html %]">[% account.timestamp | $KohaDates with_hours = 1 %]</span></td> > <td>[% PROCESS account_type_description account=account %]</td> > <td> > [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %] >@@ -103,7 +105,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 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >index cbcc27a056..8a1744d35c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >@@ -133,6 +133,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> >@@ -148,6 +149,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> >@@ -165,7 +167,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"> </th> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc >index 93f9eeb920..ae7b8b633b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc >@@ -6,7 +6,8 @@ > <thead> > <tr> > [% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %] >- <th class="title-string">Date</th> >+ <th class="title-string">Created</th> >+ <th class="title-string">Updated</th> > <th>Type</th> > <th>Description</th> > <th>Amount</th> >@@ -27,6 +28,7 @@ > </td> > [% END %] > <td><span title="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td> >+ <td><span title="[% ACCOUNT_LINE.timestamp | html %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours = 1 %]</span></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> </th>[% END %] >- <th class="title-string">Date</th> >+ <th class="title-string">Created</th> >+ <th class="title-string">Updated</th> > <th>Description</th> > <th>Fine amount</th> > <th>Amount outstanding</th> >@@ -111,6 +115,7 @@ > </td> > [% END %] > <td><span title="[% a.date | html %]">[% a.date | $KohaDates %]</span></td> >+ <td><span title="[% a.timestamp | html %]">[% a.timestamp | $KohaDates with_hours = 1 %]</span></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> >diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl >index 98390ac52d..d1d7477927 100755 >--- a/reports/cash_register_stats.pl >+++ b/reports/cash_register_stats.pl >@@ -100,7 +100,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) >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=103938">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16486
:
62343
|
62703
|
62995
|
66826
|
66827
|
67537
|
67538
|
68302
|
68303
|
68304
|
68316
|
70578
|
70579
|
70580
|
70582
|
70583
|
70650
|
70687
|
70688
|
70689
|
70690
|
70691
|
71870
|
74045
|
74046
|
74047
|
103534
|
103938
|
117232
|
117233
|
117348
|
120479
|
120485