From da63ab6e670619c64d0fc61737ca31a38cf68c26 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia 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 --- .../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 00000000000..8e2bf2b983a --- /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', ' +[% IF ( LibraryName ) %] + + + +[% END %] + + + + + + + + + + + + + + + + + + [% FOREACH account IN accounts %] + + + + + + [% IF ( account.amountcredit ) %] + + + [% END %] + + + + [% IF ( totalcredit ) %] + + +
+

[% LibraryName | html %]

+
+

Fee receipt

+
+

[% Branches.GetName( patron.branchcode ) | html %]

+
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
+ Card number: [% patron.cardnumber | html %]
+
CreatedUpdatedDescription of chargesNoteAmount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] + [% PROCESS account_type_description account=account %] + [%- IF account.description %], [% account.description | html %][% END %] + [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
', '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 00000000000..1df88d1c386 --- /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', ' + [% IF ( LibraryName ) %] + + + + [% END %] + + + + + + + + + + + + + + + + + + + + [% FOREACH account IN accounts %] + + + + + + [% IF ( account.amountcredit ) %] + [% IF ( account.amountoutstandingcredit ) %] + + [% END %] + + + + + [% IF ( totalcredit ) %] + + +
+

[% LibraryName | html %]

+
+

INVOICE

+
+

[% Branches.GetName( patron.branchcode ) | html %]

+
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
+ Card number: [% patron.cardnumber | html %]
+
CreatedUpdatedDescription of chargesNoteAmountAmount outstanding
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] + [% PROCESS account_type_description account=account %] + [%- IF account.description %], [% account.description | html %][% END %] + [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %][% ELSE %][% END %][% account.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
', '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 0fbf5f73d25..cd5f0d7fe12 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', ' [% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -246,6 +247,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -267,30 +269,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -300,6 +303,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 7f814c377b0..379e5d6aefd 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -55,29 +55,30 @@ tables: - "
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
" - "[% IF ( LibraryName ) %]" - " " - - " " - " " - "[% END %]" - " " - - " " - " " - " " - - " " - " " - " " - - " " - " " - " " - - " " + - " " + - " " - " " - " " - " " @@ -86,6 +87,7 @@ tables: - " [% FOREACH account IN accounts %]" - " " - " " + - " " - " " - " " - - " " + - " " - " [% IF ( totalcredit ) %]" - " " - "" @@ -115,30 +117,31 @@ tables: - "
" + - " " - "

[% LibraryName | html %]

" - "
" + - " " - "

Fee receipt

" - "
" + - " " - "

[% Branches.GetName( patron.branchcode ) | html %]

" - "
" + - " " - " Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
" - " Card number: [% patron.cardnumber | html %]
" - "
DateCreatedUpdatedDescription of chargesNoteAmount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %]" - " [% PROCESS account_type_description account=account %]" - " [%- IF account.description %], [% account.description | html %][% END %]" @@ -97,7 +99,7 @@ tables: - " [% END %]" - "
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
" - " [% IF ( LibraryName ) %]" - " " - - " " - " " - " [% END %]" - "" - " " - - " " - " " - " " - - " " - " " - " " - - " " - " " - " " - - " " + - " " + - " " - " " - " " - " " @@ -148,6 +151,7 @@ tables: - " [% FOREACH account IN accounts %]" - " " - " " + - " " - " " - " " - - " " + - " " - " [% IF ( totalcredit ) %]" - " " - " " diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql index 4ee0a6c800c..8557d263867 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', '
" + - " " - "

[% LibraryName | html %]

" - "
" + - " " - "

INVOICE

" - "
" + - " " - "

[% Branches.GetName( patron.branchcode ) | html %]

" - "
" + - " " - " Bill to: [% patron.firstname | html %] [% patron.surname | html %]
" - " Card number: [% patron.cardnumber | html %]
" - "
DateCreatedUpdatedDescription of chargesNoteAmount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %]" - " [% PROCESS account_type_description account=account %]" - " [%- IF account.description %], [% account.description | html %][% END %]" @@ -160,7 +164,7 @@ tables: - "" - "
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -239,6 +240,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -260,30 +262,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -293,6 +296,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql index ba88804699f..19444ef6910 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', '
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -129,6 +130,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -150,30 +152,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

