From 1f9ca20c32dbcf29820c3b49fe59a90e77575728 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 Signed-off-by: Owen Leonard --- .../data/mysql/en/mandatory/sample_notices.yml | 30 ++++++++++++---------- .../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, 149 insertions(+), 107 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index 3d62a9ab3e..60635f49a8 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -57,29 +57,30 @@ tables: - "" - "[% IF ( LibraryName ) %]" - " " - - " " - " " - "[% END %]" - " " - - " " - " " - " " - - " " - " " - " " - - " " - " " - " " - - " " + - " " + - " " - " " - " " - " " @@ -87,6 +88,7 @@ tables: - "" - " " - " " + - " " - " " - " " - - " " + - " " - " [% IF ( credit.patron.account.balance >= 0 ) %]" - " " - "" @@ -128,30 +130,31 @@ tables: - "
" + - " " - "

[% LibraryName | html %]

" - "
" + - " " - "

Fee receipt

" - "
" + - " " - "

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

" - "
" + - " " - " Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
" - " Card number: [% credit.patron.cardnumber | html %]
" - "
DateCreatedUpdatedDescription of chargesNoteAmount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates with_hours = 1 %]" - " [% PROCESS account_type_description account=credit %]" - " [%- IF credit.description %], [% credit.description | html %][% END %]" @@ -108,7 +110,7 @@ tables: - "" - "
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
" - " [% IF ( LibraryName ) %]" - " " - - " " - " " - " [% END %]" - "" - " " - - " " - " " - " " - - " " - " " - " " - - " " - " " - " " - - " " + - " " + - " " - " " - " " - " " @@ -160,6 +163,7 @@ tables: - "" - " " - " " + - " " - " " - " " - - " " - - " [% IF ( debit.patron.account.balance <= 0 ) %]" + - " " + - " [% IF ( totalcredit ) %]" - " " - " " - "
" + - " " - "

[% LibraryName | html %]

" - "
" + - " " - "

INVOICE

" - "
" + - " " - "

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

