From f9bb33c1cb4cb3d42a536c90a0ac2d3a2076be1f Mon Sep 17 00:00:00 2001
From: Hector Castro <hector.hecaxmmx@gmail.com>
Date: Thu, 26 May 2016 08:41:08 -0600
Subject: [PATCH] Bug 16594: Orders by fund report has wrong link to css and
 other issues
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Orders by fund has wrong link to css and other issues
-> The example in the wiki is wrong: <https://wiki.koha-community.org/wiki/DataTables_HowTo>
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
  [% INCLUDE 'datatables.inc' %]
-> Must be:
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
-> Missing <th></th> in <tfoot> tag
-> Wrong word used "Date deceived" should be "Date received"

NOTE: Wiki needs to be updated

To test:
-Look the code and notice about if else cluase without curly brackets
-Go to Reports > Orders by fund
-Play with: in filters 'All fund' Output: 'to screen into the browser'
-You will see a DataTable displayed in screen clutter
-Notice about 'Date deceived' and the foot of table
-Apply patch
-Refresh or execute again the report

Signed-off-by: Sinziana <s.paltineanu@berlin.bard.edu>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d4394d88eaeff5df6bf0a28ec3e6faed853b202b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../prog/en/modules/reports/orders_by_budget.tt       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
index 22b12d72de..fc4eef7222 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
@@ -7,7 +7,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 
-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'datatables.inc' %]
 <script type="text/javascript">
     $(document).ready( function () {
@@ -17,10 +17,11 @@
         $('#budgetfilter .b_inactive').remove();
 
         $('#showbudgets').click(function(){
-            if ($(this).is(":checked"))
+            if ($(this).is(":checked")) {
                 $('#budgetfilter').html(showallbudgets);
-            else
+            } else {
                 $('#budgetfilter .b_inactive').remove();
+            }
         });
     } );
 </script>
@@ -61,7 +62,7 @@
         <th>Total RRP</th>
         <th>Total cost</th>
         <th>Entry date</th>
-        <th>Date deceived</th>
+        <th>Date received</th>
         <th>Internal note</th>
         <th>Vendor note</th>
         </tr>
@@ -90,7 +91,7 @@
             </tr>
         [% END %]
         </tbody>
-        <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity  %]</th><th>[% total_rrp | $Price %]</th><th>[% total_ecost | $Price %]</th><th></th><th></th><th></th></tr></tfoot>
+        <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity  %]</th><th>[% total_rrp | $Price %]</th><th>[% total_ecost | $Price %]</th><th></th><th></th><th></th><th></th></tr></tfoot>
         </table>
     [% END %]
     [% ELSE %]
-- 
2.39.5