From 221a0ffc5bd2b920c97e5d463cd4aff2d23efc9f 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) 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 --- .../data/mysql/en/mandatory/sample_notices.yml | 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 ++++++++++++---------- .../csv_headers/reports/cash_register_stats.tt | 2 +- .../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 | 3 ++- 13 files changed, 148 insertions(+), 106 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 705cebffee..970e2fc018 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -55,29 +55,30 @@ tables: - "" - "[% 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/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql index b18d65998b..b61d2806ee 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 %]
" - "
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 %] - - - - + + @@ -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 7a6a858bca..e882efbee3 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 4698c350fa..ba29d3b72f 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 30083c98aa..25df405e28 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql @@ -227,29 +227,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 %] - - - - + + @@ -258,6 +259,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% FOREACH account IN accounts %] + - + [% IF ( totalcredit ) %] @@ -279,30 +281,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 %] @@ -269,7 +271,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 %] - - - - + + @@ -312,6 +315,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 64970f6ea3..802aed33be 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 %] @@ -324,7 +328,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 465e5f1ad5..3edf31cdf8 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 3c79c2866d..53f55640e4 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/includes/csv_headers/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt index a475c76d6c..cac35b99d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt @@ -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 -%] 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 b23267b970..08f32fab13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -46,7 +46,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 %]
- + + @@ -67,7 +68,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 fa6c521503..d22640daa3 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 @@ -143,6 +143,7 @@ + @@ -158,6 +159,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 a3b6b935d5..7e9e2f5fea 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 e0a01f4636..a59fcdb5f7 100755 --- a/reports/cash_register_stats.pl +++ b/reports/cash_register_stats.pl @@ -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}, -- 2.11.0
DateCreatedUpdated Credit number Account type Description of charges
[% account.date |$KohaDates %][% account.date | $KohaDates %][% account.timestamp | $KohaDates with_hours = 1 %] [% account.credit_number | html %] [% PROCESS account_type_description account=account %] @@ -126,7 +128,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 @@ -175,7 +177,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 %]