From 6849e68f965e388b84befe494a71d08b12a27438 Mon Sep 17 00:00:00 2001 From: genevieve Date: Fri, 13 Nov 2015 11:50:01 -0500 Subject: [PATCH] [PASSED QA] Bug 6934: New features, note added to transaction information, total caculated for negative types of transaction To be more specific, the column note from accountlines is now displayed in the table of the transactions. The grand total is now calculated for neagtive types like Credit or Payment and isn't counted for Write off types. Credit (return item) 'CR' has been added to drop down of transaction type Signed-off-by: Hector Castro Works as advertised Signed-off-by: Katrin Fischer --- .../prog/en/modules/reports/cash_register_stats.tt | 16 +++++++++++++--- reports/cash_register_stats.pl | 22 ++++++++++++++++------ 2 files changed, 29 insertions(+), 9 deletions(-) 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 4ec7fe1..26778c0 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 @@ -130,6 +130,12 @@ $(document).ready(function() { [% END %] + [% IF transaction_type == "CR" %] + + [% ELSE %] + + [% END %] + [% IF transaction_type == "FORW" %] [% ELSE %] @@ -189,7 +195,7 @@ $(document).ready(function() {
  • - +