Attachment 48704 Details for Bug 6934 – Bug 6934 Fixed Calendar and removed used of unexisting and unused C4::Budgets getCurrency

[patch] Bug 6934 Fixed Calendar and removed used of unexisting and unused C4::Budgets getCurrency

Bug-6934-Fixed-Calendar-and-removed-used-of-unexis.patch (text/plain), 3.15 KB, created by Rémi Mayrand-Provencher on 2016-03-04 20:14:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rémi Mayrand-Provencher

Created: 2016-03-04 20:14:49 UTC

Size: 3.15 KB

patch

obsolete

>From c5bf880b5a2b03d6514e4e2b35cab830d7b45e4f Mon Sep 17 00:00:00 2001
>From: remi <remi.mayrand-provencher@inLibro.com>
>Date: Fri, 4 Mar 2016 15:10:57 -0500
>Subject: [PATCH] Bug 6934 Fixed Calendar and removed used of unexisting and
> unused C4::Budgets getCurrency
>
>---
> .../intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt  | 8 ++++----
> reports/cash_register_stats.pl                                    | 6 ++----
> 2 files changed, 6 insertions(+), 8 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 425d333..341ebca 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
>@@ -85,13 +85,13 @@ $(document).ready(function() {
>             <ol>
>                 <br>
>                 <li>
>-                    <label for="filter_date_begin">From: </label>
>-                    <input type="text" size="10" id="filter_date_begin" name="filter_date_begin" value="[% beginDate | $KohaDates %]" class="datepickerfrom" />
>+                    <label for="from">From: </label>
>+                    <input type="text" size="10" id="from" name="from" value="[% beginDate | $KohaDates %]" class="datepickerfrom" />
>                     <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>                 </li>
>                 <li>
>-                    <label for="filter_date_end">To: </label>
>-                    <input type="text" size="10" id="filter_date_end" name="filter_date_end" value="[% endDate | $KohaDates %]" class="datepickerto" />
>+                    <label for="to">To: </label>
>+                    <input type="text" size="10" id="to" name="to" value="[% endDate | $KohaDates %]" class="datepickerto" />
>                     <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>                 </li>
> 
>diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
>index 7d89e65..2384ae3 100755
>--- a/reports/cash_register_stats.pl
>+++ b/reports/cash_register_stats.pl
>@@ -24,7 +24,6 @@ use C4::Koha;
> use C4::Circulation;
> use DateTime;
> use Koha::DateUtils;
>-use C4::Budgets qw/GetCurrency GetCurrencies/;
> use Text::CSV::Encoded;
> #use Data::Dumper;
> #use Smart::Comments;
>@@ -64,9 +63,9 @@ my $manualinv_types = $sth_manualinv->fetchall_arrayref({});
> 
> if ($do_it) {
> 
>-    $fromDate = output_pref({ dt => eval { dt_from_string($input->param("filter_date_begin")) } || dt_from_string,
>+    $fromDate = output_pref({ dt => eval { dt_from_string($input->param("from")) } || dt_from_string,
>             dateformat => 'sql', dateonly => 1 }); #for sql query
>-    $toDate   = output_pref({ dt => eval { dt_from_string($input->param("filter_date_end")) } || dt_from_string,
>+    $toDate   = output_pref({ dt => eval { dt_from_string($input->param("to")) } || dt_from_string,
>             dateformat => 'sql', dateonly => 1 }); #for sql query
> 
>     my $whereTType = '';
>@@ -132,7 +131,6 @@ if ($do_it) {
>         #}
>     }
> 
>-    my @currency = GetCurrency();
>     $grantotal = sprintf("%.2f", $grantotal);
> 
>     if($output eq 'screen'){
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 6934: 5634 | 5635 | 5640 | 5641 | 9379 | 9419 | 12602 | 12660 | 31210 | 36476 | 42564 | 42565 | 44847 | 44853 | 45972 | 45973 | 45974 | 48634 | 48642 | 48704 | 48705 | 48706 | 48707 | 48708 | 50429 | 50437 | 50938 | 53496 | 53500 | 53570 | 53571 | 53572 | 53573 | 53574 | 53575 | 53576 | 53577 | 53578 | 53579 | 53581 | 53582 | 53583 | 53584 | 53585 | 53586 | 53587 | 53588 | 53589 | 53590 | 53591 | 53648 | 53650 | 53651 | 53652 | 53653 | 53778 | 53780 | 54010 | 54088 | 54089 | 54090 | 54091 | 54092 | 54093 | 54094 | 54095 | 54096 | 54097 | 54098 | 54099 | 54100 | 55939 | 55988 | 55989 | 55990 | 55991 | 55992 | 55993 | 55994 | 55995 | 55996 | 55997 | 55998 | 55999 | 56000 | 56001 | 56763 | 56764