" - "
" + - " " - " Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
" - " Card number: [% debit.patron.cardnumber | html %]
" - "
DateCreatedUpdatedDescription of chargesNoteAmount
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %]" - " [% PROCESS account_type_description account=debit %]" - " [%- IF debit.description %], [% debit.description | html %][% END %]" @@ -171,8 +175,8 @@ tables: - "" - "
Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %]
" diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql index ceaf88f1fb..0296c200c8 100644 --- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql +++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql @@ -115,29 +115,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -145,6 +146,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` + - + [% IF ( credit.patron.account.balance >= 0 ) %] @@ -178,30 +180,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( credit.patron.branchcode ) | html %]
+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
Card number: [% credit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=credit %] [%- IF credit.description %], [% credit.description | html %][% END %] @@ -166,7 +168,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -210,6 +213,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, + - + [% IF ( debit.patron.account.balance <= 0 ) %] 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 e3439926d5..235e48007d 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql @@ -228,29 +228,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( debit.patron.branchcode ) | html %]
+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
Card number: [% debit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=debit %] [%- IF debit.description %], [% debit.description | html %][% END %] @@ -221,7 +225,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -258,6 +259,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` + - + [% IF ( credit.patron.account.balance >= 0 ) %] @@ -291,30 +293,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( credit.patron.branchcode ) | html %]
+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
Card number: [% credit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=credit %] [%- IF credit.description %], [% credit.description | html %][% END %] @@ -279,7 +281,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -323,6 +326,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, + - + [% IF ( debit.patron.account.balance <= 0 ) %] diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql index 2cedfc046c..0d9cf8dca4 100644 --- a/installer/data/mysql/it-IT/necessari/notices.sql +++ b/installer/data/mysql/it-IT/necessari/notices.sql @@ -230,29 +230,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( debit.patron.branchcode ) | html %]
+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
Card number: [% debit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=debit %] [%- IF debit.description %], [% debit.description | html %][% END %] @@ -334,7 +338,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -260,6 +261,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` + - + [% IF ( credit.patron.account.balance >= 0 ) %] @@ -293,30 +295,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( credit.patron.branchcode ) | html %]
+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
Card number: [% credit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates %] [% PROCESS account_type_description account=credit %] [%- IF credit.description %], [% credit.description | html %][% END %] @@ -281,7 +283,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -325,6 +328,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, + - + [% IF ( debit.patron.account.balance <= 0 ) %] 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 4157d89064..20afbdf2be 100644 --- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql +++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql @@ -246,29 +246,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( debit.patron.branchcode ) | html %]
+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
Card number: [% debit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=debit %] [%- IF debit.description %], [% debit.description | html %][% END %] @@ -336,7 +340,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -276,6 +277,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` + - + [% IF ( credit.patron.account.balance >= 0 ) %] @@ -309,30 +311,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( credit.patron.branchcode ) | html %]
+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
Card number: [% credit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=credit %] [%- IF credit.description %], [% credit.description | html %][% END %] @@ -297,7 +299,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -341,6 +344,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, + - + [% IF ( debit.patron.account.balance <= 0 ) %] diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql index 3e83c93c39..78b7ac01aa 100644 --- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql +++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql @@ -225,29 +225,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( debit.patron.branchcode ) | html %]
+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
Card number: [% debit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=debit %] [%- IF debit.description %], [% debit.description | html %][% END %] @@ -352,7 +356,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -255,6 +256,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` + - + [% IF ( credit.patron.account.balance >= 0 ) %] @@ -288,30 +290,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( credit.patron.branchcode ) | html %]
+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
Card number: [% credit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=credit %] [%- IF credit.description %], [% credit.description | html %][% END %] @@ -276,7 +278,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -320,6 +323,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, + - + [% IF ( debit.patron.account.balance <= 0 ) %] diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql index 3bb349f50e..82692308e5 100644 --- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql +++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql @@ -227,29 +227,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( debit.patron.branchcode ) | html %]
+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
Card number: [% debit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=debit %] [%- IF debit.description %], [% debit.description | html %][% END %] @@ -331,7 +335,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -257,6 +258,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` + - + [% IF ( credit.patron.account.balance >= 0 ) %] @@ -290,30 +292,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( credit.patron.branchcode ) | html %]
+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
Card number: [% credit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=credit %] [%- IF credit.description %], [% credit.description | html %][% END %] @@ -278,7 +280,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -322,6 +325,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, +
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( debit.patron.branchcode ) | html %]
+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
Card number: [% debit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=debit %] [%- IF debit.description %], [% debit.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 4306377ec0..6d88adfc18 100644 --- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql +++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql @@ -321,29 +321,30 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` [% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -351,6 +352,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` + - + [% IF ( credit.patron.account.balance >= 0 ) %] @@ -384,30 +386,31 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
+

[% LibraryName | html %]
+

Fee receipt
+

[% Branches.GetName( credit.patron.branchcode ) | html %]
+ Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
Card number: [% credit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% credit.date | $KohaDates %][% credit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=credit %] [%- IF credit.description %], [% credit.description | html %][% END %] @@ -372,7 +374,7 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% credit.patron.account.balance | $Price %]
[% IF ( LibraryName ) %] - [% END %] - - - - + + @@ -416,6 +419,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, + - + [% IF ( debit.patron.account.balance <= 0 ) %] 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 0a9ae79eab..fd4484aeaa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -60,7 +60,8 @@
+

[% LibraryName | html %]
+

INVOICE
+

[% Branches.GetName( debit.patron.branchcode ) | html %]
+ Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
Card number: [% debit.patron.cardnumber | html %]
DateCreatedUpdated Description of charges Note Amount
[% debit.date | $KohaDates%][% debit.timestamp | $KohaDates with_hours = 1 %] [% PROCESS account_type_description account=debit %] [%- IF debit.description %], [% debit.description | html %][% END %] @@ -427,7 +431,7 @@ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`,
Total outstanding dues as on date: Total outstanding dues as on date: [% ELSE %][% END %][% debit.patron.account.balance | $Price %]
- + + @@ -81,7 +82,8 @@ [% FOREACH account IN accounts %] - + + - + [% IF ( totalcredit ) %] + @@ -176,6 +177,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 3cfc0f8877..e79ab14c6a 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 %] @@ -140,7 +142,7 @@ [% END %]
Total dueTotal due[% total | $Price %] 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 29ae067dab..4ec821bc6d 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 @@ -161,6 +161,7 @@ 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 @@ -193,7 +195,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 %]