From 11fb51d19e7bf36a89352372fda291ba902713e0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 8 Jan 2008 15:16:58 -0600 Subject: [PATCH] Some cleanup of new till reconciliation page, including adding menu item to sidebar menu and adding date format system pref to the script. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/includes/reports-menu.inc | 6 + .../prog/en/modules/reports/stats_screen.tmpl | 152 +++++++++--------- reports/stats.screen.pl | 3 +- 3 files changed, 86 insertions(+), 75 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc index 0869b4a82b..03287c2016 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc @@ -1,3 +1,8 @@ +

Guided Reports

Guided Reports

Statistics wizards

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl index 574d70baef..747c739aec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/stats_screen.tmpl @@ -7,67 +7,71 @@ -

Home -› Reports -› Till Reconciliation +

Home › Reports › Till Reconciliation

+ +

Till Reconciliation

Search between two dates

Payments

- +

- - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + +

Branch	Date/time	Surname	Firstname	Description	Charge Type	Invoice Amount	Payment Type	Payment Amount	Branch	Date/time	Surname	Firstname	Description	Charge Type	Invoice Amount	Payment Type	Payment Amount

@@ -79,68 +83,68 @@

Credits

- +

- - - - - - - + + + + + + + - - - - - - - + + + + + + +

Branch	Date/time	Surname	Firstname	Description	Charge Type	Invoice Amount	Branch	Date/time	Surname	Firstname	Description	Charge Type	Invoice Amount

- Total amount credits: $ -
- Total number written off: charges +

Total amount credits: $
Total number written off: charges

Refunds

- +

- - - - - - - + + + + + + + - - - - - - - + + + + + + +

Branch	Date/time	Surname	Firstname	Description	Charge Type	Invoice Amount	Branch	Date/time	Surname	Firstname	Description	Charge Type	Invoice Amount

- Total amount refunds: $ -

- Total amount of cash collected:$ +

Total amount refunds: $
Total amount of cash collected:$

- - - +

+ +

+ \ No newline at end of file diff --git a/reports/stats.screen.pl b/reports/stats.screen.pl index f84664d5a4..2d83c07474 100755 --- a/reports/stats.screen.pl +++ b/reports/stats.screen.pl @@ -268,7 +268,8 @@ else { totalcredits => $totalcredits, totalwritten => $totalwritten, totalrefund => $totalrefunds, - totalcash => $totalcash + totalcash => $totalcash, + DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), ); output_html_with_http_headers $input, $cookie, $template->output; } -- 2.39.5