REÇU
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Reçu de [% patron.firstname | html %] [% patron.surname | html %]
Numéro de carte : [% patron.cardnumber | html %]
DateCreatedUpdated Description des frais Note Montant
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 %]
Solde non-réglé : Solde non-réglé : [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -183,6 +186,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] 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 6106d737f35..4d897ba8ca0 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', '
+

[% LibraryName | html %]
+

FACTURE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Facturé à : [% patron.firstname | html %] [% patron.surname | html %]
Numéro de carte : [% patron.cardnumber | html %]
DateCreatedUpdated Description des frais Note Montant
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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`,
Solde non-réglé : Solde non-réglé : [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -240,6 +241,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -261,30 +263,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -294,6 +297,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql index e462da9d000..2351950a20f 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', '
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -242,6 +243,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -263,30 +265,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates %] [% 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 %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -296,6 +299,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] 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 8439fd96d8f..486f72edef6 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', '
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -259,6 +260,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -280,30 +282,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -313,6 +316,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql index 6373e2e975a..7e71acceed0 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', '
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -237,6 +238,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -258,30 +260,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -291,6 +294,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql index f9c4fc55d50..7da951b2a9f 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', '
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -239,6 +240,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -260,30 +262,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -293,6 +296,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] +
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 5356ad74f4d..bcf1c1eb178 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', ' [% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -330,6 +331,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -351,30 +353,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, ('circulation', 'ACCOUNT_DEBIT', '', 'Account fee', 0, 'Account fee', '
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% 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 %]
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -384,6 +387,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] 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 8cabd862596..0d3a60e1dcb 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 @@
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( patron.branchcode ) | html %]
+ Bill to: [% patron.firstname | html %] [% patron.surname | html %]
Card number: [% patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% account.date | $KohaDates%][% account.timestamp | $KohaDates with_hours = 1 %] [% 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`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
- + + @@ -62,7 +63,8 @@ [% FOREACH account IN accounts %] - + + - + [% IF ( totalcredit ) %] [% 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 cbcc27a0563..8a1744d35c6 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 @@ + @@ -148,6 +149,7 @@ + [% IF transaction_type == "ACT" %] - + [% 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 93f9eeb9207..ae7b8b633b4 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 @@ [% IF ENABLE_OPAC_PAYMENTS %][% END %] - + + @@ -27,6 +28,7 @@ [% END %] + @@ -44,9 +46,9 @@ [%- IF ENABLE_OPAC_PAYMENTS -%] - [%- SET COLSPAN = 5 -%] + [%- SET COLSPAN = 6 -%] [%- ELSE -%] - [%- SET COLSPAN = 4 -%] + [%- SET COLSPAN = 5 -%] [%- END -%] @@ -56,6 +58,7 @@ [% IF outstanding_credit.amountoutstanding < 0 %][% ELSE %][% END%] [% IF ENABLE_OPAC_PAYMENTS %][% END %] + @@ -89,7 +92,8 @@ [% IF ENABLE_OPAC_PAYMENTS %][% END %] - + + @@ -111,6 +115,7 @@ [% END %] + - + diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl index 98390ac52dd..d1d7477927b 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
DateCreatedUpdated Account type Description of charges Barcode
[% account.date |$KohaDates %][% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=account %] [%- IF account.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %] @@ -103,7 +105,7 @@ [% END %]
Total dueTotal due[% total | $Price %]Patron name Transaction library Transaction dateUpdated Transaction type Notes Amount[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %] [% loopresul.branchname | html %] [% loopresul.date | $KohaDates %][% loopresul.timestamp | $KohaDates with_hours = 1 %] [% IF loopresul.credit_type == "ACT" %] All payments to the library @@ -165,7 +167,7 @@
TOTALTOTAL [% total | $Price %]  
 DateCreatedUpdated Type Description Amount[% ACCOUNT_LINE.date | $KohaDates %][% ACCOUNT_LINE.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=ACCOUNT_LINE %]
Total due [% total | $Price %]
[% outstanding_credit.date | $KohaDates %][% outstanding_credit.date | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=outstanding_credit %]
 DateCreatedUpdated Description Fine amount Amount outstanding[% a.date | $KohaDates %][% a.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=a %] [%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) | html %][% END %] @@ -125,7 +130,7 @@
Total dueTotal due [% account_sum | $Price %]